6 Commits

Author	SHA1	Message	Date
IceArmy	233e8cfff9	Fix 'local variable referenced before assignment' in coffee2js()	2011-06-12 13:53:15 -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	5c6338c060	Remove encode() from utils.py	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