cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [1/7] cordova-windows git commit: Update JS snapshot to version 3.8.1 (via coho)
Date Fri, 03 Apr 2015 23:05:07 GMT
Repository: cordova-windows
Updated Branches:
  refs/heads/3.8.x d13e7ff25 -> 7f7a029bb


Update JS snapshot to version 3.8.1 (via coho)


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

Branch: refs/heads/3.8.x
Commit: de1e14b34b9d54182a7d39508dc6e44f61cbfcfc
Parents: d13e7ff
Author: Steve Gill <stevengill97@gmail.com>
Authored: Fri Apr 3 15:57:48 2015 -0700
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Fri Apr 3 15:57:48 2015 -0700

----------------------------------------------------------------------
 template/www/cordova.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/de1e14b3/template/www/cordova.js
----------------------------------------------------------------------
diff --git a/template/www/cordova.js b/template/www/cordova.js
index 9cce9e3..ccb98ee 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: windows
-// fc4db9145934bd0053161cbf9ffc0caf83b770c6
+// b4af1c5ec477dd98cd651932ea6df6d46705d7f9
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '3.8.0';
+var PLATFORM_VERSION_BUILD_LABEL = '3.8.1';
 // file: src/scripts/require.js
 
 /*jshint -W079 */
@@ -101,6 +101,8 @@ if (typeof module === "object" && typeof require === "function")
{
 // file: src/cordova.js
 define("cordova", function(require, exports, module) {
 
+if ("cordova" in window) { throw new Error("cordova already defined"); };
+
 
 var channel = require('cordova/channel');
 var platform = require('cordova/platform');
@@ -855,18 +857,32 @@ module.exports = function (success, fail, service, action, args) {
             // CB-5806 [Windows8] Add keepCallback support to proxy
             onSuccess = function (result, callbackOptions) {
                 callbackOptions = callbackOptions || {};
+                var callbackStatus;
+                if (callbackOptions.status != null) {
+                    callbackStatus = callbackOptions.status;
+                }
+                else {
+                    callbackStatus = cordova.callbackStatus.OK;
+                }
                 cordova.callbackSuccess(callbackOptions.callbackId || callbackId,
                     {
-                        status: callbackOptions.status || cordova.callbackStatus.OK,
+                        status: callbackStatus,
                         message: result,
                         keepCallback: callbackOptions.keepCallback || false
                     });
             };
             onError = function (err, callbackOptions) {
                 callbackOptions = callbackOptions || {};
+                var callbackStatus;
+                if (callbackOptions.status != null) {
+                    callbackStatus = callbackOptions.status;
+                }
+                else {
+                    callbackStatus = cordova.callbackStatus.OK;
+                }
                 cordova.callbackError(callbackOptions.callbackId || callbackId,
                     {
-                        status: callbackOptions.status || cordova.callbackStatus.ERROR,
+                        status: callbackStatus,
                         message: err,
                         keepCallback: callbackOptions.keepCallback || false
                     });
@@ -882,6 +898,7 @@ module.exports = function (success, fail, service, action, args) {
         }
     }
 };
+
 });
 
 // file: src/common/exec/proxy.js


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message