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/02/26 23:37:47 UTC

[1/2] ios commit: [CB-2556] Update JavaScript for iOS (2.5.0)

[CB-2556] Update JavaScript for iOS (2.5.0)


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

Branch: refs/heads/master
Commit: b8796d1130b64169835d8acbaaa4c9e2de8a321d
Parents: d9b5ee7
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Feb 26 14:37:26 2013 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Feb 26 14:37:26 2013 -0800

----------------------------------------------------------------------
 CordovaLib/VERSION        |    2 +-
 CordovaLib/cordova.ios.js |   30 +++++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/b8796d11/CordovaLib/VERSION
----------------------------------------------------------------------
diff --git a/CordovaLib/VERSION b/CordovaLib/VERSION
index aa0822f..437459c 100644
--- a/CordovaLib/VERSION
+++ b/CordovaLib/VERSION
@@ -1 +1 @@
-2.5.0rc1
+2.5.0

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/b8796d11/CordovaLib/cordova.ios.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.ios.js b/CordovaLib/cordova.ios.js
index 60665b6..3d83df3 100644
--- a/CordovaLib/cordova.ios.js
+++ b/CordovaLib/cordova.ios.js
@@ -1,8 +1,8 @@
 // Platform: ios
 
-// commit 521bbd64ed729ca76b6646d25bb01b76ee8a54b5
+// commit f50d20a87431c79a54572263729461883f611a53
 
-// File generated at :: Wed Feb 20 2013 12:24:41 GMT-0800 (PST)
+// File generated at :: Tue Feb 26 2013 14:26:19 GMT-0800 (PST)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -823,6 +823,9 @@ function shouldBundleCommandJson() {
 }
 
 function massageArgsJsToNative(args) {
+    if (!args || utils.typeName(args) != 'Array') {
+       return args;
+    }
     var encodeArrayBufferAs8bitString = function(ab) {
         return String.fromCharCode.apply(null, new Uint8Array(ab));
     };
@@ -1122,7 +1125,8 @@ define("cordova/plugin/Camera", function(require, exports, module) {
 
 var argscheck = require('cordova/argscheck'),
     exec = require('cordova/exec'),
-    Camera = require('cordova/plugin/CameraConstants');
+    Camera = require('cordova/plugin/CameraConstants'),
+    CameraPopoverHandle = require('cordova/plugin/CameraPopoverHandle');
 
 var cameraExport = {};
 
@@ -1162,6 +1166,7 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
                 mediaType, allowEdit, correctOrientation, saveToPhotoAlbum, popoverOptions];
 
     exec(successCallback, errorCallback, "Camera", "takePicture", args);
+    return new CameraPopoverHandle();
 };
 
 cameraExport.cleanup = function(successCallback, errorCallback) {
@@ -1206,6 +1211,25 @@ module.exports = {
 
 });
 
+// file: lib/ios/plugin/CameraPopoverHandle.js
+define("cordova/plugin/CameraPopoverHandle", function(require, exports, module) {
+
+var exec = require('cordova/exec');
+
+/**
+ * A handle to an image picker popover.
+ */
+var CameraPopoverHandle = function() {
+    this.setPosition = function(popoverOptions) {
+        var args = [ popoverOptions ];
+        exec(null, null, "Camera", "repositionPopover", args);
+    };
+};
+
+module.exports = CameraPopoverHandle;
+
+});
+
 // file: lib/common/plugin/CameraPopoverOptions.js
 define("cordova/plugin/CameraPopoverOptions", function(require, exports, module) {