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

929 Commits (c3179c3deeae540ba8fa6e76b4e16376cf36d54e)

Author SHA1 Message Date
Milian Wolff c3179c3dee move mongoose dir, use same setup like in gif folder 2011-11-15 13:38:01 +01:00
Aditya Ivaturi feed6fdc72 From now on including mongoose directly in the project 2011-11-15 13:38:01 +01:00
Aditya Ivaturi 2e43d7da15 Modified name of the shared lib generated 2011-11-15 13:38:01 +01:00
unknown 2b21135119 Fixed the make command for mingw 2011-11-15 13:38:01 +01:00
Aditya Ivaturi 71ffff002f Adding mongoose code & commented out parts in Makefile to skip the exe generation 2011-11-15 13:38:01 +01:00
Ariya Hidayat d8494a3f37 Merge pull request #170 from Roejames12/bfd54c381716fb841bd59372d52c390678c62b2e 
Add bugfix to changelog
 2011-11-06 05:40:09 -08:00
IceArmy bfd54c3817 Add a bug fix to the changelog 2011-11-05 21:10:46 -07:00
Ariya Hidayat 04e281e365 Static Linux build script: disable some more configs. 
http://code.google.com/p/phantomjs/issues/detail?id=197
 2011-11-04 19:54:24 -07:00
Ariya Hidayat ada7611cda Initial version of build script for static Linux. 
http://code.google.com/p/phantomjs/issues/detail?id=197
 2011-11-04 08:39:01 -07:00
Ariya Hidayat f1b03e84d9 Bump the unstable version to 1.4. 2011-10-29 11:18:50 -05:00
Ariya Hidayat 708c8e4719 Merge pull request #169 from Roejames12/master 
Small updates
 2011-10-29 08:36:36 -07:00
IceArmy be8eece175 Refactor hook creation and hook existence checks in plugincontroller 2011-10-28 01:03:44 -07:00
IceArmy 5bcd3897a3 Refactored some redundant code from load_plugins() 2011-10-28 00:26:22 -07:00
IceArmy ec55ebdc00 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-10-26 11:48:04 -07:00
Ariya Hidayat 8ffd7a2403 detectsniff example: Check if the web page sniffs the user agent. 
http://code.google.com/p/phantomjs/issues/detail?id=263
 2011-10-25 11:33:10 -05:00
Ariya Hidayat f18fd5372f Fix regression of onInitialized. 
As suggested by Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>,
there is no need to use queued connection for initialized() slot.

http://code.google.com/p/phantomjs/issues/detail?id=264
 2011-10-25 09:48:27 -05:00
IceArmy 3980f76533 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-10-20 20:51:23 -07:00
IceArmy ee9646c5e7 Revert "cookie.value() didn't really need to be a string, since QSettings will take a QVariant anyways." 
This reverts commit 5ffeef450c.

Apparently, this actually does cause a problem, as further cookies are saved in the cookies.txt file, and if the value isn't a string, then we get QByteArray() stuff polluted everywhere in the file. Oops!
 2011-10-18 18:52:47 -07:00
Ariya Hidayat b032d59297 Merge pull request #168 from Roejames12/master 
Small updates
 2011-10-18 00:23:56 -07:00
IceArmy 5ffeef450c cookie.value() didn't really need to be a string, since QSettings will take a QVariant anyways. 2011-10-17 23:32:55 -07:00
IceArmy 3ea50c443f Minimize down the with statements that use QPyFile 2011-10-17 22:44:19 -07:00
IceArmy 005e54de56 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-10-17 21:01:45 -07:00
IceArmy 34b595d01d Remove unused javascript files 2011-10-17 21:01:17 -07:00
Ariya Hidayat d4abd3b71b Merge pull request #167 from detro/master 
Refactored and Centralised how we handle the loading of resource files.
 2011-10-17 20:49:24 -07:00
Ivan De Marino 19b32cff0a Refactored and Centralised how we handle the loading of resource files. 
* Some code reuse
* Centralised in Utils the loading of resource files
* It is safe to assume, when loading a resource file, that IT'S THERE and IT'S READABLE
* ALSO, I removed the unused 'shims' (we forgot them in there :P)
 2011-10-16 20:35:21 +01:00
Ariya Hidayat 3c11109e28 Merge pull request #164 from nixterrimus/patch-1 
Change comment in run-jasmine example to be consistent with the way the c
 2011-10-06 19:40:30 -07:00
