You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sg...@apache.org on 2015/02/23 11:20:16 UTC
[1/2] cordova-windows git commit: Set VERSION to 3.9.0-dev (via coho)
Repository: cordova-windows
Updated Branches:
refs/heads/master 87bdf85ce -> e12d58537
Set VERSION to 3.9.0-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/957dd1af
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/957dd1af
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/957dd1af
Branch: refs/heads/master
Commit: 957dd1af5cbdf18741b65a3bbd3b2c43f2d14f8e
Parents: 87bdf85
Author: sgrebnov <v-...@microsoft.com>
Authored: Mon Feb 23 13:18:30 2015 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Mon Feb 23 13:18:30 2015 +0300
----------------------------------------------------------------------
VERSION | 2 +-
package.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/957dd1af/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index d4da33b..724ee60 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.8.0-dev
+3.9.0-dev
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/957dd1af/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c86300a..5f0b83d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-windows",
- "version": "3.8.0-dev",
+ "version": "3.9.0-dev",
"description": "cordova-windows release",
"main": "bin/create",
"repository": {
@@ -41,4 +41,4 @@
],
"author": "Apache Software Foundation",
"license": "Apache Version 2.0"
-}
+}
\ 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
[2/2] cordova-windows git commit: Update JS snapshot to version
3.9.0-dev (via coho)
Posted by sg...@apache.org.
Update JS snapshot to version 3.9.0-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/e12d5853
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/e12d5853
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/e12d5853
Branch: refs/heads/master
Commit: e12d585377054c2f8226ccaf9f0700561574a089
Parents: 957dd1a
Author: sgrebnov <v-...@microsoft.com>
Authored: Mon Feb 23 13:18:35 2015 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Mon Feb 23 13:18:35 2015 +0300
----------------------------------------------------------------------
template/www/cordova.js | 49 ++++++++++++++++++--------------------------
1 file changed, 20 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/e12d5853/template/www/cordova.js
----------------------------------------------------------------------
diff --git a/template/www/cordova.js b/template/www/cordova.js
index 26e9690..79a6ba5 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: windows
-// 91157c2e1bf3eb098c7e2ab31404e895ccb0df2a
+// fc4db9145934bd0053161cbf9ffc0caf83b770c6
/*
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.8.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '3.9.0-dev';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -284,10 +284,16 @@ var cordova = {
if (callback) {
if (isSuccess && status == cordova.callbackStatus.OK) {
callback.success && callback.success.apply(null, args);
- } else {
+ } else if (!isSuccess) {
callback.fail && callback.fail.apply(null, args);
}
-
+ /*
+ else
+ Note, this case is intentionally not caught.
+ this can happen if isSuccess is true, but callbackStatus is NO_RESULT
+ which is used to remove a callback from the list without calling the callbacks
+ typically keepCallback is false in this case
+ */
// Clear callback if not expecting any more results
if (!keepCallback) {
delete cordova.callbacks[callbackId];
@@ -464,9 +470,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;
});
@@ -581,7 +592,6 @@ var utils = require('cordova/utils'),
* onDeviceReady* User event fired to indicate that Cordova is ready
* onResume User event fired to indicate a start/resume lifecycle event
* onPause User event fired to indicate a pause lifecycle event
- * onDestroy* Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
*
* The events marked with an * are sticky. Once they have fired, they will stay in the fired state.
* All listeners that subscribe after the event is fired will be executed right away.
@@ -793,9 +803,6 @@ channel.create('onResume');
// Event to indicate a pause lifecycle event
channel.create('onPause');
-// Event to indicate a destroy lifecycle event
-channel.createSticky('onDestroy');
-
// Channels that must fire before "deviceready" is fired.
channel.waitForInitialization('onCordovaReady');
channel.waitForInitialization('onDOMContentLoaded');
@@ -947,7 +954,7 @@ function replaceNavigator(origNavigator) {
for (var key in origNavigator) {
if (typeof origNavigator[key] == 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
- }
+ }
else {
(function(k) {
utils.defineGetterSetter(newNavigator,key,function() {
@@ -1075,7 +1082,7 @@ function replaceNavigator(origNavigator) {
for (var key in origNavigator) {
if (typeof origNavigator[key] == 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
- }
+ }
else {
(function(k) {
utils.defineGetterSetter(newNavigator,key,function() {
@@ -1130,7 +1137,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
@@ -1602,22 +1609,6 @@ function UUIDcreatePart(length) {
});
-// file: src/windows/windows/commandProxy.js
-define("cordova/windows/commandProxy", function(require, exports, module) {
-
-console.log('WARNING: please require cordova/exec/proxy instead');
-module.exports = require('cordova/exec/proxy');
-
-});
-
-// file: src/windows/windows8/commandProxy.js
-define("cordova/windows8/commandProxy", function(require, exports, module) {
-
-console.log('WARNING: please require cordova/exec/proxy instead');
-module.exports = require('cordova/exec/proxy');
-
-});
-
window.cordova = require('cordova');
// file: src/scripts/bootstrap.js
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org