vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity
576 Commits
14 Branches
21 Tags
144 MiB
Commit Graph

576 Commits (5adc92aec01357b6d235d70dea327b36c5662965)

Author SHA1 Message Date
IceArmy a2aed0064c Fix crash on exit (Issues #136, #148 and #149) 2011-06-28 18:41:29 -07:00
Ariya Hidayat 1354d65acf Merge pull request #100 from sujal/master 
Simple comment correction in injectme.* example
 2011-06-28 18:05:50 -07:00
Ariya Hidayat da749624a3 Merge pull request #99 from aportale/Issue_148 
Fix crash on exit (Issues #136, #148 and #149)
 2011-06-28 18:05:40 -07:00
Ariya Hidayat 4c3364acdc Merge pull request #97 from detro/dev-commonjs_fileio 
Sort out the nitpicks
 2011-06-28 18:05:27 -07:00
sujal 59843bfcdf cleanup injectme.* example comment 
the comment confused me at first, making me think there was a "better"
or alternate way to do this, so I spent 45 minutes searching the docs
for a mention of loadJsFile.

Hopefully this saves someone else a few minutes.
 2011-06-28 19:34:01 -04:00
Alessandro Portale 5acaa6b42d Fix crash on exit (Issues #136, #148 and #149) 
Workaround: Apparently, all QWebPages need to be deleted before
the QApplication gets destroyed.
 2011-06-29 00:45:12 +02:00
Ivan De Marino 3807b9dc4d Now, if "fs.open" fails, it throws an exception. 
* This is implemented with a javascript-shim
 2011-06-28 21:35:27 +01:00
Ivan De Marino a0e1888c2c Moved the "fs" object to be in the global/window space: will not be attached to the "phantom" object anymore. 
* Once (and if) we implement support for CommonJS Module Loading, a "require("fs")" will be required.
 2011-06-28 21:02:48 +01:00
Ivan De Marino 4b1af82c1b Updated changelog with info about the new Filesystem API. 2011-06-28 13:31:37 +01:00
Ivan De Marino aad029e53f Sorting out some nitpicks. 2011-06-28 13:24:24 +01:00
Ariya Hidayat c5213b24b0 Revert "Mac OS X: No need to build as an application bundle." 
This reverts commit c6db0354ea.
 2011-06-27 19:54:39 -07:00
Ariya Hidayat f6c77ef0cf Merge pull request #95 from detro/dev-commonjs_fileio 
File IO, CommonJS style (Issue #129)
 2011-06-27 19:50:20 -07:00
Ivan De Marino f4aa689ec7 A bit more compliancy with the CommonJS Filesystem/A draft specs. 
* Renamed some methods to be more compliant with the specs
* Added some Directory/Tree specific ops
* Support for the open mode '+' (that is equivalent to 'a')
* See draft at: http://wiki.commonjs.org/wiki/Filesystem/A
 2011-06-27 23:14:41 +01:00
Ivan De Marino 6b04ee23c1 Introducing File I/O API in PhantomJS. 
* This is the  squash of 30 commits, so it's meaty
* Inspired by HammerJS (see https://github.com/senchalabs/hammerjs)
* Not yet 100% complete
* Final aim is to provide a CommonJS/Filesystem compliant API (see http://wiki.commonjs.org/wiki/Filesystem)
 2011-06-27 23:14:05 +01:00
Ariya Hidayat 1f2c80ba32 Update ChangeLog. 2011-06-27 09:08:56 -07:00
Ariya Hidayat f5ff7ea715 Merge pull request #94 from Roejames12/master 
Updates
 2011-06-27 01:16:08 -07:00
Ariya Hidayat f25a7a66e5 Bump the Qt requirement to version >= 4.6. 
Also, remove code branch for Qt 4.5.
 2011-06-26 21:51:30 -07:00
IceArmy 67702dbc46 Bump version. 2011-06-26 18:39:03 -07:00
IceArmy 8621e9e4d5 Regenerated resources 2011-06-26 18:28:12 -07:00
IceArmy 2d6fa95171 Fixed issue with the open method that was preventing the use of POST unless a onLoadFinished handler was also passed in. 2011-06-26 18:28:00 -07:00
IceArmy ce065d9fda Improved plugin system 
You can now set a priority on a function to control
when it executes for a particular action (hook).
Default priority is 10, but can be changed to anything.

For example, if you have 2 functions hooked to 'Phantom',
you can change one function to priority 12 and leave the other
at 10, so the one at 10 will execute first, no matter where
it is defined.
 2011-06-26 18:13:41 -07:00
Ariya Hidayat da629874d3 examples/feature.js: Show supported/unsupported features. 
Feature detection is done via Modernizr.
 2011-06-26 14:05:48 -07:00
Ariya Hidayat c6db0354ea Mac OS X: No need to build as an application bundle. 
http://code.google.com/p/phantomjs/issues/detail?id=139
 2011-06-26 00:03:18 -07:00
Ariya Hidayat cf23a5c6e3 Bump unstable version. 2011-06-25 23:59:16 -07:00
Ariya Hidayat 07f946d817 Merge pull request #93 from corgibytes/open-with-post-without-load-handler 
Allow calling WebPage.open with HTTP verb, but without load handler
 2011-06-25 22:09:07 -07:00
M. Scott Ford 1b67c2b8c4 Fixed issue with the open method that was preventing the use of POST unless a onLoadFinished handler was also passed in. 2011-06-26 00:07:07 -04:00
Ariya Hidayat f2d0a21330 Merge pull request #92 from Roejames12/master 
localAccessRemote and HTML5 webapp cache
 2011-06-24 18:52:23 -07:00
IceArmy 346f238d7f Enabled HTML5 Web App Cache. 2011-06-24 18:35:56 -07:00
IceArmy 64404a1902 Adding "--local-access-remote=[yes|no]". 
* This will allow local content to access remote content, bypassing the same origin policy.
* It's controllable from the CLI and through the "page.settings" property
* This addresses Issue #28 but only partially: it's still not possible to make _remote content access other remote content on a different origin_.
 2011-06-24 18:35:56 -07:00
Ariya Hidayat addcb36a2e Merge pull request #91 from detro/master 
Curing _Commentitis_
 2011-06-24 16:50:49 -07:00
Ivan De Marino 99310e2c47 Curing my _Commentitis_. 2011-06-25 00:16:57 +01:00
Ariya Hidayat 3ef660466d Merge pull request #89 from detro/master 
Tweaks related to QWebSettings
 2011-06-24 10:35:55 -07:00
Ivan De Marino 2895d096ab Adding "--local-access-remote=[yes|no]". 
* This will allow local content to access remote content, bypassing the same origin policy.
* It's controllable from the CLI and through the "page.settings" property
* This addresses Issue #28 but only partially: it's still not possible to make _remote content access other remote content on a different origin_.
 2011-06-24 15:57:55 +01:00
Ivan De Marino 0a2ec5f09f Sorting out the Page Settings Names into a unique source of truth (i.e. consts.h) 2011-06-24 15:51:01 +01:00
Ivan De Marino 9fa0a2c7ce Enabled HTML5 Web App Cache. 2011-06-24 15:28:17 +01:00
Ivan De Marino 6a56c53fba Sorted out a bit the global "QWebSettins". 
More stuff to come: I'm working on Issue #28.
 2011-06-24 14:54:31 +01:00
Ivan De Marino 40817dd525 Added "--version" and updated text in the usage text. 2011-06-24 14:17:54 +01:00
Ariya Hidayat 037e83d6cd Merge branch 'master' of github.com:ariya/phantomjs 2011-06-21 22:59:20 -07:00
Ariya Hidayat c6c039a953 Update ChangeLog file. 2011-06-21 22:58:50 -07:00
Ariya Hidayat b277e3a815 Merge pull request #88 from Roejames12/8064c294 
Fix plugin loading path when program is frozen
 2011-06-21 14:54:22 -07:00
IceArmy 8064c294b3 Fix loading plugins when program is frozen 2011-06-21 10:46:12 -07:00
Ariya Hidayat d3910f1efe Merge pull request #87 from dunkfordyce/master 
youve got the wrong var name in examples/rasterise.jz
 2011-06-21 08:23:03 -07:00
Ariya Hidayat 5436dac17b Merge pull request #86 from Roejames12/75b75722 
Regenerate resources
 2011-06-21 08:22:48 -07:00
Dunk Fordyce 42472aa92f fix page/phantom variable wrongness 2011-06-21 14:34:41 +01:00
IceArmy 75b757226f Regenerate resources 2011-06-21 00:07:16 -07:00
Ariya Hidayat 753ef864b9 Merge pull request #84 from corgibytes/fix-disconnect-this 
Correctly disconnected event handler.
 2011-06-20 23:59:32 -07:00
Ariya Hidayat 77414c0b0a Merge pull request #85 from Roejames12/master 
Make sure phantom.exit() really exits.
 2011-06-20 23:58:56 -07:00
IceArmy 49b630bd65 Make sure phantom.exit() really exits. 2011-06-20 23:54:03 -07:00
Ariya Hidayat 8094cdb4e7 Make sure phantom.exit() really exits. 
Patch by Alessandro Portale.
 2011-06-20 23:24:51 -07:00
M. Scott Ford 95a7650be8 Correctly disconnected event handler. 2011-06-20 18:55:05 -04:00