Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Sep 23, 2012
  1. Merge branch 'master' into 1.7

    authored
  2. Undocument the callback mechanism.

    authored
    This is private for now, see issue 133 for details.
    
    http://code.google.com/p/phantomjs/issues/detail?id=133
Commits on Sep 22, 2012
  1. Remove non-working weather example.

    authored
    The example stops working since the request is blocked. It needs a
    rewrite to use a different service.
    
    http://code.google.com/p/phantomjs/issues/detail?id=794
Commits on Sep 21, 2012
  1. Merge branch 'master' into 1.7

    authored
  2. Remove outdated Debian control files.

    authored
    Rather than advertising wrong info (PyPhantomJS etc), debian/ is
    removed until new up-to-date content is prepared.
    
    http://code.google.com/p/phantomjs/issues/detail?id=793
  3. Ivan De Marino

    Fixing issue with CookieJar not loading at boot.

    detro authored committed
    * Using the "QTimer::singleShot" bites back in the ass
    * The "script" takes priority and runs before the SLOT is actually invoked
    
    Why was I using a Timer?
    Not sure anymore: it must have slipped in while I was trying to work out
    all the other issues I had with QNetworkCookieJar, and I left it there.
    
    http://code.google.com/p/phantomjs/issues/detail?id=790
  4. Merge branch 'master' into 1.7

    authored
  5. Ian Oxley

    Non-zero exit code if any test fails.

    ianoxley authored committed
    In the callback function passed to `waitFor`, the call to `page.evaluate`
    returns a 1 or 0, and this is then passed to `phantom.exit` (with a 1
    indicating at least one test failed, 0 indicating all tests passed).
    
    http://code.google.com/p/phantomjs/issues/detail?id=792
  6. Ian Oxley

    Added 'tests passed' message.

    ianoxley authored committed
    If all tests pass, a message indicating this is output to the console.
    
    http://code.google.com/p/phantomjs/issues/detail?id=792
  7. Ian Oxley

    Test failure CSS selectors changed.

    ianoxley authored committed
    Changed the CSS selectors used to identify failed tests.
    
    The old selector was `div.jasmine_reporter > div.suite.failed`,
    but this no longer seems to match any elements.
    
    The new selector is `.results > #details > .specDetails.failed`. For each
    failing test the `.description` and `.resultMessage.fail` elements are
    used to output the failures to the console.
    
    http://code.google.com/p/phantomjs/issues/detail?id=792
  8. Ian Oxley

    Changed CSS selector used when checking for whether tests have finished.

    ianoxley authored committed
    When using the jasmine 1.2.0 standalone version, `.runner .description`
    doesn't seem to match any elements.
    
    I noticed pending tests can be found using the CSS selector
    `.symbolSummary .pending`, so changed the testFx callback to check
    that no elements are left matching this selector.
    
    http://code.google.com/p/phantomjs/issues/detail?id=792
  9. Revert "Fix crash on exit (Issues #136, #148 and #149)"

    Shawn Krisman authored committed
    This reverts commit 5acaa6b.
    
    Conflicts:
    
    	src/phantom.cpp
    	src/phantom.h
    
    removed m_page deletion.
    
    http://code.google.com/p/phantomjs/issues/detail?id=719
  10. Make the key enums as part of WebPage instance.

    authored
    This way, we don't add anything into phantom object.
    
    http://code.google.com/p/phantomjs/issues/detail?id=492
Commits on Sep 20, 2012
Commits on Sep 19, 2012
  1. Jon Leighton
  2. Merge pull request #319 from detro/ghostdriver-dev

    authored
    GhostDriver Development Branch - Master Push #4
Commits on Sep 18, 2012
  1. Ivan De Marino

    Made the "Callbacks injection" recursive.

    detro authored
    Before this, only the first level of child frames had the possibility to use
    the Callbacks object. Now is injected recursively in all of them.
    
    This is an extension of coverage for [Issue #683](http://code.google.com/p/phantomjs/issues/detail?id=683).
  2. Ivan De Marino
  3. Ivan De Marino

    Redesign the Cookies API (part 2)

    detro authored
    Addresses [Issue #761](http://code.google.com/p/phantomjs/issues/detail?id=761).
    
    This is a combination of 5 commits.
    
    1. Date in Cookie can be set via "seconds since epoch" as well.
    
    * In addition to the current string format, we can now set cookies via integer of msec since epoch
    * Expiration date can be set via "expires" or "expiry" option ("expires" has priority)
    * Returned cookie will contain "expires" as string and "expiry" as msec since epoch
    
    I believe this can simplify code that uses cookies and it doesn't change the functionality.
    
    2. Applying the "--debug" command line options as early as possible.
    
    3. Fixing bug and behaviour in the CookieJar
    
    * It's not possible to set a cookie without a domain: will default to the domain of the page it's set on
    * "page.clearCookies()" was broken
    * "cookiejar.deleteCookie("name", url)" reimplemented because deleting via "expiration" doesn't work
    
    4. Improving (and more fixing) in the CookieJar
    
    * Purging Session or Expired Cookies now works
    * Added boolean return values to inform if the requested cookie operation succeeded
    * Timestamps for "expiry/expires" in Milliseconds, as JS does by default
    * Improved detection that a cookie has been accepted or rejected by the cookiejar
    
    NOTE: Unfortunately, the Qt provided QNetworkCookieJar is a very limited
    and not extremely well designed solution. It doesn't provide any "nice
    and clean" CRUD API, and you are only left with a SET/GET to deal with.
    Mechanism to understand when and when not a cookie is added are hidden,
    and require extra work in the sub-class (our CookieJar) to fill the gap.
    
    5. Methods on the "phantom" object to manipulate the CookieJar.
    
    * phantom.cookies (array of JSON/Cookies)
    * phantom.cookiesEnabled (boolean)
    * phantom.addCookie
    * phantom.deleteCookie
    * phantom.clearCookies
    
    Those methods operate on the CookieJar directly and have no URL restriction.
    In other words, if page P1 can see set of cookies C1, and page P2 can see set of
    cookies C2, "phantom.cookies" can see (i.e. operate upon) both C1 and C2.
  4. lZl
  5. Ryan Cumming

    Treat all args after the script name as script args

    etaoins authored committed
    This fixes CapserJS which builds a command line like this:
    phantomjs bin/bootstrap.js --casper-path=~/capserjs --cli
    
    That works on Phantom 1.6 but not on master due to the qcommandline
    port.
    
    Fix by extending qcommandlne to take a ParameterFence flag which causes
    it to treat any options after a parameter as arguments. Switch
    "scriptname" to use that so the 1.6 behaviour is restored.
    
    http://code.google.com/p/phantomjs/issues/detail?id=55
  6. Maintain m_currentFrame as opposed to using QWebPage's currentFrame().

    Harry Waye authored committed
    Currently focused frame made available with page.focusedFrameName and page.switchToFocusedFrame.
    
    http://code.google.com/p/phantomjs/issues/detail?id=683
  7. Merge pull request #317 from Vitallium/fix-missing-ico-plugin-win

    authored
    Rendering ICO images on Windows.
Commits on Sep 17, 2012
  1. Vitaly Slobodin

    Render ICO images on Windows.

    Vitallium authored
    ICO images are not rendered on Windows due to missing ICO plugin.
    
    Issue: http://code.google.com/p/phantomjs/issues/detail?id=779
Commits on Sep 14, 2012
  1. Merge pull request #314 from JakubOboza/patch-1

    authored
    Update src/config.cpp
Something went wrong with that request. Please try again.