cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [1/2] js commit: Revert "reverted global change to cordova object, added temp? 'activate' event to windows platform"
Date Wed, 06 May 2015 23:52:02 GMT
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 <purplecabbage@gmail.com>
Authored: Wed May 6 16:49:16 2015 -0700
Committer: Jesse MacFadyen <purplecabbage@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


Mime
View raw message