github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-01-25 06:48:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dvv/backbone

Browse Source
This commit is contained in:
Jeremy Ashkenas
2011-04-18 09:28:11 -04:00
parent 12661ff159 94edc63f20
commit 5f3135f1bb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backbone.js
View File

@@ -28,11 +28,11 @@
Backbone.VERSION = '0.3.3';
// Require Underscore, if we're on the server, and it's not already present.
var _ = root._;
var _ = root.$ && root.$.ender ? root.$ : root._;
if (!_ && (typeof require !== 'undefined')) _ = require('underscore')._;
// For Backbone's purposes, either jQuery or Zepto owns the `$` variable.
var $ = root.jQuery || root.Zepto;
var $ = root.$ && root.$.ender ? root.$ : (root.jQuery || root.Zepto);
// Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
// to its previous owner. Returns a reference to this Backbone object.
@@ -753,7 +753,7 @@
start : function() {
if (historyStarted) throw new Error("Backbone.history has already been started");
var docMode = document.documentMode;
var oldIE = ($.browser.msie && (!docMode || docMode <= 7));
var oldIE = (navigator.userAgent.toLowerCase().match(/msie [\w.]+/) && (!docMode || docMode <= 7));
if (oldIE) {
this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
}