enmi-conf.org: comparison wp/wp-includes/js/backbone.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/backbone.js

changeset 19	3d72ae0968f4
parent 16	a86126ab1dd4
child 21	48c4eec2b7e6

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
-//     Backbone.js 1.4.0
+//     Backbone.js 1.4.1
-//     (c) 2010-2019 Jeremy Ashkenas and DocumentCloud
+//     (c) 2010-2022 Jeremy Ashkenas and DocumentCloud
 //     Backbone may be freely distributed under the MIT license.
 //     For all details and documentation:
 //     http://backbonejs.org
 (function(factory) {
 // Create a local reference to a common array method we'll want to use later.
 var slice = Array.prototype.slice;
 // Current version of the library. Keep in sync with `package.json`.
-Backbone.VERSION = '1.4.0';
+Backbone.VERSION = '1.4.1';
 // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
 // the `$` variable.
 Backbone.$ = $;
 }
 unset ? delete current[attr] : current[attr] = val;
 }
 // Update the `id`.
-if (this.idAttribute in attrs) this.id = this.get(this.idAttribute);
+if (this.idAttribute in attrs) {
+var prevId = this.id;
+this.id = this.get(this.idAttribute);
+this.trigger('changeId', this, prevId, options);
+}
 // Trigger all relevant attribute changes.
 if (!silent) {
 if (changes.length) this._pending = options;
 for (var i = 0; i < changes.length; i++) {
 // Get a model from the set by id, cid, model object with id or cid
 // properties, or an attributes object that is transformed through modelId.
 get: function(obj) {
 if (obj == null) return void 0;
 return this._byId[obj] ||
-this._byId[this.modelId(this._isModel(obj) ? obj.attributes : obj)] ||
+this._byId[this.modelId(this._isModel(obj) ? obj.attributes : obj, obj.idAttribute)] ||
 obj.cid && this._byId[obj.cid];
 },
 // Returns `true` if the model is in the collection.
 has: function(obj) {
 comparator: this.comparator
 });
 },
 // Define how to uniquely identify models in the collection.
-modelId: function(attrs) {
+modelId: function(attrs, idAttribute) {
-return attrs[this.model.prototype.idAttribute || 'id'];
+return attrs[idAttribute || this.model.prototype.idAttribute || 'id'];
 },
 // Get an iterator of all models in this collection.
 values: function() {
 return new CollectionIterator(this, ITERATOR_VALUES);
 if (!attrs.collection) attrs.collection = this;
 return attrs;
 }
 options = options ? _.clone(options) : {};
 options.collection = this;
-var model = new this.model(attrs, options);
+var model;
+if (this.model.prototype) {
+model = new this.model(attrs, options);
+} else {
+// ES class methods didn't have prototype
+model = this.model(attrs, options);
+}
 if (!model.validationError) return model;
 this.trigger('invalid', this, model.validationError, options);
 return false;
 },
 this.length--;
 // Remove references before triggering 'remove' event to prevent an
 // infinite loop. #3693
 delete this._byId[model.cid];
-var id = this.modelId(model.attributes);
+var id = this.modelId(model.attributes, model.idAttribute);
 if (id != null) delete this._byId[id];
 if (!options.silent) {
 options.index = index;
 model.trigger('remove', model, this, options);
 },
 // Internal method to create a model's ties to a collection.
 _addReference: function(model, options) {
 this._byId[model.cid] = model;
-var id = this.modelId(model.attributes);
+var id = this.modelId(model.attributes, model.idAttribute);
 if (id != null) this._byId[id] = model;
 model.on('all', this._onModelEvent, this);
 },
 // Internal method to sever a model's ties to a collection.
 _removeReference: function(model, options) {
 delete this._byId[model.cid];
-var id = this.modelId(model.attributes);
+var id = this.modelId(model.attributes, model.idAttribute);
 if (id != null) delete this._byId[id];
 if (this === model.collection) delete model.collection;
 model.off('all', this._onModelEvent, this);
 },
 // in other collections are ignored.
 _onModelEvent: function(event, model, collection, options) {
 if (model) {
 if ((event === 'add' || event === 'remove') && collection !== this) return;
 if (event === 'destroy') this.remove(model, options);
-if (event === 'change') {
+if (event === 'changeId') {
-var prevId = this.modelId(model.previousAttributes());
+var prevId = this.modelId(model.previousAttributes(), model.idAttribute);
-var id = this.modelId(model.attributes);
+var id = this.modelId(model.attributes, model.idAttribute);
-if (prevId !== id) {
+if (prevId != null) delete this._byId[prevId];
-if (prevId != null) delete this._byId[prevId];
+if (id != null) this._byId[id] = model;
-if (id != null) this._byId[id] = model;
-}
 }
 }
 this.trigger.apply(this, arguments);
 }
 // Construct a value depending on what kind of values should be iterated.
 var value;
 if (this._kind === ITERATOR_VALUES) {
 value = model;
 } else {
-var id = this._collection.modelId(model.attributes);
+var id = this._collection.modelId(model.attributes, model.idAttribute);
 if (this._kind === ITERATOR_KEYS) {
 value = id;
 } else { // ITERATOR_KEYSVALUES
 value = [id, model];
 }
 return xhr;
 };
 // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
 var methodMap = {
-create: 'POST',
+'create': 'POST',
-update: 'PUT',
+'update': 'PUT',
-patch: 'PATCH',
+'patch': 'PATCH',
-delete: 'DELETE',
+'delete': 'DELETE',
-read: 'GET'
+'read': 'GET'
 };
 // Set the default implementation of `Backbone.ajax` to proxy through to `$`.
 // Override this if you'd like to use a different library.
 Backbone.ajax = function() {
 // Convert a route string into a regular expression, suitable for matching
 // against the current location hash.
 _routeToRegExp: function(route) {
 route = route.replace(escapeRegExp, '\\$&')
 .replace(optionalParam, '(?:$1)?')
 .replace(namedParam, function(match, optional) {
 return optional ? match : '([^/?]+)';
 })
 .replace(splatParam, '([^?]*?)');
 return new RegExp('^' + route + '(?:\\?([\\s\\S]*))?$');
 },
 // Given a route, and a URL fragment that it matches, return the array of
 // extracted decoded parameters. Empty or unmatched parameters will be

enmi-conf.org