cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject js commit: [CB-2058] [iOS] 2 File API test failures on mobile-spec 2.3.0rc2
Date Tue, 18 Dec 2012 23:32:30 GMT
Updated Branches:
  refs/heads/master d8204cc0f -> 2226b097a


[CB-2058] [iOS] 2 File API test failures on mobile-spec 2.3.0rc2

Clobber and then merge instead of the other way around.
iOS was depending on this ordering, and it makes more sense anyways.


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

Branch: refs/heads/master
Commit: 2226b097a5249be30da3f98789860296b2326c65
Parents: d8204cc
Author: Shazron Abdullah <shazron@apache.org>
Authored: Fri Dec 14 11:39:46 2012 -0800
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Dec 18 18:31:38 2012 -0500

----------------------------------------------------------------------
 lib/scripts/bootstrap.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/2226b097/lib/scripts/bootstrap.js
----------------------------------------------------------------------
diff --git a/lib/scripts/bootstrap.js b/lib/scripts/bootstrap.js
index 239e4a4..04e61d9 100644
--- a/lib/scripts/bootstrap.js
+++ b/lib/scripts/bootstrap.js
@@ -41,12 +41,12 @@
 
                     // 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();


Mime
View raw message