Commit Graph

110 Commits (ce07e12c9e51095753245a88dfd81375f177e106)

Author SHA1 Message Date
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
IceArmy 6888877aad In setClipRect, remove top and left positive only limits 2011-04-01 13:21:35 -07:00
IceArmy 240e6a2c4a Stop trashing CPU on sleep's infinite loop 2011-03-31 21:36:44 -07:00
IceArmy f08e4faeed Renamed some variables to get around predefined keywords 2011-03-30 16:32:03 -07:00
Ariya Hidayat 87a337f6df Merge branch 'master' of https://github.com/wouterdebie/phantomjs into wouterdebie-master 2011-03-30 08:13:53 -07:00
IceArmy 3efc6a5ddf General improvements 2011-03-30 05:02:16 -07:00
IceArmy fd8fa690c4 Update usage message 2011-03-30 00:46:21 -07:00
Wouter de Bie 2a84536d95 Match coding style 2011-03-30 08:18:47 +02:00
IceArmy e57adfe0b6 Issue 17: Make paper size for the PDF export specifiable 2011-03-29 22:54:07 -07:00
IceArmy 4926841be1 Specify js or coffee in usage message 2011-03-29 22:53:23 -07:00
Wouter de Bie affdd9b245 Don't copy buffers, but translate the QPainter instead when clipping 2011-03-29 21:01:40 +02:00
Wouter de Bie f96d113302 Renamed clipSize() to clipRect() 2011-03-29 20:09:45 +02:00
Wouter de Bie 7531b3311c Renamed renderSize() to clipSize() and fixed a bug 2011-03-29 20:06:12 +02:00
Wouter de Bie 2fe2e696ee Modified phantom.renderSize() to allow top and left parameters 2011-03-29 13:30:40 +02:00
Wouter de Bie 3e939febd4 Added phantom.renderSize() to be able to control the dimensions of the output 2011-03-29 08:39:58 +02:00
Ivan De Marino 8ac4a7962b Separated the "usage" instructions in a text file, embedded as "resource".
Also:
* I added a couple of "qFatal" where it makes sense.
* Usage now mentions the fact that the input files that finish by ".coffee" are also acceptable
2011-03-24 23:20:34 -07:00
Ivan De Marino f86bc38bc1 Separated the "usage" instructions in a text file, embedded as "resource".
Also:
* I added a couple of "qFatal" where it makes sense.
* Usage now mentions the fact that the input files that finish by ".coffee" are also acceptable
2011-03-24 22:43:49 +00:00
Ivan De Marino 23cfad71fa Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/phantomjs.cpp
2011-03-24 22:00:53 +00:00
Ariya Hidayat 2182d8e54b Add icon files for Windows and OS/2.
Issue: http://code.google.com/p/phantomjs/issues/detail?id=60

This improvement is provided by Salvador Parra Camacho.
2011-03-18 23:43:45 -07:00
Ariya Hidayat 1a4af0a5d0 Merge branch 'Issue_17' of https://github.com/aportale/phantomjs into aportale-Issue_17 2011-03-18 22:18:04 -07:00
IceArmy 62d798ddf8 Amend copyright date 2011-03-18 14:35:23 -07:00
Alessandro Portale fbb524e629 Issue 17: Make paper size for the PDF export specifiable
http://code.google.com/p/phantomjs/issues/detail?id=17

Adding a new phantom property called "paperSize". It takes one of
the two possible dictionary variants:
   { width: '200px', height: '300px', border: '0px' }
   { format: 'A4', orientation: 'portrait', border: '1cm' }
- If no paperSize is defined, the size is defined by the web page
- supported dimension units are: mm, cm, in, px. No unit means px.
- border is optional and defaults to 0.
- supported formats are: A3, A4, A5, Legal, Letter, Tabloid
- orientation (portrait|landscape) is optional and defaults to portrait

I'm considering implementing a short form like:
  phantom.paperSize = 'A4';
