vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity
1,015 Commits
14 Branches
21 Tags
144 MiB
Commit Graph

1015 Commits (39e4485ce39b0b8052b964ebbd89442b05dae162)

Author SHA1 Message Date
Ariya Hidayat 53b70172a1 Mac build script: workaround for qt_menu.nib problem. 
http://code.google.com/p/phantomjs/issues/detail?id=142

See also the Qt bug:
https://bugreports.qt.nokia.com/browse/QTBUG-5952
 2011-09-09 22:01:09 -07:00
Ariya Hidayat b68e06a11c Mac build script: ensure it can link to jscore library. 
http://code.google.com/p/phantomjs/issues/detail?id=142
 2011-09-09 21:58:00 -07:00
Ariya Hidayat 7a2fd4e93c Mac build script: clean any remaining of the previous build. 
http://code.google.com/p/phantomjs/issues/detail?id=142
 2011-09-09 09:13:28 -07:00
Ariya Hidayat f5c2b7f69b Build script: use the correct QMake. 
Now the remaining problem is jscore linking.

http://code.google.com/p/phantomjs/issues/detail?id=141
 2011-09-09 08:00:22 -07:00
IceArmy 7bb97fb0da Create FileSystem instance only when needed. 
Also made FileSystem a singleton.
 2011-09-09 01:05:33 -07:00
IceArmy 6bba1715df Regenerate resources 2011-09-09 01:05:33 -07:00
IceArmy 0a25130e57 Implement require('webpage'). 
window.WebPage still works, it is not recommended and will be deprecated.

http://code.google.com/p/phantomjs/issues/detail?id=47
 2011-09-09 01:05:23 -07:00
IceArmy 54ce2f72e1 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-09-09 00:42:47 -07:00
Ariya Hidayat d844d5404f Fix wrong viewport size due to commit 6e39625e. 
http://code.google.com/p/phantomjs/issues/detail?id=217
 2011-09-08 23:40:05 -07:00
Ariya Hidayat f7162f7302 Fix coding style (brace placement and indentation with spaces). 2011-09-08 22:35:07 -07:00
Ariya Hidayat e674283821 Fix the proxy option example (http is not needed). 
This was mentioned in
http://code.google.com/p/phantomjs/issues/detail?id=19
 2011-09-08 21:37:40 -07:00
Ariya Hidayat 64bc80d080 Add simple tests for require(). 
http://code.google.com/p/phantomjs/issues/detail?id=47
 2011-09-08 17:55:31 -07:00
Ariya Hidayat a62299214d Fix braces placement to follow the coding style. 2011-09-08 17:49:05 -07:00
Ariya Hidayat 4fb37aa0cc Create FileSystem instance only when needed. 2011-09-08 17:37:01 -07:00
Ariya Hidayat 2b83a52251 Implement require('webpage'). 
This is mostly based on Ivan's work, see
https://github.com/ariya/phantomjs/pull/153

window.WebPage still works, it is not recommended and will be
deprecated.

http://code.google.com/p/phantomjs/issues/detail?id=47
 2011-09-08 17:32:31 -07:00
IceArmy dab9b24983 Regenerate resources 2011-09-08 15:53:20 -07:00
IceArmy ad390acd96 Implement require('fs') 
http://code.google.com/p/phantomjs/issues/detail?id=47
 2011-09-08 15:24:50 -07:00
IceArmy e9d87f0fb2 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-09-08 15:14:34 -07:00
Ariya Hidayat b412aba06d bootstrap.js: Reindent properly. 2011-09-08 13:25:44 -07:00
Ariya Hidayat 6a79ea7e6d Implement require('fs'). 
This is mostly based on Ivan's work, see
https://github.com/ariya/phantomjs/pull/153

http://code.google.com/p/phantomjs/issues/detail?id=47
 2011-09-08 10:00:07 -07:00
