<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[27233] trunk/src/wp-includes: Update Backbone to version 1.1.2.</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27233">27233</a></dd>

<dt>Author</dt> <dd>ocean90</dd>

<dt>Date</dt> <dd>2014-02-22 15:41:50 +0000 (Sat, 22 Feb 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Update Backbone to version 1.1.2.

props gcorne.

fixes <a href="http://core.trac.wordpress.org/ticket/27182">#27182</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunksrcwpincludesjsbackbonejs">trunk/src/wp-includes/js/backbone.js</a></li>

<li><a href="#trunksrcwpincludesjsbackboneminjs">trunk/src/wp-includes/js/backbone.min.js</a></li>

<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunksrcwpincludesjsbackbonejs"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/backbone.js (27232 => 27233)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/js/backbone.js     2014-02-22 01:58:45 UTC (rev 27232)

+++ trunk/src/wp-includes/js/backbone.js        2014-02-22 15:41:50 UTC (rev 27233)

</span><span class="lines">@@ -1,20 +1,35 @@

</span><del>-//     Backbone.js 1.1.0

</del><ins>+//     Backbone.js 1.1.2

</ins><span class="cx"> 

</span><del>-//     (c) 2010-2011 Jeremy Ashkenas, DocumentCloud Inc.

-//     (c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors

</del><ins>+//     (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors

</ins><span class="cx"> //     Backbone may be freely distributed under the MIT license.

</span><span class="cx"> //     For all details and documentation:

</span><span class="cx"> //     http://backbonejs.org

</span><span class="cx"> 

</span><del>-(function(){

</del><ins>+(function(root, factory) {

</ins><span class="cx"> 

<ins>+  // Set up Backbone appropriately for the environment. Start with AMD.

+  if (typeof define === 'function' && define.amd) {

+    define(['underscore', 'jquery', 'exports'], function(_, $, exports) {

+      // Export global even in AMD case in case this script is loaded with

+      // others that may still expect a global Backbone.

+      root.Backbone = factory(root, exports, _, $);

+    });

+

+  // Next for Node.js or CommonJS. jQuery may not be needed as a module.

+  } else if (typeof exports !== 'undefined') {

+    var _ = require('underscore');

+    factory(root, exports, _);

+

+  // Finally, as a browser global.

+  } else {

+    root.Backbone = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender || root.$));

+  }

+

+}(this, function(root, Backbone, _, $) {

+

</ins><span class="cx">   // Initial Setup

</span><span class="cx">   // -------------

</span><span class="cx"> 

</span><del>-  // Save a reference to the global object (`window` in the browser, `exports`

-  // on the server).

-  var root = this;

-

</del><span class="cx">   // Save the previous value of the `Backbone` variable, so that it can be

<span class="cx">   // restored later on, if `noConflict` is used.

</span><span class="cx">   var previousBackbone = root.Backbone;

</span><span class="lines">@@ -25,25 +40,12 @@

</span><span class="cx">   var slice = array.slice;

</span><span class="cx">   var splice = array.splice;

</span><span class="cx"> 

</span><del>-  // The top-level namespace. All public Backbone classes and modules will

-  // be attached to this. Exported for both the browser and the server.

-  var Backbone;

-  if (typeof exports !== 'undefined') {

-    Backbone = exports;

-  } else {

-    Backbone = root.Backbone = {};

-  }

-

</del><span class="cx">   // Current version of the library. Keep in sync with `package.json`.

</span><del>-  Backbone.VERSION = '1.1.0';

</del><ins>+  Backbone.VERSION = '1.1.2';

</ins><span class="cx"> 

<del>-  // Require Underscore, if we're on the server, and it's not already present.

-  var _ = root._;

-  if (!_ && (typeof require !== 'undefined')) _ = require('underscore');

-

</del><span class="cx">   // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns

</span><span class="cx">   // the `$` variable.

</span><del>-  Backbone.$ = root.jQuery || root.Zepto || root.ender || root.$;

</del><ins>+  Backbone.$ = $;

</ins><span class="cx"> 

</span><span class="cx">   // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable

<span class="cx">   // to its previous owner. Returns a reference to this Backbone object.

</span><span class="lines">@@ -109,7 +111,7 @@

</span><span class="cx">       var retain, ev, events, names, i, l, j, k;

</span><span class="cx">       if (!this._events || !eventsApi(this, 'off', name, [callback, context])) return this;

</span><span class="cx">       if (!name && !callback && !context) {

</span><del>-        this._events = {};

</del><ins>+        this._events = void 0;

</ins><span class="cx">         return this;

</span><span class="cx">       }

</span><span class="cx">       names = name ? [name] : _.keys(this._events);

</span><span class="lines">@@ -205,7 +207,7 @@

</span><span class="cx">       case 1: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1); return;

</span><span class="cx">       case 2: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2); return;

</span><span class="cx">       case 3: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2, a3); return;

</span><del>-      default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args);

</del><ins>+      default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args); return;

</ins><span class="cx">     }

</span><span class="cx">   };