Nick Rowe 56f470e3a1 Change comment in run-jasmine example to be consistent with the way the code is written 2011-10-06 13:43:12 -07:00
IceArmy 13118b35bf Avoid deleting a QWebPage inside its own signal emission. 
If Phantom.exit() is called inside the handler for loadFinished(), we
end up in a situation that QWebPage is deleting itself during a signal
emission. This used to be OK in QtWebKit 2.0 (Qt 4.7) but is not OK for
QtWebKit 2.2 (upcoming Qt 4.8).

http://code.google.com/p/phantomjs/issues/detail?id=251

Patch by Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>.
 2011-10-06 08:28:23 -07:00
Ariya Hidayat fe20c0987d Avoid deleting a QWebPage inside its own signal emission. 
If Phantom.exit() is called inside the handler for loadFinished(), we
end up in a situation that QWebPage is deleting itself during a signal
emission. This used to be OK in QtWebKit 2.0 (Qt 4.7) but is not OK for
QtWebKit 2.2 (upcoming Qt 4.8).

http://code.google.com/p/phantomjs/issues/detail?id=251

Patch by Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>.
 2011-10-05 17:26:46 -07:00
Ariya Hidayat 3ba6649706 Merge pull request #163 from aportale/master 
Autotest for Issue 249 (text codec support in static builds)
 2011-10-04 21:41:55 -07:00
Ariya Hidayat a00d453fcd Minor rewording. 2011-10-04 21:41:35 -07:00
Alessandro Portale bf9a68ed43 Autotest for Issue 249 (text codec support in static builds) 
Tests Japanese (Shift_JIS, EUC-JP, ISO-2022-JP) and Chinese
(Big5, GBK). Easy to extend with more data.

It will currently fail with static builds of PhantomJS, but
pass with dynamic ones.
 2011-10-05 04:34:35 +02:00
Ariya Hidayat b8e69788d1 Merge pull request #162 from Roejames12/master 
Some updates..
 2011-10-04 11:53:13 -07:00
IceArmy af88a37ed8 Fix bug in CookieJar where QSettings expected str, but got QByteArray instead (#10) 2011-10-04 11:16:44 -07:00
IceArmy 1505c9a486 Add an actual version in the INSTALL for python-argparse 2011-09-28 12:29:56 -07:00
IceArmy c513f6430f Allow render() to save gif files. Requires PIL. 2011-09-27 14:17:35 -07:00
IceArmy d1b6623251 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-09-27 10:34:03 -07:00
IceArmy 2accc8a724 Reorder methods to be alphabetical 2011-09-24 23:11:42 -07:00
Ariya Hidayat 1b7564ec3c This is "Water Lily". 2011-09-23 22:01:12 -07:00
IceArmy 470aaf5143 Reorder signals alphabetically 2011-09-23 06:38:41 -07:00
IceArmy 698c2619a8 Remove extra spaces in license 2011-09-23 04:40:56 -07:00
Ariya Hidayat 72279ca335 Merge pull request #160 from Roejames12/master 
Just a few simple updates
 2011-09-22 17:06:16 -07:00
IceArmy 58ea69dd7f Simplify process where auth username and password gets set 2011-09-22 04:26:58 -07:00
IceArmy 77d213f3ec Merge branch 'master' of git://github.com/ariya/phantomjs 2011-09-21 00:13:42 -07:00
Ariya Hidayat eb255817c5 Revert support for getting body of requests or responses. 
This is causing a serious regression. For details, check out the
following issues:

http://code.google.com/p/phantomjs/issues/detail?id=158
http://code.google.com/p/phantomjs/issues/detail?id=238
 2011-09-20 23:05:34 -07:00
Ariya Hidayat 8b0f13309a examples/follow: Update Sencha folks. 2011-09-20 21:55:24 -07:00
Ariya Hidayat 428c386cb8 Merge pull request #159 from gr2m/patch-1 
Just a simple change to not only log the failed error, but also the actua
 2011-09-20 18:18:54 -07:00
Gregor Martynus cec8b5672e Just a simple change to not only log the failed error, but also the actual message 2011-09-21 02:50:21 +03:00
IceArmy 796343a8f2 Revert "Add plugin hook to __init__" 
This reverts commit c039a34068.
 2011-09-18 21:22:27 -07:00
IceArmy 06e8a6dd3b Improve QPyFile implementation 
- Now supports Python style open mode flags
- Wrappers have been placed around methods which require/return foreign data types
 2011-09-18 15:52:29 -07:00