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 2013/12/10 23:05:09 UTC

[1/2] android commit: Update JS snapshot to version 3.3.0 (via coho)

Updated Branches:
  refs/heads/3.3.x 32ce970ee -> 446202d2a


Update JS snapshot to version 3.3.0 (via coho)


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

Branch: refs/heads/3.3.x
Commit: 81ed0d8d098c92a02ad7b59a12b7cec1f28b7596
Parents: 32ce970
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 10 13:43:16 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 10 13:43:16 2013 -0800

----------------------------------------------------------------------
 framework/assets/www/cordova.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/81ed0d8d/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 4a4a4df..b5fdf69 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 3.3.0-rc1
+// 3.3.0
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.3.0-rc1';
+var CORDOVA_JS_BUILD_LABEL = '3.3.0';
 // file: lib/scripts/require.js
 
 /*jshint -W079 */
@@ -34,7 +34,7 @@ var require,
         requireStack = [],
     // Map of module ID -> index into requireStack of modules currently being built.
         inProgressModules = {},
-        SEPERATOR = ".";
+        SEPARATOR = ".";
 
 
 
@@ -44,7 +44,7 @@ var require,
                 var resultantId = id;
                 //Its a relative path, so lop off the last portion and add the id (minus "./")
                 if (id.charAt(0) === ".") {
-                    resultantId = module.id.slice(0, module.id.lastIndexOf(SEPERATOR)) + SEPERATOR + id.slice(2);
+                    resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2);
                 }
                 return require(resultantId);
             };

[2/2] android commit: Set VERSION to 3.3.0 (via coho)

Posted by bo...@apache.org.
Set VERSION to 3.3.0 (via coho)


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

Branch: refs/heads/3.3.x
Commit: 446202d2a9540c9e96a9a5177f235bb6ab0b8658
Parents: 81ed0d8
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 10 13:43:17 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 10 13:43:17 2013 -0800

----------------------------------------------------------------------
 VERSION                                              | 2 +-
 bin/templates/cordova/version                        | 2 +-
 framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/446202d2/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 490631a..15a2799 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-rc1
+3.3.0

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/446202d2/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index bd92590..a40f712 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "3.3.0-rc1";
+var VERSION = "3.3.0";
 
 console.log(VERSION);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/446202d2/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 0c38160..ca39cf3 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -68,7 +68,7 @@ import android.widget.FrameLayout;
 public class CordovaWebView extends WebView {
 
     public static final String TAG = "CordovaWebView";
-    public static final String CORDOVA_VERSION = "3.3.0-rc1";
+    public static final String CORDOVA_VERSION = "3.3.0";
 
     private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
     private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();