adopt loader #bfe3f60

jrieken · jrieken · commit 65ab56d1d645 · 2017-06-23T15:55:22.000+02:00
diff --git a/src/vs/loader.js b/src/vs/loader.js
@@ -1565,7 +1565,6 @@ var AMDLoader;
     }());
     AMDLoader.ModuleManager = ModuleManager;
 })(AMDLoader || (AMDLoader = {}));
-// Limitation: To load jquery through the loader, always require 'jquery' and add a path for it in the loader configuration
 var define;
 var AMDLoader;
 (function (AMDLoader) {
@@ -1678,7 +1677,9 @@ var AMDLoader;
             AMDLoader.global.require.__$__nodeRequire = nodeRequire;
         }
     }
-    if (typeof AMDLoader.global.define !== 'function' || !AMDLoader.global.define.amd) {
+    AMDLoader.init = init;
+    if (typeof doNotInitLoader === 'undefined' &&
+        (typeof AMDLoader.global.define !== 'function' || !AMDLoader.global.define.amd)) {
         init();
     }
 })(AMDLoader || (AMDLoader = {}));

Original file line number	Diff line number	Diff line change
`@@ -1565,7 +1565,6 @@ var AMDLoader;`
`1565`	`1565`	`}());`
`1566`	`1566`	`AMDLoader.ModuleManager = ModuleManager;`
`1567`	`1567`	`})(AMDLoader \|\| (AMDLoader = {}));`
`1568`		`-// Limitation: To load jquery through the loader, always require 'jquery' and add a path for it in the loader configuration`
`1569`	`1568`	`var define;`
`1570`	`1569`	`var AMDLoader;`
`1571`	`1570`	`(function (AMDLoader) {`
`@@ -1678,7 +1677,9 @@ var AMDLoader;`
`1678`	`1677`	`AMDLoader.global.require.__$__nodeRequire = nodeRequire;`
`1679`	`1678`	`}`
`1680`	`1679`	`}`
`1681`		`- if (typeof AMDLoader.global.define !== 'function' \|\| !AMDLoader.global.define.amd) {`
	`1680`	`+ AMDLoader.init = init;`
	`1681`	`+ if (typeof doNotInitLoader === 'undefined' &&`
	`1682`	`+ (typeof AMDLoader.global.define !== 'function' \|\| !AMDLoader.global.define.amd)) {`
`1682`	`1683`	`init();`
`1683`	`1684`	`}`
`1684`	`1685`	`})(AMDLoader \|\| (AMDLoader = {}));`