You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/12/06 23:23:47 UTC

[13/18] ios commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/8898ae4b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/8898ae4b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/8898ae4b

Branch: refs/heads/master
Commit: 8898ae4bebde53a19234b5f92e97aad3ef18ec35
Parents: 2bc366a 95cfc51
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Jul 9 14:50:39 2012 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Jul 9 14:50:39 2012 -0700

----------------------------------------------------------------------
 .gitignore                                         |    7 +-
 .../TemplateInfo.plist                             |   40 +-
 Cordova-based Application/Classes/AppDelegate.h    |    6 +-
 Cordova-based Application/Classes/AppDelegate.m    |   67 +-
 .../Classes/MainViewController.m                   |   80 +-
 .../Classes/MainViewController.xib                 |   20 +
 Cordova-based Application/Cordova.plist            |   52 +-
 Cordova-based Application/Plugins/README           |   19 +
 .../Capture.bundle/controls_bg@2x~ipad.png         |  Bin 0 -> 2858 bytes
 .../Capture.bundle/microphone@2x~ipad.png          |  Bin 0 -> 911582 bytes
 .../Capture.bundle/record_button@2x~ipad.png       |  Bin 0 -> 15822 bytes
 .../Capture.bundle/recording_bg@2x~ipad.png        |  Bin 0 -> 1026 bytes
 .../Capture.bundle/stop_button@2x~ipad.png         |  Bin 0 -> 14474 bytes
 .../Resources/icons/icon-72@2x.png                 |  Bin 0 -> 11706 bytes
 .../Resources/splash/Default-Landscape.png         |  Bin 24080 -> 0 bytes
 .../Resources/splash/Default-Landscape@2x~ipad.png |  Bin 0 -> 1534088 bytes
 .../Resources/splash/Default-Landscape~ipad.png    |  Bin 0 -> 423095 bytes
 .../Resources/splash/Default-Portrait.png          |  Bin 22644 -> 0 bytes
 .../Resources/splash/Default-Portrait@2x~ipad.png  |  Bin 0 -> 1610434 bytes
 .../Resources/splash/Default-Portrait~ipad.png     |  Bin 0 -> 421667 bytes
 .../Resources/splash/Default.png                   |  Bin 9537 -> 0 bytes
 .../Resources/splash/Default@2x.png                |  Bin 22029 -> 0 bytes
 .../Resources/splash/Default@2x~iphone.png         |  Bin 0 -> 350593 bytes
 .../Resources/splash/Default~iphone.png            |  Bin 0 -> 93897 bytes
 .../___PROJECTNAMEASIDENTIFIER___-Info.plist       |   41 +-
 .../___PROJECTNAME___.xcodeproj/TemplateInfo.plist |   20 +
 .../___PROJECTNAME___.xcodeproj/project.pbxproj    |   81 +-
 Cordova-based Application/verify.sh                |   19 +
 Cordova-based Application/www/index.html           |   22 +-
 .../01cordovalib-contents.xml                      |   20 +
 .../CordovaInstaller.pmdoc/01cordovalib.xml        |   20 +
 .../CordovaInstaller.pmdoc/02cordova-contents.xml  |   20 +
 .../CordovaInstaller.pmdoc/02cordova.xml           |   20 +
 .../CordovaInstaller.pmdoc/03cordova-contents.xml  |   20 +
 .../CordovaInstaller.pmdoc/03cordova.xml           |   20 +
 .../CordovaInstaller.pmdoc/04cordova-contents.xml  |   20 +
 .../CordovaInstaller.pmdoc/04cordova.xml           |   20 +
 CordovaInstaller/CordovaInstaller.pmdoc/index.xml  |   20 +
 CordovaInstaller/docs/finishup.md                  |   41 +-
 CordovaInstaller/docs/releasenotes.md              |  191 +-
 CordovaLib/Classes/CDV.h                           |    2 +
 CordovaLib/Classes/CDVAccelerometer.h              |   17 +-
 CordovaLib/Classes/CDVAccelerometer.m              |  106 +-
 CordovaLib/Classes/CDVAvailability.h               |   24 +-
 CordovaLib/Classes/CDVBattery.h                    |    2 +
 CordovaLib/Classes/CDVBattery.m                    |    5 +-
 CordovaLib/Classes/CDVCamera.h                     |   10 +-
 CordovaLib/Classes/CDVCamera.m                     |  497 +-
 CordovaLib/Classes/CDVCapture.m                    |   26 +-
 CordovaLib/Classes/CDVCommandDelegate.h            |    3 +
 CordovaLib/Classes/CDVConnection.m                 |   15 +-
 CordovaLib/Classes/CDVContact.h                    |    2 +-
 CordovaLib/Classes/CDVContact.m                    |   38 +-
 CordovaLib/Classes/CDVContacts.m                   |   27 +-
 CordovaLib/Classes/CDVFile.h                       |   11 +-
 CordovaLib/Classes/CDVFile.m                       |  225 +-
 CordovaLib/Classes/CDVFileTransfer.h               |   33 +-
 CordovaLib/Classes/CDVFileTransfer.m               |  314 +-
 CordovaLib/Classes/CDVLocalStorage.h               |   46 +
 CordovaLib/Classes/CDVLocalStorage.m               |  430 ++
 CordovaLib/Classes/CDVLocation.h                   |   62 +-
 CordovaLib/Classes/CDVLocation.m                   |  378 +-
 CordovaLib/Classes/CDVLogger.h                     |   26 +
 CordovaLib/Classes/CDVLogger.m                     |   39 +
 CordovaLib/Classes/CDVNotification.h               |    6 +-
 CordovaLib/Classes/CDVNotification.m               |   87 +-
 CordovaLib/Classes/CDVPlugin.h                     |   17 +-
 CordovaLib/Classes/CDVPlugin.m                     |    8 +-
 CordovaLib/Classes/CDVPluginResult.h               |   12 +-
 CordovaLib/Classes/CDVPluginResult.m               |   71 +-
 CordovaLib/Classes/CDVSound.h                      |   42 +-
 CordovaLib/Classes/CDVSound.m                      |  182 +-
 CordovaLib/Classes/CDVURLProtocol.h                |    9 +-
 CordovaLib/Classes/CDVURLProtocol.m                |    6 +-
 CordovaLib/Classes/CDVViewController.h             |    4 +-
 CordovaLib/Classes/CDVViewController.m             |  279 +-
 CordovaLib/Classes/CDVWhitelist.m                  |    4 +-
 CordovaLib/Classes/JSON/JSONKit.h                  |  130 +-
 CordovaLib/Classes/JSON/JSONKit.m                  | 1850 +++---
 CordovaLib/Classes/NSData+Base64.h                 |    6 +-
 CordovaLib/Classes/NSData+Base64.m                 |   56 +-
 CordovaLib/Classes/NSDictionary+Extensions.h       |    1 +
 CordovaLib/Classes/NSDictionary+Extensions.m       |   11 +
 CordovaLib/Classes/NSMutableArray+QueueAdditions.h |    7 +
 CordovaLib/Classes/NSMutableArray+QueueAdditions.m |   22 +-
 CordovaLib/Classes/UIDevice+Extensions.h           |   33 +
 CordovaLib/Classes/UIDevice+Extensions.m           |   48 +
 CordovaLib/Classes/compatibility/0.9.6/CDV.h       |   31 +
 CordovaLib/Classes/compatibility/0.9.6/CDVPlugin.h |   49 +
 CordovaLib/Classes/compatibility/0.9.6/CDVPlugin.m |   30 +
 CordovaLib/Classes/compatibility/1.5.0/CDV.h       |   33 +
 CordovaLib/Classes/compatibility/1.5.0/CDVPlugin.h |   24 +
 CordovaLib/Classes/compatibility/README.txt        |   23 +
 CordovaLib/Classes/debugview/CDVDebugWebView.h     |   59 +
 CordovaLib/Classes/debugview/CDVDebugWebView.m     |  211 +
 .../Classes/debugview/WebScriptDebugDelegate.h     |  135 +
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj    |  306 +-
 CordovaLib/CordovaLibApp/AppDelegate.h             |   30 +
 CordovaLib/CordovaLibApp/AppDelegate.m             |   84 +
 CordovaLib/CordovaLibApp/Cordova.plist             |   81 +
 CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist  |   65 +
 CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch  |   35 +
 CordovaLib/CordovaLibApp/ViewController.h          |   25 +
 CordovaLib/CordovaLibApp/ViewController.m          |   45 +
 .../CordovaLibApp/en.lproj/InfoPlist.strings       |   20 +
 CordovaLib/CordovaLibApp/main.m                    |   30 +
 CordovaLib/CordovaLibApp/www/index.html            |   82 +
 CordovaLib/CordovaLibTests/CDVBase64Tests.h        |   26 +
 CordovaLib/CordovaLibTests/CDVBase64Tests.m        |   60 +
 CordovaLib/CordovaLibTests/CDVContactsTests.h      |    6 +-
 CordovaLib/CordovaLibTests/CDVContactsTests.m      |    9 +-
 CordovaLib/CordovaLibTests/CDVLocalStorageTests.h  |   26 +
 CordovaLib/CordovaLibTests/CDVLocalStorageTests.m  |   54 +
 CordovaLib/CordovaLibTests/CDVMockUIWebview.h      |   43 -
 CordovaLib/CordovaLibTests/CDVMockUIWebview.m      |   74 -
 CordovaLib/CordovaLibTests/CDVWebViewTest.h        |   28 +
 CordovaLib/CordovaLibTests/CDVWebViewTest.m        |   57 +
 .../CordovaLibTests/CordovaLibTests-Info.plist     |   20 +
 CordovaLib/Makefile                                |   31 +-
 CordovaLib/VERSION                                 |    2 +-
 CordovaLib/javascript/cordova.ios.js               | 5259 +++++++++++++++
 CordovaLib/javascripts/core/acceleration.js        |   42 -
 CordovaLib/javascripts/core/accelerometer.js       |  160 -
 CordovaLib/javascripts/core/battery.js             |  123 -
 CordovaLib/javascripts/core/camera.js              |  117 -
 CordovaLib/javascripts/core/capture.js             |  194 -
 CordovaLib/javascripts/core/compass.js             |  155 -
 CordovaLib/javascripts/core/contact.js             |  409 --
 CordovaLib/javascripts/core/cordova.js.base        |  548 --
 CordovaLib/javascripts/core/debugconsole.js        |  108 -
 CordovaLib/javascripts/core/device.js              |   37 -
 CordovaLib/javascripts/core/file.js                | 1181 ----
 CordovaLib/javascripts/core/filetransfer.js        |  119 -
 CordovaLib/javascripts/core/geolocation.js         |  285 -
 CordovaLib/javascripts/core/license.js             |   21 -
 CordovaLib/javascripts/core/media.js               |  217 -
 CordovaLib/javascripts/core/network.js             |   34 -
 CordovaLib/javascripts/core/notification.js        |   64 -
 CordovaLib/javascripts/core/orientation.js         |  125 -
 CordovaLib/javascripts/core/position.js            |  130 -
 CordovaLib/javascripts/core/sms.js                 |   27 -
 CordovaLib/javascripts/core/splashscreen.js        |   22 -
 CordovaLib/javascripts/core/telephony.js           |   23 -
 CordovaLib/javascripts/plugins/README.md           |    3 -
 LICENSE                                            |   37 +-
 Makefile                                           |  130 +-
 NOTICE                                             |    2 +-
 README.md                                          |   67 +-
 bin/BOOM                                           |   22 +-
 bin/README.md                                      |   44 +
 bin/_build.sh                                      |   26 +-
 bin/autotest                                       |   22 +
 bin/bench                                          |   31 +-
 bin/create                                         |   55 +-
 bin/node_modules/.bin/cake                         |    7 -
 bin/node_modules/.bin/coffee                       |    7 -
 bin/node_modules/.bin/nodeunit                     |  120 -
 bin/node_modules/coffee-script/.npmignore          |   11 -
 bin/node_modules/coffee-script/LICENSE             |   22 -
 bin/node_modules/coffee-script/README              |   48 -
 bin/node_modules/coffee-script/Rakefile            |   78 -
 bin/node_modules/coffee-script/bin/cake            |    7 -
 bin/node_modules/coffee-script/bin/coffee          |    7 -
 bin/node_modules/coffee-script/extras/jsl.conf     |   44 -
 bin/node_modules/coffee-script/package.json        |   27 -
 bin/node_modules/nodeunit/.gitignore               |    5 -
 bin/node_modules/nodeunit/.npmignore               |    3 -
 bin/node_modules/nodeunit/CONTRIBUTORS.md          |   60 -
 bin/node_modules/nodeunit/LICENSE                  |   19 -
 bin/node_modules/nodeunit/Makefile                 |  126 -
 bin/node_modules/nodeunit/README.md                |  432 --
 bin/node_modules/nodeunit/bin/nodeunit             |  120 -
 bin/node_modules/nodeunit/bin/nodeunit.json        |   10 -
 bin/node_modules/nodeunit/deps/async.js            |  623 --
 bin/node_modules/nodeunit/deps/console.log.js      |   55 -
 bin/node_modules/nodeunit/deps/ejs.js              |  125 -
 bin/node_modules/nodeunit/deps/json2.js            |  483 --
 bin/node_modules/nodeunit/doc/nodeunit.md          |   60 -
 .../nodeunit/examples/browser/nodeunit.js          | 1757 -----
 .../nodeunit/examples/browser/suite1.js            |   12 -
 .../nodeunit/examples/browser/suite2.js            |   13 -
 .../nodeunit/examples/browser/test.html            |   16 -
 bin/node_modules/nodeunit/img/example_fail.png     |  Bin 38642 -> 0 bytes
 bin/node_modules/nodeunit/img/example_pass.png     |  Bin 14133 -> 0 bytes
 bin/node_modules/nodeunit/index.js                 |    3 -
 bin/node_modules/nodeunit/man1/nodeunit.1          |   95 -
 bin/node_modules/nodeunit/nodelint.cfg             |    4 -
 bin/node_modules/nodeunit/package.json             |   56 -
 bin/node_modules/nodeunit/share/junit.xml.ejs      |   19 -
 bin/node_modules/nodeunit/share/license.js         |   11 -
 bin/node_modules/nodeunit/share/nodeunit.css       |   70 -
 .../test/fixtures/coffee/mock_coffee_module.coffee |    4 -
 .../nodeunit/test/fixtures/dir/mock_module3.js     |    1 -
 .../nodeunit/test/fixtures/dir/mock_module4.js     |    1 -
 .../nodeunit/test/fixtures/mock_module1.js         |    1 -
 .../nodeunit/test/fixtures/mock_module2.js         |    1 -
 .../nodeunit/test/fixtures/raw_jscode1.js          |    3 -
 .../nodeunit/test/fixtures/raw_jscode2.js          |    3 -
 .../nodeunit/test/fixtures/raw_jscode3.js          |    1 -
 bin/node_modules/nodeunit/test/test-base.js        |  219 -
 .../nodeunit/test/test-failing-callbacks.js        |  114 -
 bin/node_modules/nodeunit/test/test-httputil.js    |   55 -
 bin/node_modules/nodeunit/test/test-runfiles.js    |  213 -
 bin/node_modules/nodeunit/test/test-runmodule.js   |  177 -
 bin/node_modules/nodeunit/test/test-runtest.js     |   46 -
 bin/node_modules/nodeunit/test/test-sandbox.js     |   31 -
 bin/node_modules/nodeunit/test/test-testcase.js    |  234 -
 bin/node_modules/nodeunit/test/test.html           |   26 -
 bin/package.json                                   |   15 +
 bin/replaces                                       |   19 +
 .../project/__TESTING__.xcodeproj/project.pbxproj  |  499 +-
 .../project/__TESTING__/Classes/AppDelegate.h      |   39 +-
 .../project/__TESTING__/Classes/AppDelegate.m      |  184 +-
 .../__TESTING__/Classes/MainViewController.h       |   36 +
 .../__TESTING__/Classes/MainViewController.m       |  140 +
 .../__TESTING__/Classes/MainViewController.xib     |  138 +
 bin/templates/project/__TESTING__/Cordova.plist    |   81 +
 bin/templates/project/__TESTING__/PhoneGap.plist   |   51 -
 bin/templates/project/__TESTING__/Plugins/README   |   19 +
 .../Resources/Capture.bundle/controls_bg.png       |  Bin 955 -> 955 bytes
 .../Resources/Capture.bundle/controls_bg@2x.png    |  Bin 971 -> 971 bytes
 .../Capture.bundle/controls_bg@2x~ipad.png         |  Bin 0 -> 2858 bytes
 .../Resources/Capture.bundle/controls_bg~ipad.png  |  Bin 969 -> 969 bytes
 .../Resources/Capture.bundle/microphone.png        |  Bin 72226 -> 72226 bytes
 .../Resources/Capture.bundle/microphone@2x.png     |  Bin 282409 -> 282409 bytes
 .../Capture.bundle/microphone@2x~ipad.png          |  Bin 0 -> 911582 bytes
 .../Resources/Capture.bundle/microphone~ipad.png   |  Bin 393975 -> 393975 bytes
 .../Resources/Capture.bundle/record_button.png     |  Bin 5852 -> 5852 bytes
 .../Resources/Capture.bundle/record_button@2x.png  |  Bin 13875 -> 13875 bytes
 .../Capture.bundle/record_button@2x~ipad.png       |  Bin 0 -> 15822 bytes
 .../Capture.bundle/record_button~ipad.png          |  Bin 7547 -> 7547 bytes
 .../Resources/Capture.bundle/recording_bg.png      |  Bin 973 -> 973 bytes
 .../Resources/Capture.bundle/recording_bg@2x.png   |  Bin 990 -> 990 bytes
 .../Capture.bundle/recording_bg@2x~ipad.png        |  Bin 0 -> 1026 bytes
 .../Resources/Capture.bundle/recording_bg~ipad.png |  Bin 996 -> 996 bytes
 .../Resources/Capture.bundle/stop_button.png       |  Bin 5514 -> 5514 bytes
 .../Resources/Capture.bundle/stop_button@2x.png    |  Bin 12965 -> 12965 bytes
 .../Capture.bundle/stop_button@2x~ipad.png         |  Bin 0 -> 14474 bytes
 .../Resources/Capture.bundle/stop_button~ipad.png  |  Bin 7119 -> 7119 bytes
 .../Resources/de.lproj/Localizable.strings         |   26 +
 .../Resources/en.lproj/Localizable.strings         |   21 +-
 .../Resources/es.lproj/Localizable.strings         |   20 +-
 .../__TESTING__/Resources/icons/icon-72.png        |  Bin 5049 -> 4944 bytes
 .../project/__TESTING__/Resources/icons/icon.png   |  Bin 3126 -> 3902 bytes
 .../__TESTING__/Resources/icons/icon@2x.png        |  Bin 5340 -> 7869 bytes
 .../Resources/se.lproj/Localizable.strings         |   26 +
 .../__TESTING__/Resources/splash/Default.png       |  Bin 13226 -> 0 bytes
 .../__TESTING__/Resources/splash/Default@2x.png    |  Bin 32666 -> 0 bytes
 .../Resources/splash/Default@2x~iphone.png         |  Bin 0 -> 350593 bytes
 .../Resources/splash/Default~iphone.png            |  Bin 0 -> 93897 bytes
 .../project/__TESTING__/__TESTING__-Info.plist     |   41 +-
 .../project/__TESTING__/__TESTING__-Prefix.pch     |   22 +-
 .../project/__TESTING__/en.lproj/InfoPlist.strings |   20 +
 bin/templates/project/__TESTING__/main.m           |   22 +-
 bin/templates/project/__TESTING__/verify.sh        |   31 +
 bin/templates/project/cordova/debug                |   54 +
 bin/templates/project/cordova/emulate              |   21 +
 bin/templates/project/cordova/log                  |   26 +
 bin/templates/project/phonegap/debug               |   24 -
 bin/templates/project/phonegap/emulate             |    3 -
 bin/templates/project/phonegap/log                 |    7 -
 bin/templates/project/www/cordova-1.9.0.js         | 5259 +++++++++++++++
 bin/templates/project/www/index.html               |   43 +-
 bin/templates/project/www/phonegap-1.0.0.js        | 3885 -----------
 bin/test                                           |   27 +-
 bin/tests/autotest.coffee                          |   20 +
 bin/tests/create.coffee                            |   19 +
 bin/tests/debug.coffee                             |   18 +
 bin/tests/test.coffee                              |   18 +
 guides/Cordova Custom URL Scheme Handling.md       |   44 +
 guides/Cordova JavaScript Exception Logging.md     |   44 +
 guides/Cordova Plugin Upgrade Guide.md             |   78 +
 guides/Cordova Settings File.md                    |   49 +
 guides/Cordova Upgrade Guide.md                    |   71 -
 guides/How to Use Cordova as a Component.md        |  132 -
 275 files changed, 18150 insertions(+), 16615 deletions(-)
----------------------------------------------------------------------