mirror of
https://github.com/jashkenas/backbone.git
synced 2026-01-22 21:38:00 -05:00
Merge branch 'master' of github.com:documentcloud/backbone
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
|
||||
|
||||
// For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
|
||||
var $ = root.jQuery || root.Zepto || root.ender;
|
||||
var $ = root.jQuery || root.Zepto || root.ender || root.$;
|
||||
|
||||
// Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
|
||||
// to its previous owner. Returns a reference to this Backbone object.
|
||||
|
||||
Reference in New Issue
Block a user