Ariya Hidayat
83922ada2f
Ensure consistent #ifdef guard.
2011-08-21 00:30:15 -07:00
Ariya Hidayat
4a96278d1b
Include usage.txt in the project file.
2011-08-21 00:21:15 -07:00
Ariya Hidayat
d3f10a8e18
Make CSConverter a real singleton.
2011-08-21 00:16:38 -07:00
Ariya Hidayat
944056ce4a
Remove unused m_convert from Phantom class.
2011-08-20 23:52:23 -07:00
Ariya Hidayat
52746493c4
Remove useless extra empty line.
2011-08-20 23:45:21 -07:00
Ariya Hidayat
2dbdc36598
Reduce JSLint warnings on the bootstrap code.
2011-08-20 23:21:39 -07:00
Ariya Hidayat
776da4987f
Add JSLint directives for the bootstrap code.
2011-08-20 23:11:14 -07:00
Ariya Hidayat
699f4f76f2
Fix coding style (no tab, 4 spaces).
2011-08-20 22:34:11 -07:00
Ariya Hidayat
9d19e02355
Remove stray character in the issue link.
2011-08-20 22:07:18 -07:00
Ariya Hidayat
e679640700
Merge branch 'master' of github.com:ariya/phantomjs
2011-08-20 18:13:38 -07:00
Ariya Hidayat
319fd80ec3
Add callback for page initialization.
...
http://code.google.com/p/phantomjs/issues/detail?id=143
2011-08-20 17:57:01 -07:00
Ariya Hidayat
e79a51bdd8
Merge pull request #129 from Roejames12/QWebSettings
...
New page settings
2011-08-20 17:17:36 -07:00
IceArmy
8880edcf78
Remove settings: jsOpenWindows, jsAccessClipboard, siteSpecificQuirksMode
...
Renamed jsEnabled to javascriptEnabled
2011-08-20 16:49:36 -07:00
Niek
8deac1b8c6
Fix issue 128 and issue 193
2011-08-20 10:24:56 +02:00
IceArmy
33005c3957
Add a few new QWebSettings for page settings.
...
Among the most useful, is the jsEnabled setting, which allows you to disable JavaScript.
2011-08-19 15:47:34 -07:00
Ariya Hidayat
545ce2a2b9
Merge pull request #126 from execjosh/issue186-script-and-terminal-encoding
...
Issue186 script and terminal encoding
2011-08-16 13:46:18 -07:00
Ariya Hidayat
155054e671
Merge pull request #124 from jgornick/reply-proxy-issue-158
...
Updated the network access manager to use a proxied reply so the response
2011-08-16 12:20:49 -07:00
execjosh
4e7d3f1c18
Change javascript property from "encoding" to "outputEncoding"
2011-08-17 04:17:42 +09:00
Ariya Hidayat
2867e06c53
Merge pull request #125 from robterrell/049e1f50bd54429ea2e43207ab01e10c8021988e
...
Added functions to WebPage class to simulate mouse move, mouse up, and mouse down using Qt.
2011-08-16 12:17:36 -07:00
execjosh
682b3532be
Add command-line option to set encoding of starting script
2011-08-17 03:53:56 +09:00
execjosh
6254c84717
Add command-line option to set terminal output encoding
2011-08-17 03:49:12 +09:00
execjosh
c3d7b2e918
Add static UTF-8 instance to encoding
2011-08-17 03:33:15 +09:00
execjosh
ca92c9ff84
Allow startup script to set output encoding
2011-08-17 03:18:52 +09:00
execjosh
dc72101c10
Replace direct usage of stdout and stderr with terminal
2011-08-17 03:15:02 +09:00
execjosh
714a849374
Create registry to hold globally-accessible instances
2011-08-17 02:52:23 +09:00
execjosh
40625b4c53
Wrap stdout and stderr to control display encoding
2011-08-17 02:49:48 +09:00
execjosh
1710409215
Wrap QTextCodec to control encoding/decoding
2011-08-17 02:47:28 +09:00
Joe Gornick
578aa6c236
Updated the network access manager to use a proxied reply so the response bodies can be captured.
2011-08-14 03:41:39 -05:00
Ivan De Marino
0842485f62
Merge remote-tracking branch 'upstream/master' into dev-commonjs_fileio
2011-08-08 23:42:36 +01:00
Ivan De Marino
2c4ac33942
Filesystem API: completed the "Tests" API group from CommonJS/Filesystem definition.
...
* Tests provided in "fs-spec-04.js"
* I also slightly enriched the "jasmine-console.js" reporter to get a bit more info
2011-08-08 23:42:11 +01:00
Ariya Hidayat
f811e6ae1e
Merge pull request #122 from Roejames12/master
...
Updates
2011-08-08 15:35:32 -07:00
IceArmy
862dc6e017
Update CoffeeScript to 1.1.2
2011-08-08 15:12:57 -07:00
Rob Terrell
049e1f50bd
Added functions to WebPage class to simulate mouse move, mouse up, and mouse down. Also added click() convenience function, which combines a move, mousedown, and mouseup.
...
Added functions to simulate mouse move, mouse up, and mouse down events
in the Qt layer. For our uses, this was more reliable than creating
mouse events in javascript.
2011-08-07 09:29:50 -04:00
Ivan De Marino
e71a992dbd
Merge remote-tracking branch 'upstream/master'
2011-08-04 21:37:31 +01:00
Ariya Hidayat
f280e51c2c
Merge pull request #120 from detro/dev-commonjs_fileio
...
Filesystem API: completed the "Paths" API group from CommonJS/Filesystem
2011-08-01 22:43:44 -07:00
Bartosz Nitka
bb2adcc986
Prevent javascript timeout
...
"The script on this page appears to have a problem. Do you want
to stop the script ?" dialog should no longer show
2011-08-01 17:31:13 -07:00
Ivan De Marino
a47ee85d09
Filesystem API: completed the "Paths" API group from CommonJS/Filesystem definition.
...
* Tests provided in "fs-spec-03.js"
2011-08-02 00:47:43 +01:00
Ivan De Marino
f3a11cd224
Given the progress made by Alessandro with [ #140 ]( http://code.google.com/p/phantomjs/issues/detail?id=140 ),
...
we should consider re-instating this .pro option for Mac.
Yes, it will still show the Icon in the Dock, but we gain the static executable.
2011-08-01 22:40:07 +01:00
Kapil Reddy
6e39625ecf
added scrollPosition support in c++ version
2011-07-22 13:41:30 +05:30
Ivan De Marino
512ff9658e
Filesystem API: added the "Attributes" API group from CommonJS/Filesystem definition
...
* Tests for this new API are also provided
* The 'fs.size()' method is implemented with a shim in 'bootstrap.js' to cover the exception throwing behaviour
2011-07-22 00:29:25 +01:00
Ivan De Marino
49ee7b52fd
A bit more code doc
2011-07-20 22:43:34 +01:00
Ivan De Marino
21d633b786
Implement "fs.read" and "fs.write" in the JavaScript shim.
...
* I'd have to do it for throwing an exception in case of error anyway
* Updated a bit the code doc
2011-07-20 22:43:00 +01:00
Ivan De Marino
ad33cb5b0b
Note in the code what method I'm going to add to the "fs" object (update).
2011-07-20 22:42:48 +01:00
Ivan De Marino
540c6a6672
Note in the code what method I'm going to add to the "fs" object.
2011-07-20 22:42:30 +01:00
Erik Dubbelboer
b1d947dd51
added persistent cookie support
2011-07-19 19:32:42 +02:00
IceArmy
d1c418ba07
Allow constructs such as: page.open(url, operation)
2011-07-04 11:06:34 -07:00
IceArmy
895923603f
Fix memory issues by providing a way to truly delete WebPages. #154
...
Use page.destroy() to delete the page and regain the memory.
2011-07-02 17:08:06 -07:00
Alessandro Portale
c86d104c83
Remove obsolete #include <gifwriter.h>
2011-06-30 05:15:43 +02:00
Alessandro Portale
3fd978d6bf
List bootstrap.js in Qt Creator under "Other Files"
2011-06-30 05:13:52 +02:00
Ariya Hidayat
da749624a3
Merge pull request #99 from aportale/Issue_148
...
Fix crash on exit (Issues #136 , #148 and #149 )
2011-06-28 18:05:40 -07:00
Alessandro Portale
5acaa6b42d
Fix crash on exit (Issues #136 , #148 and #149 )
...
Workaround: Apparently, all QWebPages need to be deleted before
the QApplication gets destroyed.
2011-06-29 00:45:12 +02:00
Ivan De Marino
3807b9dc4d
Now, if "fs.open" fails, it throws an exception.
...
* This is implemented with a javascript-shim
2011-06-28 21:35:27 +01:00
Ivan De Marino
a0e1888c2c
Moved the "fs" object to be in the global/window space: will not be attached to the "phantom" object anymore.
...
* Once (and if) we implement support for CommonJS Module Loading, a "require("fs")" will be required.
2011-06-28 21:02:48 +01:00
Ivan De Marino
aad029e53f
Sorting out some nitpicks.
2011-06-28 13:24:24 +01:00
Ariya Hidayat
c5213b24b0
Revert "Mac OS X: No need to build as an application bundle."
...
This reverts commit c6db0354ea
.
2011-06-27 19:54:39 -07:00
Ivan De Marino
f4aa689ec7
A bit more compliancy with the CommonJS Filesystem/A draft specs.
...
* Renamed some methods to be more compliant with the specs
* Added some Directory/Tree specific ops
* Support for the open mode '+' (that is equivalent to 'a')
* See draft at: http://wiki.commonjs.org/wiki/Filesystem/A
2011-06-27 23:14:41 +01:00
Ivan De Marino
6b04ee23c1
Introducing File I/O API in PhantomJS.
...
* This is the squash of 30 commits, so it's meaty
* Inspired by HammerJS (see https://github.com/senchalabs/hammerjs )
* Not yet 100% complete
* Final aim is to provide a CommonJS/Filesystem compliant API (see http://wiki.commonjs.org/wiki/Filesystem )
2011-06-27 23:14:05 +01:00
Ariya Hidayat
f25a7a66e5
Bump the Qt requirement to version >= 4.6.
...
Also, remove code branch for Qt 4.5.
2011-06-26 21:51:30 -07:00
Ariya Hidayat
c6db0354ea
Mac OS X: No need to build as an application bundle.
...
http://code.google.com/p/phantomjs/issues/detail?id=139
2011-06-26 00:03:18 -07:00
Ariya Hidayat
cf23a5c6e3
Bump unstable version.
2011-06-25 23:59:16 -07:00
M. Scott Ford
1b67c2b8c4
Fixed issue with the open method that was preventing the use of POST unless a onLoadFinished handler was also passed in.
2011-06-26 00:07:07 -04:00
Ivan De Marino
99310e2c47
Curing my _Commentitis_.
2011-06-25 00:16:57 +01:00
Ivan De Marino
2895d096ab
Adding "--local-access-remote=[yes|no]".
...
* This will allow local content to access remote content, bypassing the same origin policy.
* It's controllable from the CLI and through the "page.settings" property
* This addresses Issue #28 but only partially: it's still not possible to make _remote content access other remote content on a different origin_.
2011-06-24 15:57:55 +01:00
Ivan De Marino
0a2ec5f09f
Sorting out the Page Settings Names into a unique source of truth (i.e. consts.h)
2011-06-24 15:51:01 +01:00
Ivan De Marino
9fa0a2c7ce
Enabled HTML5 Web App Cache.
2011-06-24 15:28:17 +01:00
Ivan De Marino
6a56c53fba
Sorted out a bit the global "QWebSettins".
...
More stuff to come: I'm working on Issue #28 .
2011-06-24 14:54:31 +01:00
Ivan De Marino
40817dd525
Added "--version" and updated text in the usage text.
2011-06-24 14:17:54 +01: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
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
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
c44838227d
Fix bug where phantom.exit wouldn't exit properly
2011-06-19 17:26:39 -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
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
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
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
c8c58f11c7
Pass script's filename as arg[0]
2011-06-15 02:57:14 -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
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
Ariya Hidayat
693d1c5f23
Handle 'onConsoleMessage' event just like the other events.
2011-06-11 17:16:49 -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
Ville Lautanala
0aae7361af
Fix reference to handlers in onResourceReceived
2011-06-11 11:52:34 +03: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