Browse files

[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.
  • Loading branch information...
1 parent d8204cc commit 2226b097a5249be30da3f98789860296b2326c65 @shazron shazron committed with agrieve Dec 14, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/scripts/bootstrap.js
4 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

0 comments on commit 2226b09

Please sign in to comment.