You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/05/07 01:52:02 UTC
[1/2] js commit: Revert "reverted global change to cordova object,
added temp? 'activate' event to windows platform"
Repository: cordova-js
Updated Branches:
refs/heads/master 0d77ab8fc -> 7f2fbc5e5
Revert "reverted global change to cordova object, added temp? 'activate' event to windows platform"
This reverts commit 0d77ab8fce647ef93b48b1a35166570617403368.
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/a2eb3596
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/a2eb3596
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/a2eb3596
Branch: refs/heads/master
Commit: a2eb3596d9f6e80cd580696844bc57cd0d921c93
Parents: 0d77ab8
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed May 6 16:49:16 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed May 6 16:49:16 2015 -0700
----------------------------------------------------------------------
src/cordova.js | 1 +
src/windows/platform.js | 10 ++--------
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a2eb3596/src/cordova.js
----------------------------------------------------------------------
diff --git a/src/cordova.js b/src/cordova.js
index 1ef3478..7e4377c 100644
--- a/src/cordova.js
+++ b/src/cordova.js
@@ -101,6 +101,7 @@ var cordova = {
version:PLATFORM_VERSION_BUILD_LABEL,
platformVersion:PLATFORM_VERSION_BUILD_LABEL,
platformId:platform.id,
+ env:{},
/**
* Methods to add/remove your own addEventListener hijacking on document + window.
*/
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a2eb3596/src/windows/platform.js
----------------------------------------------------------------------
diff --git a/src/windows/platform.js b/src/windows/platform.js
index 036d591..be72cd3 100644
--- a/src/windows/platform.js
+++ b/src/windows/platform.js
@@ -42,15 +42,9 @@ module.exports = {
cordova.fireDocumentEvent('resume',null,true);
};
- // NOTE: this is NOT documented, and subject to change in
- // the VERY near future
var activationHandler = function activationHandler(e) {
- channel.onCordovaReady.subscribe(function() {
- // force async
- setTimeout(function(){
- cordova.fireDocumentEvent('activate',e.detail,true);
- },0);
- });
+ cordova.env = (cordova.env || { });
+ cordova.env.args = e.detail;
};
app.addEventListener("checkpoint", checkpointHandler);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] js commit: Revert "CB-8674: Creates a 'cordova.env' object,
and then on Windows hangs the"
Posted by pu...@apache.org.
Revert "CB-8674: Creates a 'cordova.env' object, and then on Windows hangs the"
This reverts commit f86227b8fe80a13d8db35a7478c798782aee1b17.
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/7f2fbc5e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/7f2fbc5e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/7f2fbc5e
Branch: refs/heads/master
Commit: 7f2fbc5e51f0f158fd277f1f675d1a7e68f29f6e
Parents: a2eb359
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed May 6 16:49:55 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed May 6 16:49:55 2015 -0700
----------------------------------------------------------------------
src/cordova.js | 1 -
src/windows/platform.js | 6 ------
2 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f2fbc5e/src/cordova.js
----------------------------------------------------------------------
diff --git a/src/cordova.js b/src/cordova.js
index 7e4377c..1ef3478 100644
--- a/src/cordova.js
+++ b/src/cordova.js
@@ -101,7 +101,6 @@ var cordova = {
version:PLATFORM_VERSION_BUILD_LABEL,
platformVersion:PLATFORM_VERSION_BUILD_LABEL,
platformId:platform.id,
- env:{},
/**
* Methods to add/remove your own addEventListener hijacking on document + window.
*/
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f2fbc5e/src/windows/platform.js
----------------------------------------------------------------------
diff --git a/src/windows/platform.js b/src/windows/platform.js
index be72cd3..2807505 100644
--- a/src/windows/platform.js
+++ b/src/windows/platform.js
@@ -41,15 +41,9 @@ module.exports = {
var resumingHandler = function resumingHandler() {
cordova.fireDocumentEvent('resume',null,true);
};
-
- var activationHandler = function activationHandler(e) {
- cordova.env = (cordova.env || { });
- cordova.env.args = e.detail;
- };
app.addEventListener("checkpoint", checkpointHandler);
Windows.UI.WebUI.WebUIApplication.addEventListener("resuming", resumingHandler, false);
- app.addEventListener('activated', activationHandler);
app.start();
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org