Skip to content

Commit

Permalink
Backbone.js 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jashkenas committed Mar 20, 2013
1 parent 9414b9a commit 699fe32
Show file tree
Hide file tree
Showing 9 changed files with 5,430 additions and 3,139 deletions.
2 changes: 1 addition & 1 deletion backbone-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backbone-min.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions backbone.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Backbone.js 0.9.10
// Backbone.js 1.0.0

// (c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc.
// Backbone may be freely distributed under the MIT license.
Expand Down Expand Up @@ -34,7 +34,7 @@
}

// Current version of the library. Keep in sync with `package.json`.
Backbone.VERSION = '0.9.10';
Backbone.VERSION = '1.0.0';

// Require Underscore, if we're on the server, and it's not already present.
var _ = root._;
Expand Down Expand Up @@ -1174,7 +1174,8 @@
// If we're sending a `PATCH` request, and we're in an old Internet Explorer
// that still has ActiveX enabled by default, override jQuery to use that
// for XHR instead. Remove this line when jQuery supports `PATCH` on IE8.
if (params.type === 'PATCH' && window.ActiveXObject) {
if (params.type === 'PATCH' && window.ActiveXObject &&
!(window.external && window.external.msActiveXFilteringEnabled)) {
params.xhr = function() {
return new ActiveXObject("Microsoft.XMLHTTP");
};
Expand Down
Loading

0 comments on commit 699fe32

Please sign in to comment.