</span><span class="cx"> 

</span><span class="lines">@@ -350,7 +352,7 @@

</span><span class="cx"> 

<span class="cx">       // Trigger all relevant attribute changes.

</span><span class="cx">       if (!silent) {

</span><del>-        if (changes.length) this._pending = true;

</del><ins>+        if (changes.length) this._pending = options;

</ins><span class="cx">         for (var i = 0, l = changes.length; i < l; i++) {

</span><span class="cx">           this.trigger('change:' + changes[i], this, current[changes[i]], options);

</span><span class="cx">         }

</span><span class="lines">@@ -361,6 +363,7 @@

</span><span class="cx">       if (changing) return this;

</span><span class="cx">       if (!silent) {

</span><span class="cx">         while (this._pending) {

</span><ins>+          options = this._pending;

</ins><span class="cx">           this._pending = false;

</span><span class="cx">           this.trigger('change', this, options);

</span><span class="cx">         }

</span><span class="lines">@@ -528,9 +531,12 @@

</span><span class="cx">     // using Backbone's restful methods, override this to change the endpoint

<span class="cx">     // that will be called.

</span><span class="cx">     url: function() {

</span><del>-      var base = _.result(this, 'urlRoot') || _.result(this.collection, 'url') || urlError();

</del><ins>+      var base =

+        _.result(this, 'urlRoot') ||

+        _.result(this.collection, 'url') ||

+        urlError();

</ins><span class="cx">       if (this.isNew()) return base;

</span><del>-      return base + (base.charAt(base.length - 1) === '/' ? '' : '/') + encodeURIComponent(this.id);

</del><ins>+      return base.replace(/([^\/])$/, '$1/') + encodeURIComponent(this.id);

</ins><span class="cx">     },

</span><span class="cx"> 

</span><span class="cx">     // **parse** converts a response into the hash of attributes to be `set` on

</span><span class="lines">@@ -546,7 +552,7 @@

</span><span class="cx"> 

<span class="cx">     // A model is new if it has never been saved to the server, and lacks an id.

</span><span class="cx">     isNew: function() {

</span><del>-      return this.id == null;

</del><ins>+      return !this.has(this.idAttribute);

</ins><span class="cx">     },

</span><span class="cx"> 

<span class="cx">     // Check if the model is currently in a valid state.

</span><span class="lines">@@ -650,7 +656,7 @@

</span><span class="cx">           options.index = index;

</span><span class="cx">           model.trigger('remove', model, this, options);

</span><span class="cx">         }

</span><del>-        this._removeReference(model);

</del><ins>+        this._removeReference(model, options);

</ins><span class="cx">       }

</span><span class="cx">       return singular ? models[0] : models;

</span><span class="cx">     },

</span><span class="lines">@@ -676,11 +682,11 @@

</span><span class="cx">       // Turn bare objects into model references, and prevent invalid models

<span class="cx">       // from being added.

</span><span class="cx">       for (i = 0, l = models.length; i < l; i++) {

</span><del>-        attrs = models[i];

</del><ins>+        attrs = models[i] || {};

</ins><span class="cx">         if (attrs instanceof Model) {

</span><span class="cx">           id = model = attrs;

</span><span class="cx">         } else {

</span><del>-          id = attrs[targetModel.prototype.idAttribute];

</del><ins>+          id = attrs[targetModel.prototype.idAttribute || 'id'];

</ins><span class="cx">         }

</span><span class="cx"> 

</span><span class="cx">         // If a duplicate is found, prevent it from being added and

</span><span class="lines">@@ -700,14 +706,13 @@

</span><span class="cx">           model = models[i] = this._prepareModel(attrs, options);

</span><span class="cx">           if (!model) continue;

</span><span class="cx">           toAdd.push(model);

</span><ins>+          this._addReference(model, options);

+        }

</ins><span class="cx"> 

</span><del>-          // Listen to added models' events, and index models for lookup by

-          // `id` and by `cid`.

-          model.on('all', this._onModelEvent, this);

-          this._byId[model.cid] = model;

-          if (model.id != null) this._byId[model.id] = model;

-        }

-        if (order) order.push(existing || model);

</del><ins>+        // Do not add multiple models with the same `id`.

+        model = existing || model;

+        if (order && (model.isNew() || !modelMap[model.id])) order.push(model);

+        modelMap[model.id] = true;

</ins><span class="cx">       }

</span><span class="cx"> 

<span class="cx">       // Remove nonexistent models if appropriate.

</span><span class="lines">@@ -745,7 +750,7 @@

</span><span class="cx">         }

</span><span class="cx">         if (sort || (order && order.length)) this.trigger('sort', this, options);

</span><span class="cx">       }

</span><del>-      

</del><ins>+

</ins><span class="cx">       // Return the added (or merged) model (or models).

</span><span class="cx">       return singular ? models[0] : models;

</span><span class="cx">     },

</span><span class="lines">@@ -757,7 +762,7 @@

