6 Commits

Author SHA1 Message Date
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
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 d4548b9ad9 Transform all yes,no args into True,False in parseArgs() 2011-06-08 03:14:13 -07:00
Francisco Souza 7342d0f818 Merge branch 'master' of https://github.com/ariya/phantomjs 2011-06-06 23:25:39 -03:00
Francisco Souza c8dfe1e30a Merge branch 'master' of git://github.com/ariya/phantomjs 2011-06-05 20:00:43 -03:00
Francisco Souza 9b12ce3f89 Changed the name of package from phantom to pyphantomjs 2011-06-05 19:55:07 -03:00