You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/04/10 22:26:58 UTC
android commit: Updating with tagged JS
Updated Branches:
refs/heads/master 36e6b572b -> 5e1997c8d
Updated Tags: refs/tags/1.6.0 [created] 5e1997c8d
Updating with tagged JS
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/5e1997c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5e1997c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5e1997c8
Branch: refs/heads/master
Commit: 5e1997c8d8a57458c06217976fa5400528747e1a
Parents: 36e6b57
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Apr 10 13:26:35 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Apr 10 13:26:35 2012 -0700
----------------------------------------------------------------------
framework/assets/js/cordova.android.js | 44 ++++-----------------------
1 files changed, 6 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5e1997c8/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 376dd56..d02b6f1 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,4 +1,4 @@
-// File generated at :: Mon Apr 09 2012 16:59:23 GMT-0700 (PDT)
+// File generated at :: Tue Apr 10 2012 11:22:35 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -416,40 +416,7 @@ module.exports = {
// file: lib/common/channel.js
define("cordova/channel", function(require, exports, module) {
/**
- * Custom pub-sub "channel" that can have functions subscribed to it
- * This object is used to define and control firing of events for
- * cordova initialization.
- *
- * The order of events during page load and Cordova startup is as follows:
- *
- * 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
- * onDestroy Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
- *
- * The only Cordova events that user code should register for are:
- * deviceready Cordova native code is initialized and Cordova APIs can be called from JavaScript
- * pause App has moved to background
- * resume App has returned to foreground
- *
- * Listeners can be registered as:
- * document.addEventListener("deviceready", myDeviceReadyListener, false);
- * document.addEventListener("resume", myResumeListener, false);
- * document.addEventListener("pause", myPauseListener, false);
- *
- * The DOM lifecycle events should be used for saving and restoring state
- * window.onload
- * window.onunload
- *
- */
-
-/**
- * Channel
+ * Custom pub-sub channel that can have functions subscribed to it
* @constructor
* @param type String the channel name
* @param opts Object options to pass into the channel, currently
@@ -619,7 +586,8 @@ Channel.prototype.fire = function(e) {
return true;
};
-// defining them here so they are ready super fast!
+//HACK: defining them here so they are ready super fast!
+
// DOM event that is received when the web page is loaded and parsed.
channel.create('onDOMContentLoaded');
@@ -1076,11 +1044,11 @@ module.exports = {
// file: lib/common/plugin/Acceleration.js
define("cordova/plugin/Acceleration", function(require, exports, module) {
-var Acceleration = function(x, y, z, timestamp) {
+var Acceleration = function(x, y, z) {
this.x = x;
this.y = y;
this.z = z;
- this.timestamp = timestamp || (new Date()).getTime();
+ this.timestamp = new Date().getTime();
};
module.exports = Acceleration;