Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D7290E743 for ; Tue, 26 Feb 2013 22:37:32 +0000 (UTC) Received: (qmail 28127 invoked by uid 500); 26 Feb 2013 22:37:32 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 28104 invoked by uid 500); 26 Feb 2013 22:37:32 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 28097 invoked by uid 99); 26 Feb 2013 22:37:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Feb 2013 22:37:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 72F46F071; Tue, 26 Feb 2013 22:37:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: ios commit: [CB-2556] Update JavaScript for iOS (2.5.0) Message-Id: <20130226223732.72F46F071@tyr.zones.apache.org> Date: Tue, 26 Feb 2013 22:37:32 +0000 (UTC) Updated Branches: refs/heads/next d9b5ee75d -> b8796d113 [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/next Commit: b8796d1130b64169835d8acbaaa4c9e2de8a321d Parents: d9b5ee7 Author: Shazron Abdullah Authored: Tue Feb 26 14:37:26 2013 -0800 Committer: Shazron Abdullah 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) {