Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support for ender.js #322

Merged
merged 1 commit into from Apr 18, 2011
Merged

support for ender.js #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions backbone.js
View file
Open in desktop
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
}
Expand Down