You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/03/23 01:05:13 UTC
[03/13] ios commit: Merge remote-tracking branch 'upstream/master'
into CB-1285
Merge remote-tracking branch 'upstream/master' into CB-1285
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/a5b8e248
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/a5b8e248
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/a5b8e248
Branch: refs/heads/master
Commit: a5b8e248433ea7305f9ae5155d648fc98094bcf1
Parents: 7923974 8d28567
Author: lorinbeer <lo...@adobe.com>
Authored: Wed Mar 20 21:29:08 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Wed Mar 20 21:29:08 2013 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVAvailability.h | 6 +-
CordovaLib/Classes/CDVCamera.h | 4 +-
CordovaLib/Classes/CDVCamera.m | 27 +-
CordovaLib/Classes/CDVCapture.m | 10 +-
CordovaLib/Classes/CDVCommandDelegateImpl.m | 2 +-
CordovaLib/Classes/CDVCommandQueue.m | 4 +-
CordovaLib/Classes/CDVConfigParser.m | 2 +-
CordovaLib/Classes/CDVConnection.m | 2 +-
CordovaLib/Classes/CDVContact.m | 28 +-
CordovaLib/Classes/CDVContacts.h | 14 +-
CordovaLib/Classes/CDVContacts.m | 490 +++++++-------
CordovaLib/Classes/CDVFile.h | 1 +
CordovaLib/Classes/CDVFile.m | 347 +++++------
CordovaLib/Classes/CDVFileTransfer.h | 8 +-
CordovaLib/Classes/CDVFileTransfer.m | 42 +-
CordovaLib/Classes/CDVGlobalization.m | 62 +-
CordovaLib/Classes/CDVInAppBrowser.h | 1 +
CordovaLib/Classes/CDVInAppBrowser.m | 38 +-
CordovaLib/Classes/CDVInvokedUrlCommand.h | 6 +-
CordovaLib/Classes/CDVLocalStorage.h | 4 +-
CordovaLib/Classes/CDVLocalStorage.m | 36 +-
CordovaLib/Classes/CDVLocation.h | 8 +-
CordovaLib/Classes/CDVLocation.m | 24 +-
CordovaLib/Classes/CDVNotification.h | 1 +
CordovaLib/Classes/CDVNotification.m | 84 ++-
CordovaLib/Classes/CDVPluginResult.h | 3 +
CordovaLib/Classes/CDVPluginResult.m | 12 +-
CordovaLib/Classes/CDVReachability.m | 28 +-
CordovaLib/Classes/CDVSound.m | 6 +-
CordovaLib/Classes/CDVSplashScreen.m | 13 +-
CordovaLib/Classes/CDVURLProtocol.m | 12 +-
CordovaLib/Classes/CDVUserAgentUtil.m | 2 +-
CordovaLib/Classes/CDVViewController.h | 1 +
CordovaLib/Classes/CDVViewController.m | 24 +-
CordovaLib/Classes/CDVWebViewDelegate.m | 2 +-
CordovaLib/Classes/NSData+Base64.m | 19 +-
CordovaLib/Classes/NSDictionary+Extensions.m | 2 +-
CordovaLib/cordova.ios.js | 414 ++++++++++---
CordovaLibTests/CDVFakeFileManager.h | 2 +-
CordovaLibTests/CDVFileTransferTests.m | 12 +-
CordovaLibTests/CDVLocalStorageTests.m | 24 +-
CordovaLibTests/CDVUserAgentTest.m | 4 +-
CordovaLibTests/CDVWebViewTest.m | 4 +-
.../project/__TESTING__/Classes/AppDelegate.m | 4 +-
hooks/pre-commit | 5 +
45 files changed, 1046 insertions(+), 798 deletions(-)
----------------------------------------------------------------------