Commit Graph

505 Commits (da629874d3b6e8b2673e0c79a75ee723f60f8d1c)

Author SHA1 Message Date
Ivan De Marino e233408300 Some extra ".gitignore" options. 2011-04-18 22:22:10 -07:00
Ivan De Marino 4f1fbb3f81 Commented out flags for "phantomjs.pro" that can be useful to have at hand. 2011-04-19 01:04:15 +01:00
Ivan De Marino fa0314a2f1 Some extra ".gitignore" options. 2011-04-19 01:03:25 +01:00
Ariya Hidayat b0cba41174 Merge branch 'master' of https://github.com/Roejames12/phantomjs into Roejames12-master 2011-04-13 21:46:18 -07:00
IceArmy 799757a1af Merge remote branch 'upstream/1.1' into 1.1 2011-04-13 21:30:24 -07:00
IceArmy 77900675c0 Merge remote branch 'upstream/master' 2011-04-13 19:44:04 -07:00
Ariya Hidayat f5e07481dd Mention the new text extract example. 2011-04-13 19:37:14 -07:00
IceArmy 1a9c28af62 Fix bug with arg parser
if --option script arg had no arg after it (or had another --option type arg), args.script would be None and would insert None after --option
2011-04-13 19:35:38 -07:00
Ariya Hidayat 2deb758a3b Merge branch 'westonruter-master' 2011-04-13 09:22:03 -07:00
IceArmy 24f013df73 Script arguments can now use --option type args
... as long as the option names don't conflict with the programs option names of course
2011-04-13 08:12:43 -07:00
IceArmy 924eaa9cbd Only show status code if it exists 2011-04-13 07:45:54 -07:00
IceArmy 201731325a Change reply.attribute from .toInt() to .toString() 2011-04-13 04:12:26 -07:00
IceArmy acbc62a1a5 Added HTTP status code to debug messages in handleFinished() 2011-04-13 04:07:53 -07:00
IceArmy 494866a769 Issue 20: JPG transparent colour is black.
Filling QImage with transparent white instead of transparent
black. For an artifact free rendering of a transparent web
page into PNG, Format_ARGB32 is needed instead of
Format_ARGB32_Premultiplied.
2011-04-13 02:53:26 -07:00
IceArmy 6fdc9d11f5 Allow setting clipRect to height:0, width:0, which will 'reset' the clipRect 2011-04-13 02:08:33 -07:00
Ariya Hidayat 7b3667382b Merge branch 'master' of https://github.com/westonruter/phantomjs into westonruter-master 2011-04-12 23:04:00 -07:00
Weston Ruter ffd38ad225 Adding extract-text.js example 2011-04-12 22:58:26 -07:00
Ariya Hidayat 9e1241d3fb Update the ChangeLog with all the recent changes. 2011-04-12 22:06:21 -07:00
IceArmy 2121fb4026 Added option for disk cache use 2011-04-12 19:36:25 -07:00
IceArmy 3ca9137219 Show response URL on NetworkAccessManager's Reponse (because you can't always know what request the response came from) 2011-04-12 18:53:23 -07:00
IceArmy 6f9f368cab Fixed issue 86 - req.url() in NetworkAccessManager createRequest() displays incorrectly 2011-04-12 18:37:29 -07:00
IceArmy bb9624852d Merge remote branch 'upstream/master' 2011-04-12 18:25:24 -07:00
IceArmy ccde5cc418 Cleanup imports / removed very bad "import *" 2011-04-12 18:20:17 -07:00
Ariya Hidayat 528c2325e6 Merge branch 'jontuk-network-disk-cache' of https://github.com/jontuk/phantomjs into jontuk-jontuk-network-disk-cache 2011-04-12 10:17:13 -07:00
Jon Turner e82619df4d Removed old function declaration 2011-04-12 18:10:53 +01:00
Jon Turner 0e1e5071fb Added option for disk cache use 2011-04-12 15:21:09 +01:00
IceArmy 16b55bba45 Fix URL qDebug in createRequest, which errored out if URL had an ordinal not in range(128) 2011-04-12 03:27:56 -07:00
IceArmy 7719e12aa7 New NetworkAccessManager
The new NetworkAccessManager currently:
- logs HTTP Method type
- logs HTTP Destination URL
- logs HTTP Reponse
2011-04-12 01:38:19 -07:00
IceArmy 1bdd1867ff Remove some extra spacing on the header 2011-04-12 01:37:47 -07:00
IceArmy 6c5c23a8fb Created README and INSTALL files 2011-04-12 01:37:09 -07:00
IceArmy 42dbe9d8f2 Fixed bug in main file where QString was not defined
Added message handling system
Simplified userAgent system
Added qDebug and qFatal messages
qDebug does not display unless you specify -v or --verbose on the command line
2011-04-12 01:34:20 -07:00
IceArmy 0bc48c7131 Fix usage message from tag:file to tag=file 2011-04-12 01:33:15 -07:00
IceArmy af2cdf944d Refactor code into separate files 2011-04-12 01:32:07 -07:00
Ariya Hidayat e449c4ba19 Mention the contribution guide. 2011-04-09 23:55:09 -07:00
Ariya Hidayat c1781944c7 Remove unfinished browsermode example. 2011-04-09 23:36:28 -07:00
Ariya Hidayat e808690fd8 Default build should not litter the output with debug messages. 2011-04-09 23:04:01 -07:00
Ariya Hidayat 7280e6d5c6 For the moment, remove simulateMouseClick, includeJS, and loadJS.
See http://code.google.com/p/phantomjs/issues/detail?id=32 and
http://code.google.com/p/phantomjs/issues/detail?id=41.
2011-04-09 22:40:36 -07:00
Ariya Hidayat c0ea3d8732 Preserve last year copyright. 2011-04-09 22:37:06 -07:00
Ivan De Marino 8ed9dc1c44 Adding forgotten Include Guards. 2011-04-09 19:49:22 +01:00
Ivan De Marino 1f1e1d17e4 Amended a stupid mistake with Version String.
I always forget that the Pre-Compiler passes only once.
2011-04-09 19:48:58 +01:00
Ivan De Marino be72a29c9f Propagated License Headers. 2011-04-09 18:34:04 +01:00
Ivan De Marino 71e0612ccc Added analysis of the HTTP Reply in the NetworkAccessManager. 2011-04-09 18:26:04 +01:00
Ivan De Marino 6ec8b3b669 New "shim" Network Access Manager, new 'browsermode' example and more.
The new Network Access Manager currently is designed to do just logging:
- logs HTTP Method type
- logs HTTP Destination URL