</span><span class="cx">     reset: function(models, options) {

</span><span class="cx">       options || (options = {});

</span><span class="cx">       for (var i = 0, l = this.models.length; i < l; i++) {

</span><del>-        this._removeReference(this.models[i]);

</del><ins>+        this._removeReference(this.models[i], options);

</ins><span class="cx">       }

</span><span class="cx">       options.previousModels = this.models;

</span><span class="cx">       this._reset();

</span><span class="lines">@@ -798,7 +803,7 @@

<span class="cx">     // Get a model from the set by id.

</span><span class="cx">     get: function(obj) {

</span><span class="cx">       if (obj == null) return void 0;

</span><del>-      return this._byId[obj.id] || this._byId[obj.cid] || this._byId[obj];

</del><ins>+      return this._byId[obj] || this._byId[obj.id] || this._byId[obj.cid];

</ins><span class="cx">     },

</span><span class="cx"> 

<span class="cx">     // Get the model at the given index.

</span><span class="lines">@@ -874,7 +879,7 @@

</span><span class="cx">       if (!options.wait) this.add(model, options);

</span><span class="cx">       var collection = this;

</span><span class="cx">       var success = options.success;

</span><del>-      options.success = function(model, resp, options) {

</del><ins>+      options.success = function(model, resp) {

</ins><span class="cx">         if (options.wait) collection.add(model, options);

</span><span class="cx">         if (success) success(model, resp, options);

</span><span class="cx">       };

</span><span class="lines">@@ -904,10 +909,7 @@

</span><span class="cx">     // Prepare a hash of attributes (or other model) to be added to this

<span class="cx">     // collection.

</span><span class="cx">     _prepareModel: function(attrs, options) {

</span><del>-      if (attrs instanceof Model) {

-        if (!attrs.collection) attrs.collection = this;

-        return attrs;

-      }

</del><ins>+      if (attrs instanceof Model) return attrs;

</ins><span class="cx">       options = options ? _.clone(options) : {};

</span><span class="cx">       options.collection = this;

</span><span class="cx">       var model = new this.model(attrs, options);

</span><span class="lines">@@ -916,8 +918,16 @@

</span><span class="cx">       return false;

</span><span class="cx">     },

</span><span class="cx"> 

<ins>+    // Internal method to create a model's ties to a collection.

+    _addReference: function(model, options) {

+      this._byId[model.cid] = model;

+      if (model.id != null) this._byId[model.id] = model;

+      if (!model.collection) model.collection = this;

+      model.on('all', this._onModelEvent, this);

+    },

+

</ins><span class="cx">     // Internal method to sever a model's ties to a collection.

</span><del>-    _removeReference: function(model) {

</del><ins>+    _removeReference: function(model, options) {

</ins><span class="cx">       if (this === model.collection) delete model.collection;

</span><span class="cx">       model.off('all', this._onModelEvent, this);

</span><span class="cx">     },

</span><span class="lines">@@ -946,7 +956,7 @@

</span><span class="cx">     'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke',

</span><span class="cx">     'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest',

</span><span class="cx">     'tail', 'drop', 'last', 'without', 'difference', 'indexOf', 'shuffle',

</span><del>-    'lastIndexOf', 'isEmpty', 'chain'];

</del><ins>+    'lastIndexOf', 'isEmpty', 'chain', 'sample'];

</ins><span class="cx"> 

<span class="cx">   // Mix in each Underscore method as a proxy to `Collection#models`.

</span><span class="cx">   _.each(methods, function(method) {

</span><span class="lines">@@ -958,7 +968,7 @@

</span><span class="cx">   });

</span><span class="cx"> 

<span class="cx">   // Underscore methods that take a property name as an argument.

</span><del>-  var attributeMethods = ['groupBy', 'countBy', 'sortBy'];

</del><ins>+  var attributeMethods = ['groupBy', 'countBy', 'sortBy', 'indexBy'];

</ins><span class="cx"> 

<span class="cx">   // Use attributes instead of properties.

</span><span class="cx">   _.each(attributeMethods, function(method) {

</span><span class="lines">@@ -1180,7 +1190,9 @@

</span><span class="cx">     return xhr;

</span><span class="cx">   };

</span><span class="cx"> 

</span><del>-  var noXhrPatch = typeof window !== 'undefined' && !!window.ActiveXObject && !(window.XMLHttpRequest && (new XMLHttpRequest).dispatchEvent);

</del><ins>+  var noXhrPatch =

+    typeof window !== 'undefined' && !!window.ActiveXObject &&

+      !(window.XMLHttpRequest && (new XMLHttpRequest).dispatchEvent);

</ins><span class="cx"> 

<span class="cx">   // Map from CRUD to HTTP for our default `Backbone.sync` implementation.

</span><span class="cx">   var methodMap = {

</span><span class="lines">@@ -1239,7 +1251,7 @@

</span><span class="cx">       var router = this;

</span><span class="cx">       Backbone.history.route(route, function(fragment) {

</span><span class="cx">         var args = router._extractParameters(route, fragment);

</span><del>-        callback && callback.apply(router, args);

</del><ins>+        router.execute(callback, args);

</ins><span class="cx">         router.trigger.apply(router, ['route:' + name].concat(args));

</span><span class="cx">         router.trigger('route', name, args);

</span><span class="cx">         Backbone.history.trigger('route', router, name, args);

</span><span class="lines">@@ -1247,6 +1259,12 @@

</span><span class="cx">       return this;

</span><span class="cx">     },

</span><span class="cx"> 

</span><ins>+    // Execute a route handler with the provided parameters.  This is an

+    // excellent place to do pre-route setup or post-route cleanup.

+    execute: function(callback, args) {

+      if (callback) callback.apply(this, args);

+    },

+

</ins><span class="cx">     // Simple proxy to `Backbone.history` to save a fragment into the history.

</span><span class="cx">     navigate: function(fragment, options) {

</span><span class="cx">       Backbone.history.navigate(fragment, options);

</span><span class="lines">@@ -1271,10 +1289,10 @@

</span><span class="cx">       route = route.replace(escapeRegExp, '\\$&')

</span><span class="cx">                    .replace(optionalParam, '(?:$1)?')

</span><span class="cx">                    .replace(namedParam, function(match, optional) {

</span><del>-                     return optional ? match : '([^\/]+)';

</del><ins>+                     return optional ? match : '([^/?]+)';

</ins><span class="cx">                    })

</span><del>-                   .replace(splatParam, '(.*?)');

-      return new RegExp('^' + route + '$');

</del><ins>+                   .replace(splatParam, '([^?]*?)');

+      return new RegExp('^' + route + '(?:\\?([\\s\\S]*))?$');

</ins><span class="cx">     },

</span><span class="cx"> 

</span><span class="cx">     // Given a route, and a URL fragment that it matches, return the array of

</span><span class="lines">@@ -1282,7 +1300,9 @@

<span class="cx">     // treated as `null` to normalize cross-browser behavior.

</span><span class="cx">     _extractParameters: function(route, fragment) {

</span><span class="cx">       var params = route.exec(fragment).slice(1);

</span><del>-      return _.map(params, function(param) {

</del><ins>+      return _.map(params, function(param, i) {

+        // Don't decode the search params.

+        if (i === params.length - 1) return param || null;

</ins><span class="cx">         return param ? decodeURIComponent(param) : null;

</span><span class="cx">       });

</span><span class="cx">     }

</span><span class="lines">@@ -1320,8 +1340,8 @@

<span class="cx">   // Cached regex for removing a trailing slash.

</span><span class="cx">   var trailingSlash = /\/$/;

</span><span class="cx"> 

<del>-  // Cached regex for stripping urls of hash and query.

-  var pathStripper = /[?#].*$/;

</del><ins>+  // Cached regex for stripping urls of hash.

+  var pathStripper = /#.*$/;

</ins><span class="cx"> 

<span class="cx">   // Has the history handling already been started?

</span><span class="cx">   History.started = false;

</span><span class="lines">@@ -1333,6 +1353,11 @@

<span class="cx">     // twenty times a second.

</span><span class="cx">     interval: 50,

</span><span class="cx"> 

<ins>+    // Are we at the app root?

+    atRoot: function() {

+      return this.location.pathname.replace(/[^\/]$/, '$&/') === this.root;

+    },

+

</ins><span class="cx">     // Gets the true hash value. Cannot use location.hash directly due to bug

<span class="cx">     // in Firefox where location.hash will always be decoded.

</span><span class="cx">     getHash: function(window) {

</span><span class="lines">@@ -1345,7 +1370,7 @@

</span><span class="cx">     getFragment: function(fragment, forcePushState) {

</span><span class="cx">       if (fragment == null) {

</span><span class="cx">         if (this._hasPushState || !this._wantsHashChange || forcePushState) {

</span><del>-          fragment = this.location.pathname;

</del><ins>+          fragment = decodeURI(this.location.pathname + this.location.search);

</ins><span class="cx">           var root = this.root.replace(trailingSlash, '');

</span><span class="cx">           if (!fragment.indexOf(root)) fragment = fragment.slice(root.length);

</span><span class="cx">         } else {

</span><span class="lines">@@ -1376,7 +1401,8 @@

</span><span class="cx">       this.root = ('/' + this.root + '/').replace(rootStripper, '/');

</span><span class="cx"> 

</span><span class="cx">       if (oldIE && this._wantsHashChange) {

</span><del>-        this.iframe = Backbone.$('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;

</del><ins>+        var frame = Backbone.$('<iframe src="javascript:0" tabindex="-1">');

+        this.iframe = frame.hide().appendTo('body')[0].contentWindow;

</ins><span class="cx">         this.navigate(fragment);

</span><span class="cx">       }

</span><span class="cx"> 

</span><span class="lines">@@ -1394,7 +1420,6 @@

<span class="cx">       // opened by a non-pushState browser.

</span><span class="cx">       this.fragment = fragment;

</span><span class="cx">       var loc = this.location;

</span><del>-      var atRoot = loc.pathname.replace(/[^\/]$/, '$&/') === this.root;

</del><span class="cx"> 

</span><span class="cx">       // Transition from hashChange to pushState or vice versa if both are

<span class="cx">       // requested.

</span><span class="lines">@@ -1402,17 +1427,17 @@

</span><span class="cx"> 

</span><span class="cx">         // If we've started off with a route from a `pushState`-enabled

<span class="cx">         // browser, but we're currently in a browser that doesn't support it...

</span><del>-        if (!this._hasPushState && !atRoot) {

</del><ins>+        if (!this._hasPushState && !this.atRoot()) {

</ins><span class="cx">           this.fragment = this.getFragment(null, true);

</span><del>-          this.location.replace(this.root + this.location.search + '#' + this.fragment);

</del><ins>+          this.location.replace(this.root + '#' + this.fragment);

</ins><span class="cx">           // Return immediately as browser will do redirect to new url

</span><span class="cx">           return true;

</span><span class="cx"> 

</span><span class="cx">         // Or if we've started out with a hash-based route, but we're currently

<span class="cx">         // in a browser where it could be `pushState`-based instead...

</span><del>-        } else if (this._hasPushState && atRoot && loc.hash) {

</del><ins>+        } else if (this._hasPushState && this.atRoot() && loc.hash) {

</ins><span class="cx">           this.fragment = this.getHash().replace(routeStripper, '');

</span><del>-          this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);

</del><ins>+          this.history.replaceState({}, document.title, this.root + this.fragment);

</ins><span class="cx">         }

</span><span class="cx"> 

</span><span class="cx">       }

</span><span class="lines">@@ -1424,7 +1449,7 @@

<span class="cx">     // but possibly useful for unit testing Routers.

</span><span class="cx">     stop: function() {

</span><span class="cx">       Backbone.$(window).off('popstate', this.checkUrl).off('hashchange', this.checkUrl);

</span><del>-      clearInterval(this._checkUrlInterval);

</del><ins>+      if (this._checkUrlInterval) clearInterval(this._checkUrlInterval);

</ins><span class="cx">       History.started = false;

</span><span class="cx">     },

</span><span class="cx"> 

</span><span class="lines">@@ -1472,7 +1497,7 @@

</span><span class="cx"> 

</span><span class="cx">       var url = this.root + (fragment = this.getFragment(fragment || ''));

</span><span class="cx"> 

<del>-      // Strip the fragment of the query and hash for matching.

</del><ins>+      // Strip the hash for matching.

</ins><span class="cx">       fragment = fragment.replace(pathStripper, '');

</span><span class="cx"> 

</span><span class="cx">       if (this.fragment === fragment) return;

</span><span class="lines">@@ -1578,4 +1603,6 @@

</span><span class="cx">     };

</span><span class="cx">   };

</span><span class="cx"> 

</span><del>-}).call(this);

</del><ins>+  return Backbone;

+

+}));

</ins></span></pre></div>

<a id="trunksrcwpincludesjsbackboneminjs"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/backbone.min.js (27232 => 27233)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/js/backbone.min.js 2014-02-22 01:58:45 UTC (rev 27232)

+++ trunk/src/wp-includes/js/backbone.min.js    2014-02-22 15:41:50 UTC (rev 27233)

</span><span class="lines">@@ -1 +1 @@

</span><del>-(function(){var t=this;var e=t.Backbone;var i=[];var r=i.push;var s=i.slice;var n=i.splice;var a;if(typeof exports!=="undefined"){a=exports}else{a=t.Backbone={}}a.VERSION="1.1.0";var h=t._;if(!h&&typeof require!=="undefined")h=require("underscore");a.$=t.jQuery||t.Zepto||t.ender||t.$;a.noConflict=function(){t.Backbone=e;return this};a.emulateHTTP=false;a.emulateJSON=false;var o=a.Events={on:function(t,e,i){if(!l(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,i){if(!l(this,"once",t,[e,i])||!e)return this;var r=this;var s=h.once(function(){r.off(t,s);e.apply(this,arguments)});s._callback=e;return this.on(t,s,i)},off:function(t,e,i){var r,s,n,a,o,u,c,f;if(!this._events||!l(this,"off",t,[e,i]))return this;if(!t&&!e&&!i){this._events={};return this

 }a=t?[t]:h.keys(this._events);for(o=0,u=a.length;o<u;o++){t=a[o];if(n=this._events[t]){this._events[t]=r=[];if(e||i){for(c=0,f=n.length;c<f;c++){s=n[c];if(e&&e!==s.callback&&e!==s.callback._callback||i&&i!==s.context){r.push(s)}}}if(!r.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=s.call(arguments,1);if(!l(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)c(i,e);if(r)c(r,arguments);return this},stopListening:function(t,e,i){var r=this._listeningTo;if(!r)return this;var s=!e&&!i;if(!i&&typeof e==="object")i=this;if(t)(r={})[t._listenId]=t;for(var n in r){t=r[n];t.off(e,i,this);if(s||h.isEmpty(t._events))delete this._listeningTo[n]}return this}};var u=/\s+/;var l=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(u.test(i)){var n=i.split(u);for(var a=0,h

 =n.length;a<h;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var c=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],h=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,h);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e)}};var f={listenTo:"on",listenToOnce:"once"};h.each(f,function(t,e){o[e]=function(e,i,r){var s=this._listeningTo||(this._listeningTo={});var n=e._listenId||(e._listenId=h.uniqueId("l"));s[n]=e;if(!r&&typeof i==="object")r=this;e[t](i,r,this);return this}});o.bind=o.on;o.unbind=o.off;h.extend(a,o);var d=a.Model=function(t,e){var i=t||{};e||(e={});this.cid=h.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)i=this.parse(i,e)||{};i=h.def

 aults({},i,h.result(this,"defaults"));this.set(i,e);this.changed={};this.initialize.apply(this,arguments)};h.extend(d.prototype,o,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return h.clone(this.attributes)},sync:function(){return a.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return h.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,i){var r,s,n,a,o,u,l,c;if(t==null)return this;if(typeof t==="object"){s=t;i=e}else{(s={})[t]=e}i||(i={});if(!this._validate(s,i))return false;n=i.unset;o=i.silent;a=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=h.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in s)this.id=s[this.idAttribute];for(r in s){e=s[r];if(!h.isEqual(c[r],e))a.push(r);if(!h.isEqual(l[r],e)){this.changed[r]=e}else{delete this.changed[r]}n?delete 

 c[r]:c[r]=e}if(!o){if(a.length)this._pending=true;for(var f=0,d=a.length;f<d;f++){this.trigger("change:"+a[f],this,c[a[f]],i)}}if(u)return this;if(!o){while(this._pending){this._pending=false;this.trigger("change",this,i)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,h.extend({},e,{unset:true}))},clear:function(t){var e={};for(var i in this.attributes)e[i]=void 0;return this.set(e,h.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!h.isEmpty(this.changed);return h.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?h.clone(this.changed):false;var e,i=false;var r=this._changing?this._previousAttributes:this.attributes;for(var s in t){if(h.isEqual(r[s],e=t[s]))continue;(i||(i={}))[s]=e}return i},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return h.clone(this._previousAt

 tributes)},fetch:function(t){t=t?h.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var i=t.success;t.success=function(r){if(!e.set(e.parse(r,t),t))return false;if(i)i(e,r,t);e.trigger("sync",e,r,t)};M(this,t);return this.sync("read",this,t)},save:function(t,e,i){var r,s,n,a=this.attributes;if(t==null||typeof t==="object"){r=t;i=e}else{(r={})[t]=e}i=h.extend({validate:true},i);if(r&&!i.wait){if(!this.set(r,i))return false}else{if(!this._validate(r,i))return false}if(r&&i.wait){this.attributes=h.extend({},a,r)}if(i.parse===void 0)i.parse=true;var o=this;var u=i.success;i.success=function(t){o.attributes=a;var e=o.parse(t,i);if(i.wait)e=h.extend(r||{},e);if(h.isObject(e)&&!o.set(e,i)){return false}if(u)u(o,t,i);o.trigger("sync",o,t,i)};M(this,i);s=this.isNew()?"create":i.patch?"patch":"update";if(s==="patch")i.attrs=r;n=this.sync(s,this,i);if(r&&i.wait)this.attributes

 =a;return n},destroy:function(t){t=t?h.clone(t):{};var e=this;var i=t.success;var r=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(s){if(t.wait||e.isNew())r();if(i)i(e,s,t);if(!e.isNew())e.trigger("sync",e,s,t)};if(this.isNew()){t.success();return false}M(this,t);var s=this.sync("delete",this,t);if(!t.wait)r();return s},url:function(){var t=h.result(this,"urlRoot")||h.result(this.collection,"url")||U();if(this.isNew())return t;return t+(t.charAt(t.length-1)==="/"?"":"/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return this.id==null},isValid:function(t){return this._validate({},h.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=h.extend({},this.attributes,t);var i=this.validationError=this.validate(t,e)||null;if(!i)return true;this.trig

ger("invalid",this,i,h.extend(e,{validationError:i}));return false}});var p=["keys","values","pairs","invert","pick","omit"];h.each(p,function(t){d.prototype[t]=function(){var e=s.call(arguments);e.unshift(this.attributes);return h[t].apply(h,e)}});var v=a.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,h.extend({silent:true},e))};var g={add:true,remove:true,merge:true};var m={add:true,remove:false};h.extend(v.prototype,o,{model:d,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return a.sync.apply(this,arguments)},add:function(t,e){return this.set(t,h.extend({merge:false},e,m))},remove:function(t,e){var i=!h.isArray(t);t=i?[t]:h.clone(t);e||(e={});var r,s,n,a;for(r=0,s=t.length;r<s;r++){a=t[r]=this.get(t[r]);if(!

a)continue;delete this._byId[a.id];delete this._byId[a.cid];n=this.indexOf(a);this.models.splice(n,1);this.length--;if(!e.silent){e.index=n;a.trigger("remove",a,this,e)}this._removeReference(a)}return i?t[0]:t},set:function(t,e){e=h.defaults({},e,g);if(e.parse)t=this.parse(t,e);var i=!h.isArray(t);t=i?t?[t]:[]:h.clone(t);var r,s,n,a,o,u,l;var c=e.at;var f=this.model;var p=this.comparator&&c==null&&e.sort!==false;var v=h.isString(this.comparator)?this.comparator:null;var m=[],y=[],_={};var w=e.add,b=e.merge,x=e.remove;var E=!p&&w&&x?[]:false;for(r=0,s=t.length;r<s;r++){o=t[r];if(o instanceof d){n=a=o}else{n=o[f.prototype.idAttribute]}if(u=this.get(n)){if(x)_[u.cid]=true;if(b){o=o===a?a.attributes:o;if(e.parse)o=u.parse(o,e);u.set(o,e);if(p&&!l&&u.hasChanged(v))l=true}t[r]=u}else if(w){a=t[r]=this._prepareModel(o,e);if(!a)continue;m.push(a);a.on("all",this._onModelEvent,this);this._byId[a.cid]=a;if(a.id!=null)this.

 _byId[a.id]=a}if(E)E.push(u||a)}if(x){for(r=0,s=this.length;r<s;++r){if(!_[(a=this.models[r]).cid])y.push(a)}if(y.length)this.remove(y,e)}if(m.length||E&&E.length){if(p)l=true;this.length+=m.length;if(c!=null){for(r=0,s=m.length;r<s;r++){this.models.splice(c+r,0,m[r])}}else{if(E)this.models.length=0;var T=E||m;for(r=0,s=T.length;r<s;r++){this.models.push(T[r])}}}if(l)this.sort({silent:true});if(!e.silent){for(r=0,s=m.length;r<s;r++){(a=m[r]).trigger("add",a,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return i?t[0]:t},reset:function(t,e){e||(e={});for(var i=0,r=this.models.length;i<r;i++){this._removeReference(this.models[i])}e.previousModels=this.models;this._reset();t=this.add(t,h.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,h.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t

 ,e){return this.add(t,h.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return s.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t.id]||this._byId[t.cid]||this._byId[t]},at:function(t){return this.models[t]},where:function(t,e){if(h.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(h.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(h.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return h.invoke(this.models,"get",t)},fetch:function(t){t=t?h.clone(t):{};if(t.parse===void 0)t.parse=t

 rue;var e=t.success;var i=this;t.success=function(r){var s=t.reset?"reset":"set";i[s](r,t);if(e)e(i,r,t);i.trigger("sync",i,r,t)};M(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?h.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var i=this;var r=e.success;e.success=function(t,e,s){if(s.wait)i.add(t,s);if(r)r(t,e,s)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof d){if(!t.collection)t.collection=this;return t}e=e?h.clone(e):{};e.collection=this;var i=new this.model(t,e);if(!i.validationError)return i;this.trigger("invalid",this,i.validationError,e);return false},_removeReference:function(t){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){i

 f((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var y=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf&quo

 t;,"isEmpty","chain"];h.each(y,function(t){v.prototype[t]=function(){var e=s.call(arguments);e.unshift(this.models);return h[t].apply(h,e)}});var _=["groupBy","countBy","sortBy"];h.each(_,function(t){v.prototype[t]=function(e,i){var r=h.isFunction(e)?e:function(t){return t.get(e)};return h[t](this.models,r,i)}});var w=a.View=function(t){this.cid=h.uniqueId("view");t||(t={});h.extend(this,h.pick(t,x));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var b=/^(\S+)\s*(.*)$/;var x=["model","collection","el","id","attributes","className","tagName","events"];h.extend(w.prototype,o,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,e){if(this.$el)this.undelegate

 Events();this.$el=t instanceof a.$?t:a.$(t);this.el=this.$el[0];if(e!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=h.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var i=t[e];if(!h.isFunction(i))i=this[t[e]];if(!i)continue;var r=e.match(b);var s=r[1],n=r[2];i=h.bind(i,this);s+=".delegateEvents"+this.cid;if(n===""){this.$el.on(s,i)}else{this.$el.on(s,n,i)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=h.extend({},h.result(this,"attributes"));if(this.id)t.id=h.result(this,"id");if(this.className)t["class"]=h.result(this,"className");var e=a.$("<"+h.result(this,"tagName")+">").attr(t);this.setElement(e,false)}else{this.setElement(h.result(this,"el"),false)}}});a.sync=function(t,e,i){var r=T[t];h.defaults(i|

 |(i={}),{emulateHTTP:a.emulateHTTP,emulateJSON:a.emulateJSON});var s={type:r,dataType:"json"};if(!i.url){s.url=h.result(e,"url")||U()}if(i.data==null&&e&&(t==="create"||t==="update"||t==="patch")){s.contentType="application/json";s.data=JSON.stringify(i.attrs||e.toJSON(i))}if(i.emulateJSON){s.contentType="application/x-www-form-urlencoded";s.data=s.data?{model:s.data}:{}}if(i.emulateHTTP&&(r==="PUT"||r==="DELETE"||r==="PATCH")){s.type="POST";if(i.emulateJSON)s.data._method=r;var n=i.beforeSend;i.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",r);if(n)return n.apply(this,arguments)}}if(s.type!=="GET"&&!i.emulateJSON){s.processData=false}if(s.type==="PATCH"&&E){s.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var o=i.xhr=a.ajax(h.extend(s,i));e.trigger("reques

 t",e,o,i);return o};var E=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};a.ajax=function(){return a.$.ajax.apply(a.$,arguments)};var k=a.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var $=/(\(\?)?:\w+/g;var H=/\*\w+/g;var A=/[\-{}\[\]+?.,\\\^$|#\s]/g;h.extend(k.prototype,o,{initialize:function(){},route:function(t,e,i){if(!h.isRegExp(t))t=this._routeToRegExp(t);if(h.isFunction(e)){i=e;e=""}if(!i)i=this[e];var r=this;a.history.route(t,function(s){var n=r._extractParameters(t,s);i&&i.apply(r,n);r.trigger.apply(r,["route:"+e].concat(n));r.trigger("route",e,n);a.history.trigger("route",r,e,n)});return this},

 navigate:function(t,e){a.history.navigate(t,e);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=h.result(this,"routes");var t,e=h.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(A,"\\$&").replace(S,"(?:$1)?").replace($,function(t,e){return e?t:"([^/]+)"}).replace(H,"(.*?)");return new RegExp("^"+t+"$")},_extractParameters:function(t,e){var i=t.exec(e).slice(1);return h.map(i,function(t){return t?decodeURIComponent(t):null})}});var I=a.History=function(){this.handlers=[];h.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var N=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/[?#].*$/;I.started=false;h.extend(I.prototype,o,{interval:50,getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:&q

 uot;"},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=this.location.pathname;var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(N,"")},start:function(t){if(I.started)throw new Error("Backbone.history has already been started");I.started=true;this.options=h.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var e=this.getFragment();var i=document.documentMode;var r=P.exec(navigator.userAgent.toLowerCase())&&(!i||i<=7);this.root=("/"+this.root+"/").replace(O,"/");if(r&&this._wantsHashChange){this.iframe=a.$('<iframe src="javascript:0" tabindex="-1" />').hide().ap

 pendTo("body")[0].contentWindow;this.navigate(e)}if(this._hasPushState){a.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!r){a.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=e;var s=this.location;var n=s.pathname.replace(/[^\/]$/,"$&/")===this.root;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!n){this.fragment=this.getFragment(null,true);this.location.replace(this.root+this.location.search+"#"+this.fragment);return true}else if(this._hasPushState&&n&&s.hash){this.fragment=this.getHash().replace(N,"");this.history.replaceState({},document.title,this.root+this.fragment+s.search)}}if(!this.options.silent)return this.loadUrl()},stop:function(){a.$(window).off("popstate",this.checkUr

 l).off("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);I.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return h.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!I.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.i

 frame&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});a.history=new I;var R=function(t,e){var i=this;var r;if(t&&h.has(t,"constructor")){r=t.constructor}else{r=function(){return i.apply(this,arguments)}}h.extend(r,i,e);var s=function(){this.constructor=r};s.prototype=i.prototype;r.prototype=new s;if(t)h.extend(r.prototype,t);r.__super__=i.prototype;return r};d.extend=v.extend=k.extend=w.extend=I.extend=R;var U=function(){throw new Error('A "url" property or function must be specified')};var M=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}}}).call(this);

</del><ins>+(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r)

 {var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return

  true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t|

 |{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this

 .id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},pr

 evious:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this

 .isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.

 validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:fals

 e},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChange

 d(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:functio

 n(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t

 );return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]

 =t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","to

 Array","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","classNam

 e","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,&q

 uot;id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-

 HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._

 routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});

 var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;t

 his._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState)

 {if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callba

 ck(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructo

 r}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});

</ins></span></pre></div>

<a id="trunksrcwpincludesscriptloaderphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (27232 => 27233)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/script-loader.php  2014-02-22 01:58:45 UTC (rev 27232)

+++ trunk/src/wp-includes/script-loader.php     2014-02-22 15:41:50 UTC (rev 27233)

</span><span class="lines">@@ -275,7 +275,7 @@

</span><span class="cx">  $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');

</span><span class="cx"> 

</span><span class="cx">  $scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.6.0', 1 );

</span><del>-       $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.1.0', 1 );

</del><ins>+        $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.1.2', 1 );

</ins><span class="cx"> 

</span><span class="cx">  $scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 );

</span><span class="cx">  did_action( 'init' ) && $scripts->localize( 'wp-util', '_wpUtilSettings', array(

</span></span></pre>

</div>

</div>

</body>

</html>