Rework utils/Compatibility loading as per review

humphd · humphd · commit b8b8ef1d2a25 · 2014-03-20T20:06:42.000-04:00
diff --git a/src/brackets.js b/src/brackets.js
@@ -38,9 +38,6 @@
 define(function (require, exports, module) {
     "use strict";
 
-    // Load compatibility shims--these need to load early, be careful moving this
-    require("utils/Compatibility");
-
     // Load dependent non-module scripts
     require("widgets/bootstrap-dropdown");
     require("widgets/bootstrap-modal");
diff --git a/src/main.js b/src/main.js
@@ -50,9 +50,12 @@ require.config({
     locale: window.localStorage.getItem("locale") || (typeof (brackets) !== "undefined" ? brackets.app.language : navigator.language)
 });
 
-define(function (require, exports, module) {
+define(function (require) {
     "use strict";
-    
-    // Load the brackets module. This is a self-running module that loads and runs the entire application.
-    require("brackets");
+
+    // Load compatibility shims--these need to load early, be careful moving this
+    require(["utils/Compatibility"], function () {
+        // Load the brackets module. This is a self-running module that loads and runs the entire application.
+        require(["brackets"]);
+    });
 });
diff --git a/src/utils/Compatibility.js b/src/utils/Compatibility.js
@@ -1,24 +1,24 @@
 /*
- * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ * Copyright (c) 2014 Adobe Systems Incorporated. All rights reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 
@@ -28,7 +28,7 @@
 /**
  * Compatibility shims for running Brackets in various environments, browsers.
  */
-define(function (require, exports, module) {
+define(function () {
     "use strict";
 
     // [IE10] String.prototype missing trimRight() and trimLeft()
