- remove noConflict()

- new laxcomma option in jshint
- bump version

Makefile.js

@@ -18,6 +18,7 @@ require('smoosh').config({
     , "whitespace": true
     , "asi": true
     , "laxbreak": true
+    , "laxcomma": true
     , "eqeqeq": false
     , "eqnull": true
   }

README.md

@@ -5,11 +5,11 @@ $script.js - Async JavaScript loader and dependency manager
 
 Browser Support
 ---------------
-  * IE 6, 7, 8, 9
-  * Opera 10, 11
-  * Safari 3, 4, 5
-  * Chrome 9, 10, beta
-  * Firefox 2, 3, beta
+  * IE 6+
+  * Opera 10+
+  * Safari 3+
+  * Chrome 9+
+  * Firefox 2+
   * Lynx (just kidding)
 
 Examples

dist/script.js

@@ -12,7 +12,7 @@
   var win = this, doc = document
     , head = doc.getElementsByTagName('head')[0]
     , validBase = /^https?:\/\//
-    , old = win.$script, list = {}, ids = {}, delay = {}, scriptpath
+    , list = {}, ids = {}, delay = {}, scriptpath
     , scripts = {}, s = 'string', f = false
     , push = 'push', domContentLoaded = 'DOMContentLoaded', readyState = 'readyState'
     , addEventListener = 'addEventListener', onreadystatechange = 'onreadystatechange'
@@ -108,11 +108,5 @@
     }(deps.join('|'))
     return $script
   }
-
-  $script.noConflict = function () {
-    win.$script = old;
-    return this
-  }
-
   return $script
 })

package.json

@@ -2,7 +2,7 @@
     "name": "scriptjs"
   , "description": "Asyncronous JavaScript loader and dependency manager"
   , "keywords": ["ender", "script", "dependency", "ajax", "jsonp", "loader"]
-  , "version": "2.2.2"
+  , "version": "2.2.3"
   , "homepage": "https://github.com/ded/script.js"
   , "author": "Dustin Diaz <dustin@dustindiaz.com> (http://dustindiaz.com)"
   , "contributors": ["Jacob Thornton <jacob@twitter.com> (https://github.com/fat)"]

src/script.js

@@ -6,7 +6,7 @@
   var win = this, doc = document
     , head = doc.getElementsByTagName('head')[0]
     , validBase = /^https?:\/\//
-    , old = win.$script, list = {}, ids = {}, delay = {}, scriptpath
+    , list = {}, ids = {}, delay = {}, scriptpath
     , scripts = {}, s = 'string', f = false
     , push = 'push', domContentLoaded = 'DOMContentLoaded', readyState = 'readyState'
     , addEventListener = 'addEventListener', onreadystatechange = 'onreadystatechange'
@@ -102,11 +102,5 @@
     }(deps.join('|'))
     return $script
   }
-
-  $script.noConflict = function () {
-    win.$script = old;
-    return this
-  }
-
   return $script
 })

tests/test.html

@@ -12,7 +12,7 @@
     <script src="../src/script.js"></script>
     <script src="../node_modules/sink-test/src/sink.js"></script>
     <script type="text/javascript">
-      var script = $script.noConflict();
+      var script = $script
     </script>
     <script type="text/javascript">
       script('tests.js?' + (new Date).getTime())

tests/tests.js

@@ -2,12 +2,6 @@ script('../node_modules/domready/ready.js', function () {
 
   domReady(function() {
 
-    sink('no conflict', function (test, ok) {
-      test('should return old $script back to context', 1, function () {
-        ok($script() == 'success', 'old $script called')
-      })
-    })
-
     sink('Basic', function(test, ok, before, after) {
 
       test('should call from chained ready calls', 4, function() {