Merge pull request #993 from stealjs/cl

Move addStealExtension inside makeSteal
stealjs · Jan 6, 2017 · a642d00 · a642d00
2 parents 0520102 + 13ad61a
commit a642d00
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 27 deletions.
diff --git a/main.js b/main.js
@@ -187,16 +187,16 @@ var cloneSteal = function(System){
 	return makeSteal(loader.clone());
 };
 
-var addStealExtension = function (extensionFn) {
-	if (typeof System !== "undefined" && isFunction(extensionFn)) {
-		if (System._extensions) {
-			System._extensions.push(extensionFn);
+var makeSteal = function(System){
+	var addStealExtension = function (extensionFn) {
+		if (typeof System !== "undefined" && isFunction(extensionFn)) {
+			if (System._extensions) {
+				System._extensions.push(extensionFn);
+			}
+			extensionFn(System);
 		}
-		extensionFn(System);
-	}
-};
+	};
 
-var makeSteal = function(System){
 	System.set('@loader', System.newModule({
 		'default': System,
 		__useDefault: true

diff --git a/src/core.js b/src/core.js
@@ -3,16 +3,16 @@ var cloneSteal = function(System){
 	return makeSteal(loader.clone());
 };
 
-var addStealExtension = function (extensionFn) {
-	if (typeof System !== "undefined" && isFunction(extensionFn)) {
-		if (System._extensions) {
-			System._extensions.push(extensionFn);
+var makeSteal = function(System){
+	var addStealExtension = function (extensionFn) {
+		if (typeof System !== "undefined" && isFunction(extensionFn)) {
+			if (System._extensions) {
+				System._extensions.push(extensionFn);
+			}
+			extensionFn(System);
 		}
-		extensionFn(System);
-	}
-};
+	};
 
-var makeSteal = function(System){
 	System.set('@loader', System.newModule({
 		'default': System,
 		__useDefault: true

diff --git a/steal.js b/steal.js
@@ -5260,16 +5260,16 @@ var cloneSteal = function(System){
 	return makeSteal(loader.clone());
 };
 
-var addStealExtension = function (extensionFn) {
-	if (typeof System !== "undefined" && isFunction(extensionFn)) {
-		if (System._extensions) {
-			System._extensions.push(extensionFn);
+var makeSteal = function(System){
+	var addStealExtension = function (extensionFn) {
+		if (typeof System !== "undefined" && isFunction(extensionFn)) {
+			if (System._extensions) {
+				System._extensions.push(extensionFn);
+			}
+			extensionFn(System);
 		}
-		extensionFn(System);
-	}
-};
+	};
 
-var makeSteal = function(System){
 	System.set('@loader', System.newModule({
 		'default': System,
 		__useDefault: true

diff --git a/steal.production.js b/steal.production.js
diff --git a/test/clone/clone_test.js b/test/clone/clone_test.js
@@ -0,0 +1,16 @@
+
+QUnit.module("steal.clone()");
+
+QUnit.test("Configuration is not overridden when cloning", function(){
+	steal.config({
+		ext: {
+			"foo": "bar"
+		}
+	});
+
+	QUnit.equal(steal.config("ext").foo, "bar", "initial value is right");
+
+	var clonedSteal = steal.clone();
+
+	QUnit.equal(steal.config("ext").foo, "bar", "value is preserved");
+});
diff --git a/test/unit_test.html b/test/unit_test.html
@@ -19,7 +19,7 @@ <h2 id="qunit-userAgent"></h2>
 			base-url="./"></script>
 		<script>
 		QUnit.config.autostart = false;
-		steal.import("config/config_test").then(function(){
+		steal.import("config/config_test", "clone/clone_test").then(function(){
 			QUnit.start();
 		});
 		</script>