Merge branch 'master' of https://github.com/ammmze/Backbone.ModelBinder…

… into ammmze-master Conflicts: Backbone.CollectionBinder.min.js
theironcook · Sep 30, 2013 · 1eae079 · 1eae079
2 parents 75468dc + e9165ae
commit 1eae079
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Backbone.CollectionBinder.js b/Backbone.CollectionBinder.js
@@ -2,7 +2,7 @@
 // (c) 2013 Bart Wood
 // Distributed Under MIT License
 
-(function(){
+(function(_, $, Backbone){
 
     if(!Backbone){
         throw 'Please include Backbone.js before Backbone.ModelBinder.js';
@@ -282,4 +282,4 @@
         }
     });
 
-}).call(this);
+}).call(this, _, jQuery, Backbone);
diff --git a/Backbone.CollectionBinder.min.js b/Backbone.CollectionBinder.min.js
diff --git a/Backbone.ModelBinder.js b/Backbone.ModelBinder.js
@@ -8,7 +8,7 @@
         define(['underscore', 'jquery', 'backbone'], factory);
     } else {
         // Browser globals
-        factory(_, $, Backbone);
+        factory(_, jQuery, Backbone);
     }
 }(function(_, $, Backbone){
 
@@ -577,4 +577,4 @@
 
     return Backbone.ModelBinder;
 
-}));
+}));