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 2014/10/28 01:01:46 UTC
ios commit: Updated cordova.js for CB-7868
Repository: cordova-ios
Updated Branches:
refs/heads/master 31302e403 -> 8458588eb
Updated cordova.js for CB-7868
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/8458588e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/8458588e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/8458588e
Branch: refs/heads/master
Commit: 8458588ebe311f9a6154a1004d410d11e88d61c8
Parents: 31302e4
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Oct 27 17:01:44 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Oct 27 17:01:44 2014 -0700
----------------------------------------------------------------------
CordovaLib/cordova.js | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/8458588e/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index 7889955..cc900ac 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -1,5 +1,5 @@
// Platform: ios
-// 94291706945c42fd47fa632ed30f5eb811080e95
+// 91157c2e1bf3eb098c7e2ab31404e895ccb0df2a
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -1152,6 +1152,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];
@@ -1183,21 +1184,19 @@ function replaceNavigator(origNavigator) {
for (var key in origNavigator) {
if (typeof origNavigator[key] == 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
- } else {
+ }
+ else {
(function(k) {
- Object.defineProperty(newNavigator, k, {
- get: function() {
- return origNavigator[k];
- },
- configurable: true,
- enumerable: true
- });
- })(key);
+ utils.defineGetterSetter(newNavigator,key,function() {
+ return origNavigator[k];
+ });
+ })(key);
}
}
}
return newNavigator;
}
+
if (window.navigator) {
window.navigator = replaceNavigator(window.navigator);
}
@@ -1278,6 +1277,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];
@@ -1312,16 +1312,13 @@ function replaceNavigator(origNavigator) {
for (var key in origNavigator) {
if (typeof origNavigator[key] == 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
- } else {
+ }
+ else {
(function(k) {
- Object.defineProperty(newNavigator, k, {
- get: function() {
- return origNavigator[k];
- },
- configurable: true,
- enumerable: true
- });
- })(key);
+ utils.defineGetterSetter(newNavigator,key,function() {
+ return origNavigator[k];
+ });
+ })(key);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org