Skip to content

Commit

Permalink
[CB-2058] [iOS] 2 File API test failures on mobile-spec 2.3.0rc2
Browse files Browse the repository at this point in the history
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
shazron authored and agrieve committed Dec 18, 2012
1 parent d8204cc commit 2226b09
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/scripts/bootstrap.js
Expand Up @@ -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();
Expand Down

0 comments on commit 2226b09

Please sign in to comment.