You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by da...@apache.org on 2016/10/24 10:35:33 UTC
[11/21] cordova-windows git commit: CB-11522 [windows] Make
cordova-js handle 'unknown' type
CB-11522 [windows] Make cordova-js handle 'unknown' type
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/ddb7f39e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/ddb7f39e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/ddb7f39e
Branch: refs/heads/4.4.x
Commit: ddb7f39e54069339855c540e4ee1dae58ffef2ec
Parents: 50bbc3e
Author: daserge <v-...@microsoft.com>
Authored: Wed Sep 14 19:31:28 2016 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Thu Oct 20 20:54:55 2016 +0300
----------------------------------------------------------------------
template/www/cordova.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/ddb7f39e/template/www/cordova.js
----------------------------------------------------------------------
diff --git a/template/www/cordova.js b/template/www/cordova.js
index 2ea0612..75392f2 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -1,5 +1,5 @@
\ufeff// Platform: windows
-// d403ce434788ffe1937711d6ebcbcc837fcbcb14
+// 640f151f0badfbf7d3ede6b7a2befb7a96054dd7
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -817,7 +817,7 @@ module.exports = channel;
});
-// file: D:/cordova/cordova-windows/cordova-js-src/confighelper.js
+// file: F:/coho/cordova-windows/cordova-js-src/confighelper.js
define("cordova/confighelper", function(require, exports, module) {
// config.xml wrapper (non-node ConfigParser analogue)
@@ -891,7 +891,7 @@ exports.readConfig = readConfig;
});
-// file: D:/cordova/cordova-windows/cordova-js-src/exec.js
+// file: F:/coho/cordova-windows/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/*jslint sloppy:true, plusplus:true*/
@@ -1482,7 +1482,7 @@ exports.reset();
});
-// file: D:/cordova/cordova-windows/cordova-js-src/platform.js
+// file: F:/coho/cordova-windows/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1801,7 +1801,7 @@ exports.load = function(callback) {
});
-// file: D:/cordova/cordova-windows/cordova-js-src/splashscreen.js
+// file: F:/coho/cordova-windows/cordova-js-src/splashscreen.js
define("cordova/splashscreen", function(require, exports, module) {
var isPhone = (cordova.platformId == 'windows') && WinJS.Utilities.isPhone;
@@ -2234,7 +2234,10 @@ utils.clone = function(obj) {
retVal = {};
for(i in obj){
- if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined') {
+ // https://issues.apache.org/jira/browse/CB-11522 'unknown' type may be returned in
+ // custom protocol activation case on Windows Phone 8.1 causing "No such interface supported" exception
+ // on cloning.
+ if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined' && typeof obj[i] != 'unknown') {
retVal[i] = utils.clone(obj[i]);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org