make it strict-mode compatible; add .noConflict

balpha · Dec 17, 2013 · 4794227 · 4794227
1 parent 3b5ddc7
commit 4794227
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/lyfe.js b/lyfe.js
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-(function () {
+(function (global) {
 
     var arrIndexOf;
     if (Array.prototype.indexOf) {
@@ -340,11 +340,16 @@
         return Count(start, 1).take(len);
     };
 
-    this.Generator = Generator;
+    var originalGenerator = global.Generator;
+    global.Generator = Generator;
     Generator.BreakIteration = BreakIteration;
     Generator.Count = Count;
     Generator.Range = Range;
     Generator.IterationError = IterationError;
+    Generator.noConflict = function () {
+        global.Generator = originalGenerator;
+        return Generator;
+    }
 
-})();
+})(this);
 
diff --git a/test.html b/test.html
@@ -1,6 +1,11 @@
 <!doctype html>
 <html>
 <head>
+<script>
+    window.Generator = window.oldGenerator = {};
+</script>
+
+
 <script src="lyfe.js"></script>
 <script>
 
@@ -43,6 +48,19 @@
     var helloWorld = function () { alert("hello world"); };
     var a = [13, null, helloWorld, -10.5, "lolcat"];
 
+    test("noConflict", function () {
+        var newGenerator = window.Generator;
+        if (newGenerator === oldGenerator)
+            return false;
+        var localGenerator = newGenerator.noConflict();
+        if (localGenerator !== newGenerator)
+            return false;
+        if (window.Generator !== oldGenerator)
+            return false;
+        window.Generator = newGenerator;
+        return true;        
+    });
+
     test("array constructor", function () {
         var roundtrip = Generator(a).toArray();
         return arrEqual(a, roundtrip);
@@ -625,7 +643,6 @@
         var r2 = Generator(b).zipWithArray(a, function (x, y) { return x + y }).toArray();
         return arrEqual(r1, r2);
     });
-
 </script>