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

489 Commits (1.2)

Author SHA1 Message Date
Ariya Hidayat c8046c0c65 Update ChangeLog file. 2011-06-21 22:58:22 -07:00
Ariya Hidayat cff3890a3e examples/extract-text: Removed temporarily (since it is not ported). 2011-06-21 22:11:51 -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
Ariya Hidayat baa4382de9 Merge pull request #83 from Roejames12/69b06da1 
Revert "Exit program properly when we call phantom.exit"
 2011-06-20 10:33:32 -07:00
Ariya Hidayat 3abb03d638 Build fix for Qt 4.5. 2011-06-20 10:26:32 -07:00
IceArmy 69b06da140 Revert "Exit program properly when we call phantom.exit" 2011-06-20 10:14:08 -07:00
Ariya Hidayat 7ba0d6964e Merge pull request #82 from Roejames12/master 
Exit program properly when we call phantom.exit
 2011-06-19 23:19:44 -07:00
IceArmy d29c6732b5 Pass source and lineNumber for console redirection. 
onConsoleMessage callback can handle two (optional) arguments, e.g.

    page.onConsoleMessage = function (msg, lineNo, source) {
        ....
    };
 2011-06-19 22:34:29 -07:00
IceArmy 1be23d0be9 Regenerate resources 2011-06-19 21:19:01 -07:00
IceArmy 3d0c56af40 Fix the last problem with setTimeout and setInterval 2011-06-19 21:18:14 -07:00
Ariya Hidayat 00810e98b3 Pass source and lineNumber for console redirection. 
onConsoleMessage callback can handle two (optional) arguments, e.g.

    page.onConsoleMessage = function (msg, lineNo, source) {
        ....
    };
 2011-06-19 21:06:27 -07:00
IceArmy 1fb67c49e7 Fix bug where output couldn't be piped/redirected 2011-06-19 18:40:44 -07:00
IceArmy c44838227d Fix bug where phantom.exit wouldn't exit properly 2011-06-19 17:26:39 -07:00
Ariya Hidayat 9931279ccc Remove unnecessary console redirection. 2011-06-19 15:28:58 -07:00
IceArmy 54478a1154 Use qWarning only if script isn't starting script 2011-06-19 14:00:04 -07:00
IceArmy 7a9e0c8599 Exit on start script error 2011-06-19 13:37:03 -07:00
IceArmy 56039cae7f Fix issue 131 - 'Properly exit page' causes changed stack trace 2011-06-19 02:49:13 -07:00
IceArmy 9a85d01687 Add newline to CSConverter.convert 2011-06-19 01:23:44 -07:00
IceArmy 11e29fe45c Regenerate resources 2011-06-19 01:23:01 -07:00
IceArmy 0e765f2a95 Exit program properly when we call phantom.exit 
Previously, calling phantom.exit would set the exit code and finish running the
JavaScript until it was done, then exit the program with your code. Basically
it didn't actually exit the program. It caused many code fallthrough problems,
but is now fixed. :)
 2011-06-19 01:20:45 -07:00
Ariya Hidayat f7ca056f1f Merge pull request #81 from Roejames12/master 
Maintain consistency across error messages
 2011-06-18 07:31:05 -07:00
IceArmy ff3eb34fc1 Maintain consistency across error messages 2011-06-18 00:27:59 -07:00
Ariya Hidayat 6e2b362850 Change scriptLookupDir to libraryPath. 2011-06-17 20:52:19 -07:00
Ariya Hidayat 12c81516cc Never continue if terminated is flagged. 2011-06-17 20:52:13 -07:00
Ariya Hidayat 944afb314e Do not crash when the command line option is unknown. 
http://code.google.com/p/phantomjs/issues/detail?id=124
 2011-06-17 18:37:01 -07:00
Ariya Hidayat 75bbbebb89 Simplify the logic inside Phantom::execute(). 
We need to make sure we return quickly if terminated is set to false
(e.g. in the constructor, if something is wrong).
 2011-06-17 18:04:20 -07:00
Ariya Hidayat 78856f8d51 Fix a regression where exit() function does not work. 
http://code.google.com/p/phantomjs/issues/detail?id=119
 2011-06-17 17:43:47 -07:00
Ariya Hidayat 309e0fbab8 Merge pull request #79 from rgieseke/master 
Some work on CoffeeScript examples
 2011-06-17 08:39:09 -07:00
Ariya Hidayat 91611afb30 Merge pull request #80 from Roejames12/d78b4817775b1668def9996dad0c6c718e20b0a2 
Simplify bootstrap defineSetter code into function
 2011-06-17 08:38:50 -07:00
IceArmy d78b481777 Regenerate resources 2011-06-17 01:04:40 -07:00
IceArmy 520010fab8 Simplify bootstrap defineSetter code into function 2011-06-17 01:04:19 -07:00
rgieseke e09da4e1d8 netsniff.coffee: Remove dot in prototype check. 2011-06-17 09:05:19 +02:00
rgieseke 7e4a5fd33e injectme.coffee: Add CoffeeScript version. 2011-06-17 09:04:08 +02:00
rgieseke 913b214d91 useragent.coffe: Change useragent as in js version. 2011-06-17 08:45:41 +02:00
rgieseke 61459d117e Merge remote branch 'upstream/master' 2011-06-17 08:26:36 +02:00
rgieseke e5064db060 pizza.coffee: Add missing onConsoleMessage. 2011-06-17 08:25:35 +02:00
Ariya Hidayat 97b0366aaa Merge pull request #78 from Roejames12/master 
Report CoffeeScript compile errors
 2011-06-16 21:34:57 -07:00
IceArmy 9ed0c2951e On Coffee convert error, just warn and return nothing. 
The reason for this is for consistencies sake. When we have a JavaScript
evaluation error, it shows the error, but doesn't exit the program.
Since we can inject CoffeeScripts as well as JS, it wouldn't be
consistent to exit the program. So we just warn instead.
 2011-06-16 21:30:10 -07:00
IceArmy e52ed4a54a Report CoffeeScript compile errors 2011-06-16 17:28:36 -07:00
Ariya Hidayat 0077a08d3d Merge pull request #77 from rgieseke/master 
Translations for new examples
 2011-06-16 16:11:08 -07:00