200 Commits

Author SHA1 Message Date
Ariya Hidayat 16a0cd36e3 Merged pull request #39 from Roejames12/1.1.
My *last* changes for 1.1 :)
2011-04-27 17:10:05 -07:00
IceArmy 70cac70df6 Merge branches 'master' and '1.1' into 1.1 2011-04-27 17:02:22 -07:00
IceArmy 65563ca89d - Automatically convert Qt types by using api 2
* Convert all QString and QVariant types
* Replaced all references to QString with Python str object

- Fixed bug where phantom.version didn't work
- Don't cd to scripts directory anymore (but loadScript still loads scripts from directory relative to it)
- clipRect.setter and viewportSize.setter both have improved system now.
* if you miss or neglect to specify an attritube (width, height, etc), there will no longer be an exception. it will be handled gracefully, and whatever you didn't specify won't be changed
* if you enter a negative value on any of them, it'll be reset to 0 (except for phantom.clipRect top and left) and you won't loose your attempted changes

- Cleaned up Webpage's javaScriptConsoleMessage print JavaScript (sourceID)
- Allow viewportSize to be set to 0 (default)
- General cleanup
2011-04-27 16:36:45 -07:00
IceArmy 92573698f5 Start using new style signals and slots 2011-04-27 05:15:25 -07:00
IceArmy 7f6fec5b5e Refactor main file
- Moved main code to main()
- Moved argument parsing to parseArgs()

Changed
- Removed qFatal's and replaced them with sys.exit(message)
- upload-file: Fixed bug where tag= (if it wasn't in first arg) wasn't caught as empty
- upload-file: Added duplicate tag checking
2011-04-27 02:45:41 -07:00
IceArmy e991e1b150 Merge remote branch 'upstream/1.1' 2011-04-27 01:54:32 -07:00
IceArmy 7a82a88fd6 Merge remote branch 'origin/1.1' 2011-04-27 01:54:17 -07:00
Ariya Hidayat 0120e03335 Optimistically place the release date. 2011-04-27 00:51:47 -07:00
Ariya Hidayat 717d9e93e7 Optimistically place the release date. 1.1.0 2011-04-27 00:51:20 -07:00
Ariya Hidayat 3ba2f6c45d Merge branch 'master' into 1.1 2011-04-25 09:43:48 -07:00
Ariya Hidayat bd00099658 Merged pull request #36 from rgieseke/coffeescript-examples.
Minor fix and improvement for the Coffeescript examples
2011-04-25 09:40:42 -07:00
rgieseke d3845e94ab Use YAML-Style array creation in follow.coffee. 2011-04-25 18:28:26 +02:00
rgieseke 38a6638d2c Fix weather.coffee. Implicit parentheses are until end of line. 2011-04-25 18:26:44 +02:00
Ariya Hidayat 0de16879d2 Merge branch 'master' into 1.1 2011-04-23 10:56:20 -07:00
rgieseke dfd4c06586 Remove unnecessary semicolons in coffeescript examples. 2011-04-23 19:43:18 +02:00
Ariya Hidayat c2a53ba374 Merge branch 'master' into 1.1 2011-04-23 10:03:53 -07:00
rgieseke 0a91497075 Loop only through divs, not length and item. 2011-04-23 14:41:19 +02:00
rgieseke 0acb9195b0 Add Coffeescript version of waitfor.js. 2011-04-23 14:38:51 +02:00
rgieseke e32b6ba529 Change meaning of message parameter to show what has happenend. 2011-04-23 13:13:38 +02:00
rgieseke c8043520ee Don't throw error on timeout, use phantom.exit instead. 2011-04-23 13:09:42 +02:00
rgieseke a7713e31da Use shorter default timeout. 2011-04-23 13:05:43 +02:00
rgieseke d4df69b175 Use an existing Twitter account and update name changes in new Twitter. 2011-04-23 13:04:48 +02:00
rgieseke ef899fee17 Use spaces throughout. 2011-04-23 13:00:00 +02:00
Ariya Hidayat 50a1aa6aac Merge branch 'master' into 1.1 2011-04-22 13:02:46 -07:00
Ariya Hidayat 6593a170b8 Update the ChangeLog. 2011-04-22 11:34:31 -07:00