You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mu...@apache.org on 2015/05/27 03:45:33 UTC
[1/2] cordova-windows git commit: Update package.json version
Repository: cordova-windows
Updated Branches:
refs/heads/master e6fd77bfe -> f2100233a
Update package.json version
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/c220f2cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/c220f2cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/c220f2cc
Branch: refs/heads/master
Commit: c220f2ccb9135303474d19f6da357338ea58059e
Parents: e6fd77b
Author: Murat Sutunc <su...@gmail.com>
Authored: Tue May 26 18:40:25 2015 -0700
Committer: Murat Sutunc <su...@gmail.com>
Committed: Tue May 26 18:40:25 2015 -0700
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/c220f2cc/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 5f0b83d..56819d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-windows",
- "version": "3.9.0-dev",
+ "version": "4.0.0-dev",
"description": "cordova-windows release",
"main": "bin/create",
"repository": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-windows git commit: Update cordova.js
Posted by mu...@apache.org.
Update cordova.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/f2100233
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/f2100233
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/f2100233
Branch: refs/heads/master
Commit: f2100233a5fed06925716628016fbcd7360524ce
Parents: c220f2c
Author: Murat Sutunc <su...@gmail.com>
Authored: Tue May 26 18:42:31 2015 -0700
Committer: Murat Sutunc <su...@gmail.com>
Committed: Tue May 26 18:42:31 2015 -0700
----------------------------------------------------------------------
template/www/cordova.js | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/f2100233/template/www/cordova.js
----------------------------------------------------------------------
diff --git a/template/www/cordova.js b/template/www/cordova.js
index bc538be..6d5c6e7 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: windows
-// b0463746dd842818c1f08560e998ec847460596c
+// cb11ad3aedf6c8250b7eac9b2a560d77499062ac
/*
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.9.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '4.0.0-dev';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -816,7 +816,7 @@ module.exports = channel;
});
-// file: src/windows/exec.js
+// file: node_modules/cordova-windows/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/*jslint sloppy:true, plusplus:true*/
@@ -861,7 +861,11 @@ module.exports = function (success, fail, service, action, args) {
onSuccess = function (result, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
- if (callbackOptions.status !== null) {
+ // covering both undefined and null.
+ // strict null comparison was causing callbackStatus to be undefined
+ // and then no callback was called because of the check in cordova.callbackFromNative
+ // see CB-8996 Mobilespec app hang on windows
+ if (callbackOptions.status !== undefined && callbackOptions.status !== null) {
callbackStatus = callbackOptions.status;
}
else {
@@ -877,7 +881,11 @@ module.exports = function (success, fail, service, action, args) {
onError = function (err, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
- if (callbackOptions.status !== null) {
+ // covering both undefined and null.
+ // strict null comparison was causing callbackStatus to be undefined
+ // and then no callback was called because of the check in cordova.callbackFromNative
+ // see CB-8996 Mobilespec app hang on windows
+ if (callbackOptions.status !== undefined && callbackOptions.status !== null) {
callbackStatus = callbackOptions.status;
}
else {
@@ -1275,7 +1283,7 @@ exports.reset();
});
-// file: src/windows/platform.js
+// file: node_modules/cordova-windows/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1310,7 +1318,7 @@ module.exports = {
var scriptElem = document.createElement("script");
if (navigator.appVersion.indexOf('MSAppHost/3.0') !== -1) {
- // Windows 10 UAP
+ // Windows 10 UWP
scriptElem.src = '/WinJS/js/base.js';
} else if (navigator.appVersion.indexOf("Windows Phone 8.1;") !== -1) {
// windows phone 8.1 + Mobile IE 11
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org