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:46 UTC

[7/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/b792bf57
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/b792bf57
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/b792bf57

Branch: refs/heads/master
Commit: b792bf57f78a22f3bd50914d3574d6a553e9fe94
Parents: ff04241 4aea2d5
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Oct 1 11:39:22 2012 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Oct 1 11:39:22 2012 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDV.h                           |    6 +-
 CordovaLib/Classes/CDVAccelerometer.h              |   14 +-
 CordovaLib/Classes/CDVAccelerometer.m              |   80 +-
 CordovaLib/Classes/CDVAvailability.h               |   56 +-
 CordovaLib/Classes/CDVBattery.h                    |   19 +-
 CordovaLib/Classes/CDVBattery.m                    |   76 +-
 CordovaLib/Classes/CDVCamera.h                     |   33 +-
 CordovaLib/Classes/CDVCamera.m                     |  536 +-
 CordovaLib/Classes/CDVCapture.h                    |   55 +-
 CordovaLib/Classes/CDVCapture.m                    |  707 +-
 CordovaLib/Classes/CDVCommandDelegate.h            |   12 +-
 CordovaLib/Classes/CDVConnection.h                 |   11 +-
 CordovaLib/Classes/CDVConnection.m                 |  130 +-
 CordovaLib/Classes/CDVContact.h                    |  107 +-
 CordovaLib/Classes/CDVContact.m                    | 2635 ++++----
 CordovaLib/Classes/CDVContacts.h                   |   84 +-
 CordovaLib/Classes/CDVContacts.m                   |  702 +-
 CordovaLib/Classes/CDVCordovaView.h                |   10 +-
 CordovaLib/Classes/CDVCordovaView.m                |   15 +-
 CordovaLib/Classes/CDVDebug.h                      |    8 +-
 CordovaLib/Classes/CDVDebugConsole.h               |    8 +-
 CordovaLib/Classes/CDVDebugConsole.m               |    8 +-
 CordovaLib/Classes/CDVDevice.h                     |   11 +-
 CordovaLib/Classes/CDVDevice.m                     |   37 +-
 CordovaLib/Classes/CDVEcho.h                       |    4 +-
 CordovaLib/Classes/CDVEcho.m                       |   18 +-
 CordovaLib/Classes/CDVFile.h                       |  119 +-
 CordovaLib/Classes/CDVFile.m                       | 1785 +++---
 CordovaLib/Classes/CDVFileTransfer.h               |   47 +-
 CordovaLib/Classes/CDVFileTransfer.m               |  452 +-
 CordovaLib/Classes/CDVInvokedUrlCommand.h          |   38 +-
 CordovaLib/Classes/CDVInvokedUrlCommand.m          |   34 +-
 CordovaLib/Classes/CDVLocalStorage.h               |   32 +-
 CordovaLib/Classes/CDVLocalStorage.m               |  372 +-
 CordovaLib/Classes/CDVLocation.h                   |   70 +-
 CordovaLib/Classes/CDVLocation.m                   |  449 +-
 CordovaLib/Classes/CDVLogger.h                     |    6 +-
 CordovaLib/Classes/CDVLogger.m                     |   13 +-
 CordovaLib/Classes/CDVMotion.h                     |   36 -
 CordovaLib/Classes/CDVMotion.m                     |   74 -
 CordovaLib/Classes/CDVNotification.h               |   15 +-
 CordovaLib/Classes/CDVNotification.m               |  100 +-
 CordovaLib/Classes/CDVPlugin.h                     |   31 +-
 CordovaLib/Classes/CDVPlugin.m                     |  118 +-
 CordovaLib/Classes/CDVPluginResult.h               |   67 +-
 CordovaLib/Classes/CDVPluginResult.m               |  129 +-
 CordovaLib/Classes/CDVReachability.h               |   62 +-
 CordovaLib/Classes/CDVReachability.m               |  328 +-
 CordovaLib/Classes/CDVSound.h                      |  101 +-
 CordovaLib/Classes/CDVSound.m                      |  631 +-
 CordovaLib/Classes/CDVSplashScreen.h               |   12 +-
 CordovaLib/Classes/CDVSplashScreen.m               |   20 +-
 CordovaLib/Classes/CDVURLProtocol.h                |   28 +-
 CordovaLib/Classes/CDVURLProtocol.m                |   93 +-
 CordovaLib/Classes/CDVViewController.h             |   39 +-
 CordovaLib/Classes/CDVViewController.m             |  822 ++--
 CordovaLib/Classes/CDVWhitelist.h                  |   12 +-
 CordovaLib/Classes/CDVWhitelist.m                  |  102 +-
 CordovaLib/Classes/JSON/JSONKit.h                  |    6 +-
 CordovaLib/Classes/NSArray+Comparisons.h           |    7 +-
 CordovaLib/Classes/NSArray+Comparisons.m           |   13 +-
 CordovaLib/Classes/NSData+Base64.h                 |   18 +-
 CordovaLib/Classes/NSData+Base64.m                 |  378 +-
 CordovaLib/Classes/NSDictionary+Extensions.h       |   26 +-
 CordovaLib/Classes/NSDictionary+Extensions.m       |  178 +-
 CordovaLib/Classes/NSMutableArray+QueueAdditions.h |   13 +-
 CordovaLib/Classes/NSMutableArray+QueueAdditions.m |   30 +-
 CordovaLib/Classes/UIDevice+Extensions.h           |   10 +-
 CordovaLib/Classes/UIDevice+Extensions.m           |   19 +-
 CordovaLib/Classes/compatibility/0.9.6/CDV.h       |    9 +-
 CordovaLib/Classes/compatibility/0.9.6/CDVPlugin.h |   27 +-
 CordovaLib/Classes/compatibility/0.9.6/CDVPlugin.m |    5 +-
 CordovaLib/Classes/compatibility/1.5.0/CDV.h       |    9 +-
 CordovaLib/Classes/compatibility/1.5.0/CDVPlugin.h |    5 +-
 CordovaLib/Classes/debugview/CDVDebugWebView.h     |   27 +-
 CordovaLib/Classes/debugview/CDVDebugWebView.m     |  121 +-
 .../Classes/debugview/WebScriptDebugDelegate.h     |   87 +-
 CordovaLib/Classes/deprecated/CDVDeprecated.h      |   22 +-
 CordovaLib/Classes/deprecated/CDVDeprecated.m      |    6 +-
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj    |   48 +-
 CordovaLib/CordovaLibApp/AppDelegate.h             |    8 +-
 CordovaLib/CordovaLibApp/AppDelegate.m             |   51 +-
 CordovaLib/CordovaLibApp/Cordova.plist             |    4 +
 CordovaLib/CordovaLibApp/ViewController.h          |    4 +-
 CordovaLib/CordovaLibApp/ViewController.m          |   15 +-
 CordovaLib/CordovaLibApp/main.m                    |    7 +-
 CordovaLib/CordovaLibTests/CDVBase64Tests.m        |   14 +-
 CordovaLib/CordovaLibTests/CDVContactsTests.m      |   20 +-
 CordovaLib/CordovaLibTests/CDVFakeFileManager.h    |    8 +-
 CordovaLib/CordovaLibTests/CDVFakeFileManager.m    |   16 +-
 CordovaLib/CordovaLibTests/CDVFileTransferTests.m  |   54 +-
 .../CordovaLibTests/CDVInvokedUrlCommandTests.m    |   96 +
 CordovaLib/CordovaLibTests/CDVLocalStorageTests.m  |   65 +-
 .../CDVPluginResultJSONSerializationTests.m        |  134 +-
 CordovaLib/CordovaLibTests/CDVWebViewTest.h        |   18 +-
 CordovaLib/CordovaLibTests/CDVWebViewTest.m        |   44 +-
 CordovaLib/CordovaLibTests/CDVWhitelistTests.m     |  222 +-
 CordovaLib/CordovaTests.xcodeproj/project.pbxproj  |    6 +-
 CordovaLib/VERSION                                 |    2 +-
 CordovaLib/javascript/cordova.ios.js               | 1335 +++-
 FirstRun.md                                        |    8 +-
 LICENSE                                            |    2 +-
 Makefile                                           |    4 -
 README.md                                          |   49 +-
 RELEASENOTES.md                                    |   67 +-
 bin/_build.sh                                      |   92 -
 bin/create                                         |    3 +
 bin/diagnose_project                               |  216 +
 .../project/__TESTING__.xcodeproj/project.pbxproj  |   58 +-
 .../project/__TESTING__/Classes/AppDelegate.h      |   13 +-
 .../project/__TESTING__/Classes/AppDelegate.m      |  106 +-
 .../__TESTING__/Classes/MainViewController.h       |    4 +-
 .../__TESTING__/Classes/MainViewController.m       |   71 +-
 bin/templates/project/__TESTING__/Cordova.plist    |    4 +
 .../__TESTING__/CordovaBuildSettings.xcconfig      |   26 -
 .../Capture.bundle/microphone-568h@2x~iphone.png   |  Bin 0 -> 516760 bytes
 .../Resources/splash/Default-568h@2x~iphone.png    |  Bin 0 -> 351931 bytes
 bin/templates/project/__TESTING__/main.m           |   12 +-
 bin/templates/project/www/config.xml               |   47 -
 bin/templates/project/www/cordova-2.0.0.js         | 5242 --------------
 bin/templates/project/www/cordova-2.1.0.js         | 5449 +++++++++++++++
 bin/templates/project/www/css/index.css            |  109 +-
 bin/templates/project/www/img/cordova.png          |  Bin 19932 -> 0 bytes
 bin/templates/project/www/img/logo.png             |  Bin 0 -> 21814 bytes
 bin/templates/project/www/index.html               |   50 +-
 bin/templates/project/www/js/index.js              |   55 +-
 bin/templates/project/www/res/icon/cordova_128.png |  Bin 11401 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_16.png  |  Bin 1699 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_24.png  |  Bin 2215 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_256.png |  Bin 27408 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_32.png  |  Bin 2843 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_48.png  |  Bin 4111 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_512.png |  Bin 39830 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_64.png  |  Bin 5463 -> 0 bytes
 .../project/www/res/icon/cordova_android_36.png    |  Bin 3096 -> 0 bytes
 .../project/www/res/icon/cordova_android_48.png    |  Bin 4090 -> 0 bytes
 .../project/www/res/icon/cordova_android_72.png    |  Bin 6080 -> 0 bytes
 .../project/www/res/icon/cordova_android_96.png    |  Bin 7685 -> 0 bytes
 .../project/www/res/icon/cordova_bb_80.png         |  Bin 7287 -> 0 bytes
 .../project/www/res/icon/cordova_ios_114.png       |  Bin 7869 -> 0 bytes
 .../project/www/res/icon/cordova_ios_144.png       |  Bin 11706 -> 0 bytes
 .../project/www/res/icon/cordova_ios_57.png        |  Bin 3908 -> 0 bytes
 .../project/www/res/icon/cordova_ios_72.png        |  Bin 4944 -> 0 bytes
 .../project/www/res/icon/ios/icon-57-2x.png        |  Bin 0 -> 7869 bytes
 bin/templates/project/www/res/icon/ios/icon-57.png |  Bin 0 -> 3908 bytes
 .../project/www/res/icon/ios/icon-72-2x.png        |  Bin 0 -> 11706 bytes
 bin/templates/project/www/res/icon/ios/icon-72.png |  Bin 0 -> 4944 bytes
 .../www/res/screen/android_hdpi_landscape.png      |  Bin 218302 -> 0 bytes
 .../www/res/screen/android_hdpi_portrait.png       |  Bin 222148 -> 0 bytes
 .../www/res/screen/android_ldpi_landscape.png      |  Bin 42616 -> 0 bytes
 .../www/res/screen/android_ldpi_portrait.png       |  Bin 42034 -> 0 bytes
 .../www/res/screen/android_mdpi_landscape.png      |  Bin 92347 -> 0 bytes
 .../www/res/screen/android_mdpi_portrait.png       |  Bin 90555 -> 0 bytes
 .../www/res/screen/android_xhdpi_landscape.png     |  Bin 489604 -> 0 bytes
 .../www/res/screen/android_xhdpi_portrait.png      |  Bin 504508 -> 0 bytes
 .../www/res/screen/blackberry_transparent_300.png  |  Bin 15823 -> 0 bytes
 .../www/res/screen/blackberry_transparent_400.png  |  Bin 11001 -> 0 bytes
 .../res/screen/ios/screen-ipad-landscape-2x.png    |  Bin 0 -> 1534088 bytes
 .../www/res/screen/ios/screen-ipad-landscape.png   |  Bin 0 -> 407370 bytes
 .../www/res/screen/ios/screen-ipad-portrait-2x.png |  Bin 0 -> 1610434 bytes
 .../www/res/screen/ios/screen-ipad-portrait.png    |  Bin 0 -> 422441 bytes
 .../res/screen/ios/screen-iphone-landscape-2x.png  |  Bin 0 -> 339639 bytes
 .../www/res/screen/ios/screen-iphone-landscape.png |  Bin 0 -> 92301 bytes
 .../res/screen/ios/screen-iphone-portrait-2x.png   |  Bin 0 -> 350593 bytes
 .../www/res/screen/ios/screen-iphone-portrait.png  |  Bin 0 -> 93897 bytes
 .../project/www/res/screen/ipad_landscape.png      |  Bin 407370 -> 0 bytes
 .../project/www/res/screen/ipad_portrait.png       |  Bin 422441 -> 0 bytes
 .../www/res/screen/ipad_retina_landscape.png       |  Bin 1534088 -> 0 bytes
 .../www/res/screen/ipad_retina_portrait.png        |  Bin 1610434 -> 0 bytes
 .../project/www/res/screen/iphone_landscape.png    |  Bin 92301 -> 0 bytes
 .../project/www/res/screen/iphone_portrait.png     |  Bin 93897 -> 0 bytes
 .../www/res/screen/iphone_retina_landscape.png     |  Bin 339639 -> 0 bytes
 .../www/res/screen/iphone_retina_portrait.png      |  Bin 350593 -> 0 bytes
 .../www/res/screen/windows_phone_portrait.jpg      |  Bin 11483 -> 0 bytes
 bin/templates/project/www/spec.html                |   18 +
 bin/templates/project/www/spec/helper.js           |   22 +
 bin/templates/project/www/spec/index.js            |   56 +-
 .../project/www/spec/lib/jasmine-1.2.0/jasmine.js  |   16 +-
 bin/uncrustify.cfg                                 | 1473 ++++
 bin/uncrustify.sh                                  |   88 +
 bin/update_cordova_subproject                      |   89 +
 ...hanging the JavaScript to Native Bridge Mode.md |   36 +
 guides/Cordova Plugin Upgrade Guide.md             |    2 +-
 guides/Create a New Project.webloc                 |    2 +-
 hooks/pre-commit                                   |   41 +
 185 files changed, 15686 insertions(+), 12650 deletions(-)
----------------------------------------------------------------------