Merge branch 'CB-8972' of https://github.com/purplecabbage/cordova-js

pwsses · Jul 14, 2015 · 1ab1e94 · 1ab1e94
2 parents 8588542 + 7b8f3b8
commit 1ab1e94
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,18 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
 install:
-  - npm install
+  - cd ..
+  - git clone https://github.com/apache/cordova-android --depth 10
+  - git clone https://github.com/apache/cordova-ios --depth 10
+  - git clone https://github.com/apache/cordova-blackberry --depth 10
+  - git clone https://github.com/apache/cordova-windows --depth 10
+  - git clone https://github.com/apache/cordova-wp8 --depth 10
+  - git clone https://github.com/apache/cordova-ubuntu --depth 10
+  - git clone https://github.com/apache/cordova-browser --depth 10
+  - git clone https://github.com/apache/cordova-amazon-fireos --depth 10
+  - git clone https://github.com/apache/cordova-webos --depth 10
+  - cd cordova-js
+  - npm install  
 
 build: off
 

diff --git a/src/common/init.js b/src/common/init.js
@@ -87,6 +87,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.

diff --git a/src/common/init_b.js b/src/common/init_b.js
@@ -87,6 +87,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.