Ariya Hidayat 67be09ec80 Update ChangeLog. 2011-09-08 07:34:19 -07:00
Ariya Hidayat 080eb26a11 Add the proper *.js files to OTHER_FILES. 2011-09-08 07:15:13 -07:00
IceArmy f51b5144f0 Fix issue 225: netsniff.coffee produces invalid HAR 2011-09-08 00:25:51 -07:00
IceArmy 5821a60db1 Rename option/config to localToRemoteUrlAccess(Enabled). 2011-09-07 20:52:22 -07:00
Ariya Hidayat d94b0c4fbb Fix missing rename from commit 059e7258. 2011-09-07 20:50:02 -07:00
Ariya Hidayat e45c5328b9 CoffeeScript version of unrandomize example. 2011-09-07 17:52:58 -07:00
Ariya Hidayat 059e72588c Rename option/config to localToRemoteUrlAccess(Enabled). 2011-09-07 09:27:20 -07:00
IceArmy de2dc7b861 Stop unsafe QByteArray conversions using str() 2011-09-07 05:00:26 -07:00
IceArmy 8a2b9e77df Include ChangeLog in build_binary 2011-09-06 22:47:07 -07:00
IceArmy 70fe7a4777 Don't check for multiple examples paths in build_binary anymore 2011-09-06 22:46:56 -07:00
IceArmy bd67351ab0 Fix import of version in build_binary 2011-09-06 22:40:33 -07:00
IceArmy 2448157c04 Config to limit the disk cache size 2011-09-06 19:32:10 -07:00
Ariya Hidayat d35f81bbda Decouple static helper methods from a class. 2011-09-06 17:00:59 -07:00
Ariya Hidayat bc348c5a35 Give function parameter a proper name. 2011-09-06 17:00:59 -07:00
Ariya Hidayat 962f99fa77 Fix typo in the method name. 2011-09-06 17:00:55 -07:00
Ariya Hidayat e14c07f288 Fix member variable initialization order. 2011-09-06 16:38:51 -07:00
Ariya Hidayat 07c6eb81f5 Sort include files alphabetically. 2011-09-06 16:37:54 -07:00
Ariya Hidayat 3dc9fe53a0 Disk cache object is private for network access. 2011-09-06 16:36:23 -07:00
Ariya Hidayat c0e179d59e Do not manage object lifetime, rely on Qt for that. 2011-09-06 16:35:19 -07:00
Ariya Hidayat cebe64ec31 Config to limit the disk cache size. 
Based on the previous patch at https://github.com/ariya/phantomjs/pull/144.

http://code.google.com/p/phantomjs/issues/detail?id=220
 2011-09-06 16:33:11 -07:00
Ariya Hidayat 7aa5ec5347 Do not use empty string literal for the default parameter. 2011-09-06 16:01:19 -07:00
Ariya Hidayat 5753e739a8 Merge pull request #150 from Roejames12/master 
More features
 2011-09-05 18:44:04 -07:00
Ariya Hidayat d29fb285a8 Merge pull request #152 from durham-university/warnings-fixes 
Fixes a couple of compiler warnings
 2011-09-05 18:43:42 -07:00
Alex Whitman 774070809f Fixes a couple of compiler warnings 
* Unused parameter in networkaccessmanager.cpp
* No newline at the end of networkreplyproxy.cpp
 2011-09-05 15:23:52 +01:00
IceArmy 8d754a3e95 Remove fs.move; it's already implemented in filesystem-shim 2011-09-04 22:43:24 -07:00
IceArmy c3262dcb9b Regenerate resources 2011-09-04 22:08:00 -07:00
IceArmy bb1a6fa838 Implement copyTree in filesystem-shim 2011-09-04 22:07:17 -07:00
IceArmy afe59b87dc Merge branch 'master' of https://github.com/ariya/phantomjs 2011-09-04 22:00:26 -07:00
Ariya Hidayat 7cd76309e6 Merge pull request #151 from detro/dev-commonjs_fileio 
Last API
 2011-09-04 21:19:15 -07:00
Ivan De Marino 88991207c2 Added "copyTree(source, destination)" to the set of File API. 
* This is the last API
* I added tests accordingly
* Test could be improved with a proper recursive comparison
* Or, if we introduce "phantom.exec", we could just run a "diff -rq" :)
 2011-09-04 23:42:54 +01:00