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
rgieseke
2c8e9bd5b4
Examples: new coffeescript versions.
2011-06-16 22:56:06 +02:00
Ariya Hidayat
1c94da0daf
Merge pull request #75 from detro/master
...
sleepsort.js - it's so silly, it has to go in :P
2011-06-16 09:02:36 -07:00
Ivan De Marino
e2ee86e0ac
Minor cleanup on 'sleepsort.js'
2011-06-16 14:48:41 +01:00
Ivan De Marino
d00ed3f2fc
sleepsort.js - This must go in for 1.2 :P
...
* It's so silly, it has to.
* Also, it shows how "powerful" the function scoping is
2011-06-16 11:46:10 +01:00
Ariya Hidayat
8908fda663
Merge pull request #74 from Roejames12/master
...
Script filename as phantom.scriptName
2011-06-15 19:10:50 -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
Ariya Hidayat
da34ca2d04
Merge pull request #73 from franciscosouza/master
...
Added entry point (console script)
2011-06-14 22:00:55 -07:00
Francisco Souza
9347cc6fff
Created script for running pyphantomjs after install
...
e.g.: $ pyphantomjs <file>
2011-06-14 19:21:03 -03:00
Ariya Hidayat
6b28a956ac
Refer to function argument 'startTime', not from page.
2011-06-13 08:11:40 -07:00
Ariya Hidayat
71f248311f
Merge pull request #72 from Roejames12/master
...
Some bugfixes
2011-06-12 19:41:45 -07: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
Ariya Hidayat
a55d5af8c1
Merge pull request #71 from Roejames12/master
...
Get up to date
2011-06-12 02:14:31 -07:00
IceArmy
99473110df
Merge branch 'master' of https://github.com/ariya/phantomjs
2011-06-12 01:40:18 -07:00
IceArmy
985593221f
Re-fix commit 3c665681
2011-06-12 01:38:30 -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
Ariya Hidayat
693d1c5f23
Handle 'onConsoleMessage' event just like the other events.
2011-06-11 17:16:49 -07:00
IceArmy
953af14544
Merge branch 'master' of https://github.com/ariya/phantomjs
2011-06-11 16:49:03 -07:00
Ariya Hidayat
d92723bd29
Handle onAlert event just like the other events.
2011-06-11 16:05:53 -07:00
Ariya Hidayat
f6c55010b9
Use closure to make 'handlers' really private.
2011-06-11 03:51:08 -07:00
Ariya Hidayat
3cf4507b13
Merge pull request #70 from lautis/fix-onresourcereceived
...
Fix reference to handlers in onResourceReceived
2011-06-11 03:36:49 -07:00
Ville Lautanala
0aae7361af
Fix reference to handlers in onResourceReceived
2011-06-11 11:52:34 +03: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
Ariya Hidayat
a5885abcbf
Merge pull request #65 from detro/utilities
...
Adding support for "injectJs" and "includeJs"
2011-06-10 10:53:18 -07:00
Ivan De Marino
45afda296f
Merge branch 'utilities' of https://github.com/detro/phantomjs into utilities
2011-06-10 17:09:21 +01:00
Ivan De Marino
22ee075cc2
Removing "page.click()" for now.
...
There is need for a discussion to decide how to do this.
2011-06-10 17:08:46 +01:00
Ivan De Marino
bd18d7c838
More work on "injectJs"
...
* "injectJs()" now supports ".coffee" input
* "injectJs()" is now available for the "phantom" object as well
* CSConverter is now a singleton embedded in the Utils static class
* The code used by "injectJs()" is now centralised in the Utils static class
2011-06-10 17:08:46 +01:00
Ivan De Marino
cc45aa7f38
Normalie user-provided script path
2011-06-10 17:08:46 +01:00