286 Commits

Author SHA1 Message Date
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 6e2b362850 Change scriptLookupDir to libraryPath. 2011-06-17 20:52:19 -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
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
IceArmy 61459fab45 Use phantom.scriptName instead of phantom.args[0] 2011-06-15 14:30:31 -07:00
IceArmy fb99a4868d Merge branch 'master' of https://github.com/ariya/phantomjs 2011-06-15 03:01:10 -07:00
IceArmy c8c58f11c7 Pass script's filename as arg[0] 2011-06-15 02:57:14 -07:00
Francisco Souza 9347cc6fff Created script for running pyphantomjs after install
e.g.: $ pyphantomjs <file>
2011-06-14 19:21:03 -03:00
IceArmy 309d3b5aaa Allow scriptLookupDir to be set for phantom object 2011-06-12 14:38:34 -07:00
IceArmy 25ac6d35ca phantom.injectJs should use the starting scripts directory, not the app directory 2011-06-12 14:04:07 -07:00
IceArmy 233e8cfff9 Fix 'local variable referenced before assignment' in coffee2js() 2011-06-12 13:53:15 -07:00
IceArmy 19b5b31781 Properly load plugins from the app directories plugins subfolder, not from our CWD 2011-06-12 12:50:16 -07:00
IceArmy 6c57775e63 Regenerate resources 2011-06-12 01:23:29 -07:00
IceArmy 6056bc0fa9 Added support for 'injectJs' and 'includeJs'
Updated bootstrap.js to latest. Also contains:
- Fix reference to handlers in onResourceReceived
- Private handlers
- Use closure to make 'handlers' really private.
- Handle onAlert event just like the other events.
- Handle 'onConsoleMessage' event just like the other events.
2011-06-12 01:23:15 -07:00
IceArmy a83d98b654 When sys.exit'ing, don't bother using qCritical, but just sys.exit with the message instead 2011-06-12 01:20:53 -07:00
IceArmy 5ba2bb4e2f Implement cross platform way of finding the Qt4 plugins directory 2011-06-11 01:28:16 -07:00
IceArmy e32ea74eaf Properly work with any directory
Add imageformats folder and dependencies QtXml and QtSvg, to fix problem where files of type jpeg, gif, svg, .., were not supported
Copy directories examples, plugins, over on build.
Copy files README.md, LICENSE, over on build.
2011-06-10 21:17:10 -07:00
IceArmy 6a8da550cb Better timing for onResourceRequested and onResourceReceived.
We record the time right inside the network access manager. This gives
better accuracy than doing it from JavaScript side, no loss due to the
latency of signal slot connection.
2011-06-09 00:30:55 -07:00
IceArmy 5ca07d99ba Expose more properties for onResourceRequested and onResourceReceived. 2011-06-09 00:30:55 -07:00
IceArmy 3c665681f4 Fix possible bug where if CoffeeScript starts with a shebang (hashbang) #!, then // gets put in front of it; but this is not a comment in CoffeeScript, so it causes a problem with the conversion. 2011-06-08 19:00:07 -07:00