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 2013/01/03 20:29:02 UTC

[1/2] git commit: update js for 2.3.0

update js for 2.3.0


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

Branch: refs/heads/master
Commit: ac4f0f77b8059484a2d8beb1269e64d924d8865c
Parents: 30d2e6f
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Jan 3 10:40:40 2013 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Jan 3 10:40:40 2013 -0800

----------------------------------------------------------------------
 example/www/cordova-2.3.0.js                   |    8 ++++----
 templates/custom/www/cordova-2.3.0.js          |    8 ++++----
 templates/description.txt                      |    6 ++----
 templates/full/www/cordova-2.3.0.js            |    8 ++++----
 templates/standalone/www/cordova-2.3.0.js      |    8 ++++----
 tests/MobileSpecUnitTests/www/cordova-2.3.0.js |    8 ++++----
 6 files changed, 22 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/ac4f0f77/example/www/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/example/www/cordova-2.3.0.js b/example/www/cordova-2.3.0.js
index 987f450..51e9573 100644
--- a/example/www/cordova-2.3.0.js
+++ b/example/www/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
 
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:14 GMT-0800 (Pacific Standard Time)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -6284,12 +6284,12 @@ window.cordova = require('cordova');
 
                     // Drop the common globals into the window object, but be nice and don't overwrite anything.
                     builder.buildIntoButDoNotClobber(base.defaults, context);
-                    builder.buildIntoAndMerge(base.merges, context);
                     builder.buildIntoAndClobber(base.clobbers, context);
+                    builder.buildIntoAndMerge(base.merges, context);
 
                     builder.buildIntoButDoNotClobber(platform.defaults, context);
-                    builder.buildIntoAndMerge(platform.merges, context);
                     builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/ac4f0f77/templates/custom/www/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/templates/custom/www/cordova-2.3.0.js b/templates/custom/www/cordova-2.3.0.js
index 987f450..51e9573 100644
--- a/templates/custom/www/cordova-2.3.0.js
+++ b/templates/custom/www/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
 
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:14 GMT-0800 (Pacific Standard Time)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -6284,12 +6284,12 @@ window.cordova = require('cordova');
 
                     // Drop the common globals into the window object, but be nice and don't overwrite anything.
                     builder.buildIntoButDoNotClobber(base.defaults, context);
-                    builder.buildIntoAndMerge(base.merges, context);
                     builder.buildIntoAndClobber(base.clobbers, context);
+                    builder.buildIntoAndMerge(base.merges, context);
 
                     builder.buildIntoButDoNotClobber(platform.defaults, context);
-                    builder.buildIntoAndMerge(platform.merges, context);
                     builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/ac4f0f77/templates/description.txt
----------------------------------------------------------------------
diff --git a/templates/description.txt b/templates/description.txt
index 0f41cba..dfe1a3e 100644
--- a/templates/description.txt
+++ b/templates/description.txt
@@ -1,10 +1,8 @@
 CordovaWP8AppFull
-
-Apache Cordova 2.3.0rc1 Windows Phone 8 App using a pre-built dll.
+Apache Cordova 2.3.0 Windows Phone 8 App using a pre-built dll.
 
 CordovaWP8AppStandalone
-
-Apache Cordova 2.3.0rc1 Windows Phone 8 App including all framework source code.
+Apache Cordova 2.3.0 Windows Phone 8 App including all framework source code.
 
 
 

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/ac4f0f77/templates/full/www/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/templates/full/www/cordova-2.3.0.js b/templates/full/www/cordova-2.3.0.js
index 987f450..51e9573 100644
--- a/templates/full/www/cordova-2.3.0.js
+++ b/templates/full/www/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
 
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:14 GMT-0800 (Pacific Standard Time)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -6284,12 +6284,12 @@ window.cordova = require('cordova');
 
                     // Drop the common globals into the window object, but be nice and don't overwrite anything.
                     builder.buildIntoButDoNotClobber(base.defaults, context);
-                    builder.buildIntoAndMerge(base.merges, context);
                     builder.buildIntoAndClobber(base.clobbers, context);
+                    builder.buildIntoAndMerge(base.merges, context);
 
                     builder.buildIntoButDoNotClobber(platform.defaults, context);
-                    builder.buildIntoAndMerge(platform.merges, context);
                     builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/ac4f0f77/templates/standalone/www/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/templates/standalone/www/cordova-2.3.0.js b/templates/standalone/www/cordova-2.3.0.js
index 987f450..51e9573 100644
--- a/templates/standalone/www/cordova-2.3.0.js
+++ b/templates/standalone/www/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
 
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:14 GMT-0800 (Pacific Standard Time)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -6284,12 +6284,12 @@ window.cordova = require('cordova');
 
                     // Drop the common globals into the window object, but be nice and don't overwrite anything.
                     builder.buildIntoButDoNotClobber(base.defaults, context);
-                    builder.buildIntoAndMerge(base.merges, context);
                     builder.buildIntoAndClobber(base.clobbers, context);
+                    builder.buildIntoAndMerge(base.merges, context);
 
                     builder.buildIntoButDoNotClobber(platform.defaults, context);
-                    builder.buildIntoAndMerge(platform.merges, context);
                     builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/ac4f0f77/tests/MobileSpecUnitTests/www/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/cordova-2.3.0.js b/tests/MobileSpecUnitTests/www/cordova-2.3.0.js
index 987f450..51e9573 100644
--- a/tests/MobileSpecUnitTests/www/cordova-2.3.0.js
+++ b/tests/MobileSpecUnitTests/www/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
 
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:14 GMT-0800 (Pacific Standard Time)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -6284,12 +6284,12 @@ window.cordova = require('cordova');
 
                     // Drop the common globals into the window object, but be nice and don't overwrite anything.
                     builder.buildIntoButDoNotClobber(base.defaults, context);
-                    builder.buildIntoAndMerge(base.merges, context);
                     builder.buildIntoAndClobber(base.clobbers, context);
+                    builder.buildIntoAndMerge(base.merges, context);
 
                     builder.buildIntoButDoNotClobber(platform.defaults, context);
-                    builder.buildIntoAndMerge(platform.merges, context);
                     builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();