cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [32/35] ios commit: updated cordovajs
Date Thu, 20 Jun 2013 21:34:47 GMT
updated cordovajs


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/bc66e148
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/bc66e148
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/bc66e148

Branch: refs/heads/3.0.0
Commit: bc66e1484e1891bb5ed3988eda1ee50e6ed0d2b2
Parents: 33b2858
Author: Steven Gill <stevengill97@gmail.com>
Authored: Mon Jun 17 17:50:33 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Thu Jun 20 14:31:42 2013 -0700

----------------------------------------------------------------------
 CordovaLib/cordova.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/bc66e148/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index 1690aba..f5353c3 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -4,6 +4,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 // 2.9.0rc1-0-g002f33d
 =======
 // 2.7.0rc1-84-g62c5786
@@ -20,6 +21,9 @@
 =======
 // 2.7.0rc1-119-gf0251c4
 >>>>>>> updated js
+=======
+// 2.7.0rc1-120-g8731b31
+>>>>>>> updated cordovajs
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -44,6 +48,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 var CORDOVA_JS_BUILD_LABEL = '2.9.0rc1-0-g002f33d';
 =======
 var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-84-g62c5786';
@@ -60,6 +65,9 @@ var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-116-gf0108ae';
 =======
 var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-119-gf0251c4';
 >>>>>>> updated js
+=======
+var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-120-g8731b31';
+>>>>>>> updated cordovajs
 // file: lib/scripts/require.js
 
 var require,
@@ -564,8 +572,6 @@ var utils = require('cordova/utils'),
  * onDOMContentLoaded*         Internal event that is received when the web page is loaded
and parsed.
  * onNativeReady*              Internal event that indicates the Cordova native side is ready.
  * onCordovaReady*             Internal event fired when all Cordova JavaScript objects have
been created.
- * onCordovaInfoReady*         Internal event fired when device properties are available.
- * onCordovaConnectionReady*   Internal event fired when the connection property has been
set.
  * 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
@@ -768,9 +774,6 @@ channel.createSticky('onNativeReady');
 // and it's time to run plugin constructors.
 channel.createSticky('onCordovaReady');
 
-// Event to indicate that device properties are available
-channel.createSticky('onCordovaInfoReady');
-
 // Event to indicate that all automatically loaded JS plugins are loaded and ready.
 channel.createSticky('onPluginsReady');
 


Mime
View raw message