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 73B86D4AF for ; Wed, 7 Nov 2012 00:15:21 +0000 (UTC) Received: (qmail 10424 invoked by uid 500); 7 Nov 2012 00:15:21 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 10250 invoked by uid 500); 7 Nov 2012 00:15:21 -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 10152 invoked by uid 500); 7 Nov 2012 00:15:21 -0000 Delivered-To: apmail-incubator-callback-commits@incubator.apache.org Received: (qmail 10138 invoked by uid 99); 7 Nov 2012 00:15:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 00:15:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D116844E79; Wed, 7 Nov 2012 00:15:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/8] js commit: correct linting issue stating navigator is ReadOnly, use passed in context Message-Id: <20121107001520.D116844E79@tyr.zones.apache.org> Date: Wed, 7 Nov 2012 00:15:20 +0000 (UTC) correct linting issue stating navigator is ReadOnly, use passed in context Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/d86cd3ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/d86cd3ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/d86cd3ec Branch: refs/heads/master Commit: d86cd3eca0e721e9d2dbb23d4c3ef12c52eea8db Parents: 9ac1d0d Author: Jesse MacFadyen Authored: Tue Nov 6 15:58:23 2012 -0800 Committer: Jesse MacFadyen Committed: Tue Nov 6 15:58:23 2012 -0800 ---------------------------------------------------------------------- lib/scripts/bootstrap.js | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/d86cd3ec/lib/scripts/bootstrap.js ---------------------------------------------------------------------- diff --git a/lib/scripts/bootstrap.js b/lib/scripts/bootstrap.js index 02a0319..58ca32d 100644 --- a/lib/scripts/bootstrap.js +++ b/lib/scripts/bootstrap.js @@ -22,10 +22,10 @@ (function (context) { // Replace navigator before any modules are required(), to ensure it happens as soon as possible. // We replace it so that properties that can't be clobbered can instead be overridden. - if (typeof navigator != 'undefined') { + if (typeof context.navigator != 'undefined') { var CordovaNavigator = function () {}; - CordovaNavigator.prototype = navigator; - navigator = new CordovaNavigator(); + CordovaNavigator.prototype = context.navigator; + context.navigator = new CordovaNavigator(); } var channel = require("cordova/channel"), @@ -40,15 +40,15 @@ platform = require('cordova/platform'); // Drop the common globals into the window object, but be nice and don't overwrite anything. - builder.build(base.objects).intoButDoNotClobber(window); + builder.build(base.objects).intoButDoNotClobber(context); // Drop the platform-specific globals into the window object // and clobber any existing object. - builder.build(platform.objects).intoAndClobber(window); + builder.build(platform.objects).intoAndClobber(context); // Merge the platform-specific overrides/enhancements into // the window object. - builder.build(platform.merges).intoAndMerge(window); + builder.build(platform.merges).intoAndMerge(context); // Call the platform-specific initialization platform.initialize();