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/07/15 02:05:24 UTC
cordova-windows git commit: put channel in it's proper place,
and removed comment. Removed extra )
Repository: cordova-windows
Updated Branches:
refs/heads/master d28b61910 -> 563a3f3de
put channel in it's proper place, and removed comment. Removed extra )
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/563a3f3d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/563a3f3d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/563a3f3d
Branch: refs/heads/master
Commit: 563a3f3decd267554f25e66ba131779de66089d0
Parents: d28b619
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Jul 14 17:03:24 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Jul 14 17:03:24 2015 -0700
----------------------------------------------------------------------
cordova-js-src/platform.js | 6 +++---
template/www/cordova.js | 6 +-----
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/563a3f3d/cordova-js-src/platform.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/platform.js b/cordova-js-src/platform.js
index 149a794..488443b 100644
--- a/cordova-js-src/platform.js
+++ b/cordova-js-src/platform.js
@@ -31,10 +31,10 @@ module.exports = {
modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
- // we will make sure we get this channel, and remove this once
- // other platforms catch up.
+ // we will make sure we get this channel
+ // TODO: remove this once other platforms catch up.
if(!channel.onActivated) {
- channel.onActivated = cordova.addDocumentEventHandler('activated');)
+ channel.onActivated = cordova.addDocumentEventHandler('activated');
}
channel.onNativeReady.fire();
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/563a3f3d/template/www/cordova.js
----------------------------------------------------------------------
diff --git a/template/www/cordova.js b/template/www/cordova.js
index 324dd24..c9279d8 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -1140,6 +1140,7 @@ if (!window.console.warn) {
// Register pause, resume and deviceready channels as events on document.
channel.onPause = cordova.addDocumentEventHandler('pause');
channel.onResume = cordova.addDocumentEventHandler('resume');
+channel.onActivated = cordova.addDocumentEventHandler('activated');
channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
// Listen for DOMContentLoaded and notify our channel subscribers.
@@ -1298,11 +1299,6 @@ module.exports = {
modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
- // we will make sure we get this channel, and remove this once
- // other platforms catch up.
- if(!channel.onActivated) {
- channel.onActivated = cordova.addDocumentEventHandler('activated');)
- }
channel.onNativeReady.fire();
var onWinJSReady = function () {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org