...needs further investigation.
2011-03-18 10:26:45 +01:00
IceArmy 162aacdc7e Remove 2 variables from main QString() variable declaration list, as they're assigned a value not long afterward 2011-03-17 00:16:21 -07:00
IceArmy 198c13d195 - Migrated from Qt's QFile() method of opening files to Python's open() - Speed test shows that open() is faster at the core
- Fixed subtle bug where loadScript's filename identifier for the cache was not always the same (thereby not loading the cached copy)
2011-03-16 22:24:04 -07:00
IceArmy 55c7a4f620 Change if in chooseFile to be 'if tag in tagList' instead of 'if tagList.get(tag)'
Cache scripts using phantom.loadScript. Not much speed improvement, but when you're loading a coffee script, there is a huge speed improvement as the converted script is already cached and doesn't need to be re-compiled.
Revert phantom.render (function is supposed to return true on success!)
2011-03-16 17:17:51 -07:00
IceArmy ac39de6efa Remove -u option
Fixed help message to show "tag:file" and not just "file"
2011-03-16 00:53:36 -07:00
IceArmy a731e6c4d7 Added Python PhantomJS project 2011-03-15 22:18:01 -07:00
Ivan De Marino 3b4163521f Merge remote-tracking branch 'upstream/master' 2011-03-14 22:53:27 +00:00
Ariya Hidayat a7a1322ea1 Fixed issue #19: option for setting the proxy.
Based on the original patch by Clint Berry.
2011-03-13 21:35:49 -07:00
Ariya Hidayat 28929a3069 follow.coffee: CoffeeScript version of follow.js. 2011-03-12 10:45:56 -08:00
Ariya Hidayat f32c232cb0 follow.js: Adding lojjic. 2011-03-12 10:20:04 -08:00
Ariya Hidayat 1df1bc9590 follow.js: Find the number of twitter following and followers. 2011-03-10 21:43:37 -08:00
Ivan De Marino 6ad3352519 Minor tweaks for qDebug messages 2011-03-04 10:13:32 +00:00
Ariya Hidayat 158362ed16 Start to implement support for CoffeeScript. 2011-03-02 00:59:07 -08:00
Ariya Hidayat 3e60ae6b9b Show tweets from SenchaInc instead. 2011-03-02 00:59:07 -08:00
Ivan De Marino 25cf54784f Added "phantom.loadJs" and "phantom.includeJs", plus more "qDebug" usage
* "phantom.loadJs()" loads a JS file and executes it's content within the current Document Context. It's synchronous.
* "phantom.includeJs()" adds a <script> tag include. It's asynchronous and accepts as second parameter a "callback", fired when the js file has been loaded.
* Some more qDebug() calls
* qDebug() output disabled by default in the .pro file

NOTE: I'm adding qDebug() calls to make development of phantomjs easier and "debuggable"
2011-03-01 18:16:44 +00:00
Ivan De Marino ee1c5afc32 Merge branch 'master' of https://github.com/detro/phantomjs 2011-03-01 12:09:12 +00:00
Ivan De Marino 8951859a53 Added "phantom.simulateMouseClick" and other minors for debugging.
* 'phantom.simulateMouseClick' accepts a 'selector' and clicks on every element that matches the selector
* Added a couple of 'qDebug()' to help debugging PhantomJS
2011-03-01 12:09:03 +00:00
Ivan De Marino 9c74adeeca Enhanced the "usage" message and fixed misdocumented behaviour of "--load-plugins"
* Now the "usage" shows all the options that are currently supported by phantomjs from the command line
* The default behaviour for the option "--load-plugins" is now fixed (to "no")
2011-02-28 23:17:59 +00:00
Ariya Hidayat 378406b89d Support for rasterizing as GIF image. 2011-02-19 22:47:15 -08:00
Ariya Hidayat e15834522d colorwheel.js: Example on using Canvas to produce the color wheel. 2011-02-17 00:38:44 -08:00
Ariya Hidayat de8a2ca270 Update ChangeLog. 2011-02-13 22:50:00 -08:00
Ariya Hidayat 84a594112e Allow plugins loading (by default, plugins are not loaded).
This is issue #14:
http://code.google.com/p/phantomjs/issues/detail?id=14
2011-02-13 22:44:43 -08:00
Ariya Hidayat f827d88818 Allow disabling the loading of images.
This is issue #35:
http://code.google.com/p/phantomjs/issues/detail?id=35
2011-02-13 21:29:58 -08:00
Ariya Hidayat 799fa0b210 Hide command-line options from the script.
For example, the argument to allow file upload now is part of
phantomjs invocation:

    phantomjs --upload-file tag=/path/to/file script.js A B C

which means script.js only "sees" A, B, C in phantom.args array.
2011-02-13 20:59:37 -08:00
Ariya Hidayat bc6792769b Coding style fixes. 2011-02-13 12:01:12 -08:00