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

729 Commits (715f1a7fc3c344f49892c700a7ae66cf04af85e7)

Author SHA1 Message Date
Ivan De Marino 715f1a7fc3 Refactored the JS Shims to be isolated in their own file. 
Also, refactored some "too cautious" code to load the shim.

PS I don't grasp 100% the point of "Terminal". Wouldn't qDebug() be enough? What am I missing?
 2011-09-01 18:06:30 -07:00
Ariya Hidayat a0b97e8c6f Mac OS X build script: use 4.7.4, static build QtWebKit and PhantomJS. 2011-09-01 17:37:50 -07:00
Ariya Hidayat 4dca2b3d60 Fixed issue 212: build problem due to config.h. 
Change <config.h> in the GIF code to "config.h" so that it is not
confused with PhantomJS' own config file.
 2011-08-31 09:40:43 -07:00
Ariya Hidayat 868e751bea Merge pull request #143 from execjosh/issue-206-web-page-init 
Allow for passing options to WebPage constructor
 2011-08-31 09:28:58 -07:00
Ariya Hidayat 8ebd446e58 Merge pull request #145 from detro/master 
Comments stuff
 2011-08-31 09:27:52 -07:00
Ivan De Marino d8d88a3894 Added "Copyright..." line to files on which I worked on. 
I tried to also add/remove based on the git history.
 2011-08-31 16:29:40 +01:00
Ivan De Marino 12699b1514 Added the new "--local-access-remote" to the list of additions for the next release. 
PS I know, we need to find a new name for this. Did you find one? I couldn't come up with anything else yet. Maybe "--allow-local-xdomain"?
 2011-08-31 16:26:25 +01:00
Ariya Hidayat 344654854f Merge pull request #140 from execjosh/issue-180-config-file 
Issue 180: PhantomJS Config File
 2011-08-30 22:53:26 -07:00
execjosh d792cd8d05 Remove ini file related stuff from Config 2011-08-30 00:50:59 +09:00
execjosh 3c4699b609 Add "--config" command-line option 2011-08-30 00:45:39 +09:00
execjosh 26f7185bf6 Implement JSON config loader 2011-08-30 00:43:41 +09:00
execjosh 94c5e270cf Remove superfluous inclusion of QApplication 2011-08-29 23:24:45 +09:00
execjosh 8f89ddc9a3 Make Config extend QObject 2011-08-29 23:23:01 +09:00
Ariya Hidayat 783229214c Unit test: remove the test for non-public method. 2011-08-28 15:12:12 -07:00
execjosh da97b9abbf Fixup copyInto function 
* Drop any undefined values
* Copy non-objects, too
 2011-08-28 23:12:52 +09:00
execjosh 74db4807d5 Actually add parameter to WebPage constructor 2011-08-28 22:29:31 +09:00
execjosh 3c790d80a8 Migrate command-line argument processing logic to Config 2011-08-28 22:13:57 +09:00
Ariya Hidayat 43a987d5b4 Merge pull request #142 from execjosh/issue-205-basic-webpage-tests 
Add basic tests for WebPage
 2011-08-28 05:58:42 -07:00
Ariya Hidayat 1ccf1e64be Merge pull request #141 from schmurfy/patch-1 
typo
 2011-08-28 05:57:47 -07:00
Julien Ammous 217b7ecbd4 typo 2011-08-29 00:12:48 +03:00
execjosh 9c94a8ef24 Rename ini file code to "Config::loadIniFile" 2011-08-28 21:12:40 +09:00
execjosh ad53b9bb3e Rename "PhantomConfig" to "Config" 2011-08-28 21:11:20 +09:00
execjosh cad33014b4 Alphabetize WebPage function tests 2011-08-28 20:24:46 +09:00
execjosh ec92ac735c Add basic tests for WebPage 2011-08-28 20:13:38 +09:00
execjosh 102b421617 Allow for passing options to WebPage constructor 2011-08-28 19:11:24 +09:00
execjosh 1461ac012d Implement config file (.phantomjsrc) 2011-08-27 03:03:06 +09:00
execjosh f5f436160c Migrate page settings to PhantomConfig 2011-08-27 03:02:59 +09:00
execjosh a445b2d7b9 Migrate network access manager settings to PhantomConfig 2011-08-27 03:02:51 +09:00
execjosh 5441f51607 Migrate proxy settings to PhantomConfig 2011-08-27 03:02:43 +09:00
execjosh a75f7c9dc3 Create PhantomConfig and migrate output and script encoding settings 2011-08-27 03:02:35 +09:00
Ariya Hidayat c4b1d443ff Merge pull request #139 from Roejames12/master 
More updates!
 2011-08-24 17:36:30 -07:00
IceArmy 84f53357f4 Differentiate between _private and builtin_ 2011-08-24 17:02:34 -07:00
IceArmy e4dfb406f0 Alter 'should have the default outputEncoding of UTF-8' test to compare against lowercase, for PyPhantomJS compatibility 2011-08-24 16:48:42 -07:00
IceArmy 1b73d5c310 Add phantom.outputEncoding 2011-08-24 16:39:58 -07:00
IceArmy 33466c87c3 Fix bug where SafeStreamFilter couldn't decode utf-8 2011-08-24 15:40:29 -07:00
IceArmy 5e069ee711 Misc improvements 
Changed all if not's/if's for None's to if value is None/if value is not None
Fix bug in fs where split never used os.altsep because if not always evaluated to False since there's almost always something in the list returned
Fix the fixme on fs.isAbsolute where we needed to split the Windows drive letter off
 2011-08-24 14:32:29 -07:00
Ariya Hidayat c517674f3f Merge pull request #137 from execjosh/examples-for-output-encoding 
Add examples for phantom.outputEncoding
 2011-08-24 11:46:59 -07:00
execjosh b5bb07faa4 Add examples for phantom.outputEncoding 2011-08-25 03:15:26 +09:00
Ariya Hidayat 66460a7793 Fix building with Qt 4.6. 2011-08-24 05:48:07 -07:00
Ariya Hidayat 051f3ea839 examples/pizza: Switch to use Yelp. 
http://code.google.com/p/phantomjs/issues/detail?id=200
 2011-08-23 23:34:50 -07:00
Ariya Hidayat 6fe972d0a8 Implement WebPage's release() function in pure C++. 2011-08-23 18:53:53 -07:00
IceArmy e6a644e3da Improve the Singleton implementation of CSConverter 2011-08-23 16:19:58 -07:00
Ariya Hidayat 6e4137f16c Merge pull request #136 from Roejames12/master 
Updates
 2011-08-23 12:31:41 -07:00
IceArmy 3d8d7342ab Rename self.parent to self.m_parent 2011-08-23 12:18:41 -07:00
IceArmy 9c464bca13 Regenerate resources 2011-08-23 12:18:41 -07:00
IceArmy fa285e0aca page.release() now works without JS shim. 2011-08-23 12:18:25 -07:00
IceArmy 3b263a9ebb Regenerate resources 2011-08-23 01:43:43 -07:00
IceArmy 2a909173f8 Update bootstrap 2011-08-23 01:43:43 -07:00
Ariya Hidayat 31a75b02a5 Merge branch 'master' of github.com:ariya/phantomjs 2011-08-22 09:03:47 -07:00
Ariya Hidayat 47929b4507 Mac build script: patch to allow static build, install as final step. 2011-08-22 09:03:11 -07:00