The new 'browsermode':
It's in "/examples" and make PhantomJS do just a call to "open(url)".
It has a companion shell script to help with the task.

Also, improvement for Message Handler:
messages are now prefixed with ISO Datetime.
2011-04-09 18:22:52 +01:00
Ivan De Marino c616205620 Added a Qt Message Handler (finally). 2011-04-08 15:49:20 +01:00
Ivan De Marino a45b8e8401 Major refactoring of the CPP code into separate classes.
This doesn't add ANY new feature: it's aimed only at separating code into
more manageable pieces.

Maybe it's not perfect yet, but it's a start.
2011-04-08 14:30:50 +01:00
Ivan De Marino ce07e12c9e Merge remote branch 'upstream/master' 2011-04-07 10:19:12 +01:00
Gabor Torok 6e485df72a added example for waitFor function 2011-04-04 21:14:02 -07:00
IceArmy 3a7aad798e Remove setObjectName as we don't need it 2011-04-01 20:50:51 -07:00
IceArmy e0b869ab35 Regenerated resources, and compressed them 2011-04-01 16:48:56 -07:00
IceArmy e52b422e3c Added phantom.clipRect to be able to control the dimensions of the output
- There's 4 values: width, height, top, and left
- You can read it by, i.e. phantom.clipRect['width']
- You can set it by, phantom.clipRect = {width: 400, height:300, ...}
2011-04-01 13:37:12 -07:00