Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mostly updates for phantomjs 2.0 by DEfusion #32

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Commits on Oct 8, 2015

  1. Configuration menu
    Copy the full SHA
    bcf0adf View commit details
    Browse the repository at this point in the history
  2. Remove injection of jQuery

    For some reason it wasn't loading for me and thus the callback was never called. We don't need jQuery to do those calculations anyway so clean it up by removing it.
    DEfusion committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    d20c1f5 View commit details
    Browse the repository at this point in the history
  3. Bump version

    DEfusion committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    166358b View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. Configuration menu
    Copy the full SHA
    6b0b881 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2016

  1. Ignore .idea.

    Jeremy Kallman committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    cf5bf50 View commit details
    Browse the repository at this point in the history
  2. Fix for div not found when it hasn’t rendered yet.

    Happens when div loading is dependent on resources loading.
    Jeremy Kallman committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    64214bc View commit details
    Browse the repository at this point in the history
  3. Bump version.

    Jeremy Kallman committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    376bb70 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. Fix for not capturing with a height arg correctly.

    - Instead of modifying the height of the body (and html) after render we
      just set the mask to take care of it. The image we were getting was of
      the full size page cropped down to the height and the rest filled with
      white. I think this is because the larger initial page size caused the
      viewport to expand but then it didn’t contract.
    
    - Since args.div will supersede the mask eventually, don’t set the mask
      up front if args.div is present. Set the mask solely on the height arg
      as we can default top and left to 0.
    
    This fixes the failing unit tests when running locally.
    Jeremy Kallman committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    0478476 View commit details
    Browse the repository at this point in the history