Commit Graph

636 Commits (149c9512620be06fec06009b336bd46e55a52b43)

Author SHA1 Message Date
Ariya Hidayat 149c951262 Mac build script: for some reasons, need to invoke make twice. 2011-08-20 16:09:15 -07:00
Ariya Hidayat 75c925a932 Mac build script: use raster, skip QtScript and few other features. 2011-08-20 14:59:08 -07:00
Ariya Hidayat 710baec735 Mac build script: clarify that it does not always download. 2011-08-20 14:26:16 -07:00
Ariya Hidayat bc644a138a Mac build script: use static build. 2011-08-20 14:25:37 -07:00
Ariya Hidayat 07051055cb First cut at build script for Mac OS X. Not working yet. 2011-08-19 17:33:34 -07:00
Ariya Hidayat 07061f864e Merge pull request #128 from Roejames12/80ed81a3
Update and sync FS API
2011-08-19 15:15:22 -07:00
IceArmy 80ed81a3f9 Regenerate resources 2011-08-19 00:08:02 -07:00
IceArmy 0159c0ed27 Use updated FS api
Fix bug where File.m_file didn't exist in __del__() if we used File.close() first
fs.removeTree now removes tree as well as all tree contents (files). This is for a functionality sync between PhantomJS and PyPhantomJS
All tests will now pass successfully
2011-08-19 00:07:24 -07:00
Ariya Hidayat da3a7de223 Merge pull request #127 from Roejames12/master
Updates
2011-08-18 16:45:10 -07:00
IceArmy 7cbd75a400 Make the parents the first argument (since we will always supply the arg, and also for cleanliness and order) 2011-08-18 14:23:58 -07:00
IceArmy d70ca4bf7c Updated the network access manager to use a proxied reply so the response bodies can be captured. 2011-08-18 14:09:21 -07:00
IceArmy d2c4a47bf9 Merge branch 'master' of https://github.com/ariya/phantomjs 2011-08-18 01:14:43 -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
IceArmy 3c91c581bb Use new style class for MessageHandler 2011-08-15 13:37:37 -07:00
IceArmy 414660b41a Replace escaped quotes in strings 2011-08-15 11:56:39 -07: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
Ariya Hidayat e6090d541e Merge pull request #123 from detro/dev-commonjs_fileio
Filesystem "Tests" API group
2011-08-08 16:08:57 -07:00
Ivan De Marino 512de8c9b1 Fixed typo. 2011-08-08 23:46:56 +01: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 548e063231 Regenerate resources 2011-08-08 15:13:48 -07:00
IceArmy 862dc6e017 Update CoffeeScript to 1.1.2 2011-08-08 15:12:57 -07:00
Ariya Hidayat dee6117c01 Merge pull request #119 from detro/master
Issue #140 and Mac OS X
2011-08-07 16:34:04 -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 3046bd994e Spotted a mistake in "scandir.[js|coffee]": was still using "phantom.fs" API. 2011-08-04 22:00:18 +01: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
Ariya Hidayat ceff9cf749 Merge pull request #121 from niteria/master
This should fix js timeout issues
2011-08-01 22:42:38 -07:00
IceArmy 12d36a195a Don't require \ at the end of multiline imports 2011-08-01 19:13:19 -07:00
IceArmy 6154876a42 Replace all single quoted strings with escaped single quotes inside with a double quoted string to avoid needing to escape the single quotes 2011-08-01 19:10:04 -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
IceArmy 7fe267341a Pass app back to Phantom 2011-07-31 03:05:06 -07:00
IceArmy 9d66ddf5ad Simplify cookies file check 2011-07-31 03:05:06 -07:00
Ariya Hidayat b11982adf2 Merge pull request #118 from Roejames12/master
A few bug fixes
2011-07-29 10:04:14 -07:00
IceArmy 8a9c95d872 Simplify cookiejar code 2011-07-29 05:59:52 -07:00
IceArmy 4ffd835cb3 Persistent cookie support 2011-07-29 03:55:52 -07:00