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 C87B79909 for ; Tue, 16 Dec 2014 14:35:40 +0000 (UTC) Received: (qmail 87128 invoked by uid 500); 16 Dec 2014 14:35:40 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 87095 invoked by uid 500); 16 Dec 2014 14:35:40 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 86980 invoked by uid 99); 16 Dec 2014 14:35:40 -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, 16 Dec 2014 14:35:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4CE4DA2C5E0; Tue, 16 Dec 2014 14:35:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zaspire@apache.org To: commits@cordova.apache.org Date: Tue, 16 Dec 2014 14:35:41 -0000 Message-Id: <164df759921c442aa0933592728372cc@git.apache.org> In-Reply-To: <8953eccb36f9484e92dc919023d97123@git.apache.org> References: <8953eccb36f9484e92dc919023d97123@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cordova-ubuntu git commit: Update JS snapshot to version 4.1.0-dev (via coho) Update JS snapshot to version 4.1.0-dev (via coho) Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/7d547b50 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/7d547b50 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/7d547b50 Branch: refs/heads/master Commit: 7d547b50a7d085a6f25e1a6c30f1239e7d30595a Parents: a936f12 Author: Maxim Ermilov Authored: Tue Dec 16 17:31:47 2014 +0300 Committer: Maxim Ermilov Committed: Tue Dec 16 17:31:47 2014 +0300 ---------------------------------------------------------------------- www/cordova.js | 81 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/7d547b50/www/cordova.js ---------------------------------------------------------------------- diff --git a/www/cordova.js b/www/cordova.js index bb53b40..5ba03c1 100644 --- a/www/cordova.js +++ b/www/cordova.js @@ -1,5 +1,5 @@ // Platform: ubuntu -// 3.7.0-dev-1258511 +// ab3fc0f59dbba0cc402d40a26276675f05924ae1 /* 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 CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-1258511'; +var PLATFORM_VERSION_BUILD_LABEL = '4.1.0-dev'; // file: src/scripts/require.js /*jshint -W079 */ @@ -175,7 +175,8 @@ function createEvent(type, data) { var cordova = { define:define, require:require, - version:CORDOVA_JS_BUILD_LABEL, + version:PLATFORM_VERSION_BUILD_LABEL, + platformVersion:PLATFORM_VERSION_BUILD_LABEL, platformId:platform.id, /** * Methods to add/remove your own addEventListener hijacking on document + window. @@ -262,11 +263,7 @@ var cordova = { * Called by native code when returning successful result from an action. */ callbackSuccess: function(callbackId, args) { - try { - cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback); - } catch (e) { - console.log("Error in success callback: " + callbackId + " = "+e); - } + cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback); }, /** @@ -275,30 +272,34 @@ var cordova = { callbackError: function(callbackId, args) { // TODO: Deprecate callbackSuccess and callbackError in favour of callbackFromNative. // Derive success from status. - try { - cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback); - } catch (e) { - console.log("Error in success callback: " + callbackId + " = "+e); - } + cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback); }, /** * Called by native code when returning the result from an action. */ - callbackFromNative: function(callbackId, success, status, args, keepCallback) { - var callback = cordova.callbacks[callbackId]; - if (callback) { - if (success && status == cordova.callbackStatus.OK) { - callback.success && callback.success.apply(null, args); - } else if (!success) { - callback.fail && callback.fail.apply(null, args); - } + callbackFromNative: function(callbackId, isSuccess, status, args, keepCallback) { + try { + var callback = cordova.callbacks[callbackId]; + if (callback) { + if (isSuccess && status == cordova.callbackStatus.OK) { + callback.success && callback.success.apply(null, args); + } else { + callback.fail && callback.fail.apply(null, args); + } - // Clear callback if not expecting any more results - if (!keepCallback) { - delete cordova.callbacks[callbackId]; + // Clear callback if not expecting any more results + if (!keepCallback) { + delete cordova.callbacks[callbackId]; + } } } + catch (err) { + var msg = "Error in " + (isSuccess ? "Success" : "Error") + " callbackId: " + callbackId + " : " + err; + console && console.log && console.log(msg); + cordova.fireWindowEvent("cordovacallbackerror", { 'message': msg }); + throw err; + } }, addConstructor: function(func) { channel.onCordovaReady.subscribe(function() { @@ -463,9 +464,14 @@ function each(objects, func, context) { function clobber(obj, key, value) { exports.replaceHookForTesting(obj, key); - obj[key] = value; + var needsProperty = false; + try { + obj[key] = value; + } catch (e) { + needsProperty = true; + } // Getters can only be overridden by getters. - if (obj[key] !== value) { + if (needsProperty || obj[key] !== value) { utils.defineGetter(obj, key, function() { return value; }); @@ -867,7 +873,7 @@ function ubuntuExec(success, fail, service, action, args) { }); } - oxide.sendMessage("from-cordova", {messageType: "callPluginFunction", plugin: service, func: action, params: args}); + window.oxide.sendMessage("from-cordova", {messageType: "callPluginFunction", plugin: service, func: action, params: args}); } module.exports = ubuntuExec; @@ -911,6 +917,7 @@ var cordova = require('cordova'); var modulemapper = require('cordova/modulemapper'); var platform = require('cordova/platform'); var pluginloader = require('cordova/pluginloader'); +var utils = require('cordova/utils'); var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady]; @@ -943,10 +950,18 @@ function replaceNavigator(origNavigator) { if (typeof origNavigator[key] == 'function') { newNavigator[key] = origNavigator[key].bind(origNavigator); } + else { + (function(k) { + utils.defineGetterSetter(newNavigator,key,function() { + return origNavigator[k]; + }); + })(key); + } } } return newNavigator; } + if (window.navigator) { window.navigator = replaceNavigator(window.navigator); } @@ -1027,6 +1042,7 @@ define("cordova/init_b", function(require, exports, module) { var channel = require('cordova/channel'); var cordova = require('cordova'); var platform = require('cordova/platform'); +var utils = require('cordova/utils'); var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady]; @@ -1062,6 +1078,13 @@ function replaceNavigator(origNavigator) { if (typeof origNavigator[key] == 'function') { newNavigator[key] = origNavigator[key].bind(origNavigator); } + else { + (function(k) { + utils.defineGetterSetter(newNavigator,key,function() { + return origNavigator[k]; + }); + })(key); + } } } return newNavigator; @@ -1109,7 +1132,7 @@ platform.bootstrap && platform.bootstrap(); * Create all cordova objects once native side is ready. */ channel.join(function() { - + platform.initialize && platform.initialize(); // Fire event to notify that all objects are created @@ -1549,4 +1572,4 @@ window.cordova = require('cordova'); require('cordova/init'); -})(); +})(); \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org