mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
Bug 1258865 - Land version 1.2.2 of the Loop system add-on in mozilla-central - vendor updates. rs=Standard8 for already reviewed code.
--HG-- extra : commitid : 2AdEXTDbIYr
This commit is contained in:
Mark Banner
parent
2e820206dc
commit
4f90d1c0a4
@ -1,6 +1,6 @@
|
||||
// Backbone.js 1.2.1
|
||||
// Backbone.js 1.3.2
|
||||
|
||||
// (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
|
||||
// (c) 2010-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
|
||||
// Backbone may be freely distributed under the MIT license.
|
||||
// For all details and documentation:
|
||||
// http://backbonejs.org
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
// Establish the root object, `window` (`self`) in the browser, or `global` on the server.
|
||||
// We use `self` instead of `window` for `WebWorker` support.
|
||||
var root = (typeof self == 'object' && self.self == self && self) ||
|
||||
(typeof global == 'object' && global.global == global && global);
|
||||
var root = (typeof self == 'object' && self.self === self && self) ||
|
||||
(typeof global == 'object' && global.global === global && global);
|
||||
|
||||
// Set up Backbone appropriately for the environment. Start with AMD.
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
@ -23,7 +23,7 @@
|
||||
// Next for Node.js or CommonJS. jQuery may not be needed as a module.
|
||||
} else if (typeof exports !== 'undefined') {
|
||||
var _ = require('underscore'), $;
|
||||
try { $ = require('jquery'); } catch(e) {}
|
||||
try { $ = require('jquery'); } catch (e) {}
|
||||
factory(root, exports, _, $);
|
||||
|
||||
// Finally, as a browser global.
|
||||
@ -31,7 +31,7 @@
|
||||
root.Backbone = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender || root.$));
|
||||
}
|
||||
|
||||
}(function(root, Backbone, _, $) {
|
||||
})(function(root, Backbone, _, $) {
|
||||
|
||||
// Initial Setup
|
||||
// -------------
|
||||
@ -41,10 +41,10 @@
|
||||
var previousBackbone = root.Backbone;
|
||||
|
||||
// Create a local reference to a common array method we'll want to use later.
|
||||
var slice = [].slice;
|
||||
var slice = Array.prototype.slice;
|
||||
|
||||
// Current version of the library. Keep in sync with `package.json`.
|
||||
Backbone.VERSION = '1.2.1';
|
||||
Backbone.VERSION = '1.3.2';
|
||||
|
||||
// For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
|
||||
// the `$` variable.
|
||||
@ -68,8 +68,13 @@
|
||||
// form param named `model`.
|
||||
Backbone.emulateJSON = false;
|
||||
|
||||
// Proxy Underscore methods to a Backbone class' prototype using a
|
||||
// particular attribute as the data argument
|
||||
// Proxy Backbone class methods to Underscore functions, wrapping the model's
|
||||
// `attributes` object or collection's `models` array behind the scenes.
|
||||
//
|
||||
// collection.filter(function(model) { return model.get('age') > 10 });
|
||||
// collection.each(this.addView);
|
||||
//
|
||||
// `Function#apply` can be slow so we use the method's arg count, if we know it.
|
||||
var addMethod = function(length, method, attribute) {
|
||||
switch (length) {
|
||||
case 1: return function() {
|
||||
@ -79,10 +84,10 @@
|
||||
return _[method](this[attribute], value);
|
||||
};
|
||||
case 3: return function(iteratee, context) {
|
||||
return _[method](this[attribute], iteratee, context);
|
||||
return _[method](this[attribute], cb(iteratee, this), context);
|
||||
};
|
||||
case 4: return function(iteratee, defaultVal, context) {
|
||||
return _[method](this[attribute], iteratee, defaultVal, context);
|
||||
return _[method](this[attribute], cb(iteratee, this), defaultVal, context);
|
||||
};
|
||||
default: return function() {
|
||||
var args = slice.call(arguments);
|
||||
@ -97,12 +102,26 @@
|
||||
});
|
||||
};
|
||||
|
||||
// Support `collection.sortBy('attr')` and `collection.findWhere({id: 1})`.
|
||||
var cb = function(iteratee, instance) {
|
||||
if (_.isFunction(iteratee)) return iteratee;
|
||||
if (_.isObject(iteratee) && !instance._isModel(iteratee)) return modelMatcher(iteratee);
|
||||
if (_.isString(iteratee)) return function(model) { return model.get(iteratee); };
|
||||
return iteratee;
|
||||
};
|
||||
var modelMatcher = function(attrs) {
|
||||
var matcher = _.matches(attrs);
|
||||
return function(model) {
|
||||
return matcher(model.attributes);
|
||||
};
|
||||
};
|
||||
|
||||
// Backbone.Events
|
||||
// ---------------
|
||||
|
||||
// A module that can be mixed in to *any object* in order to provide it with
|
||||
// custom events. You may bind with `on` or remove with `off` callback
|
||||
// functions to an event; `trigger`-ing an event fires all callbacks in
|
||||
// a custom event channel. You may bind a callback to an event with `on` or
|
||||
// remove with `off`; `trigger`-ing an event fires all callbacks in
|
||||
// succession.
|
||||
//
|
||||
// var object = {};
|
||||
@ -117,26 +136,25 @@
|
||||
|
||||
// Iterates over the standard `event, callback` (as well as the fancy multiple
|
||||
// space-separated events `"change blur", callback` and jQuery-style event
|
||||
// maps `{event: callback}`), reducing them by manipulating `memo`.
|
||||
// Passes a normalized single event name and callback, as well as any
|
||||
// optional `opts`.
|
||||
var eventsApi = function(iteratee, memo, name, callback, opts) {
|
||||
// maps `{event: callback}`).
|
||||
var eventsApi = function(iteratee, events, name, callback, opts) {
|
||||
var i = 0, names;
|
||||
if (name && typeof name === 'object') {
|
||||
// Handle event maps.
|
||||
if (callback !== void 0 && 'context' in opts && opts.context === void 0) opts.context = callback;
|
||||
for (names = _.keys(name); i < names.length ; i++) {
|
||||
memo = iteratee(memo, names[i], name[names[i]], opts);
|
||||
events = eventsApi(iteratee, events, names[i], name[names[i]], opts);
|
||||
}
|
||||
} else if (name && eventSplitter.test(name)) {
|
||||
// Handle space separated event names.
|
||||
// Handle space-separated event names by delegating them individually.
|
||||
for (names = name.split(eventSplitter); i < names.length; i++) {
|
||||
memo = iteratee(memo, names[i], callback, opts);
|
||||
events = iteratee(events, names[i], callback, opts);
|
||||
}
|
||||
} else {
|
||||
memo = iteratee(memo, name, callback, opts);
|
||||
// Finally, standard events.
|
||||
events = iteratee(events, name, callback, opts);
|
||||
}
|
||||
return memo;
|
||||
return events;
|
||||
};
|
||||
|
||||
// Bind an event to a `callback` function. Passing `"all"` will bind
|
||||
@ -145,13 +163,12 @@
|
||||
return internalOn(this, name, callback, context);
|
||||
};
|
||||
|
||||
// An internal use `on` function, used to guard the `listening` argument from
|
||||
// the public API.
|
||||
// Guard the `listening` argument from the public API.
|
||||
var internalOn = function(obj, name, callback, context, listening) {
|
||||
obj._events = eventsApi(onApi, obj._events || {}, name, callback, {
|
||||
context: context,
|
||||
ctx: obj,
|
||||
listening: listening
|
||||
context: context,
|
||||
ctx: obj,
|
||||
listening: listening
|
||||
});
|
||||
|
||||
if (listening) {
|
||||
@ -163,8 +180,9 @@
|
||||
};
|
||||
|
||||
// Inversion-of-control versions of `on`. Tell *this* object to listen to
|
||||
// an event in another object... keeping track of what it's listening to.
|
||||
Events.listenTo = function(obj, name, callback) {
|
||||
// an event in another object... keeping track of what it's listening to
|
||||
// for easier unbinding later.
|
||||
Events.listenTo = function(obj, name, callback) {
|
||||
if (!obj) return this;
|
||||
var id = obj._listenId || (obj._listenId = _.uniqueId('l'));
|
||||
var listeningTo = this._listeningTo || (this._listeningTo = {});
|
||||
@ -189,7 +207,7 @@
|
||||
var context = options.context, ctx = options.ctx, listening = options.listening;
|
||||
if (listening) listening.count++;
|
||||
|
||||
handlers.push({ callback: callback, context: context, ctx: context || ctx, listening: listening });
|
||||
handlers.push({callback: callback, context: context, ctx: context || ctx, listening: listening});
|
||||
}
|
||||
return events;
|
||||
};
|
||||
@ -198,18 +216,18 @@
|
||||
// callbacks with that function. If `callback` is null, removes all
|
||||
// callbacks for the event. If `name` is null, removes all bound
|
||||
// callbacks for all events.
|
||||
Events.off = function(name, callback, context) {
|
||||
Events.off = function(name, callback, context) {
|
||||
if (!this._events) return this;
|
||||
this._events = eventsApi(offApi, this._events, name, callback, {
|
||||
context: context,
|
||||
listeners: this._listeners
|
||||
context: context,
|
||||
listeners: this._listeners
|
||||
});
|
||||
return this;
|
||||
};
|
||||
|
||||
// Tell this object to stop listening to either specific events ... or
|
||||
// to every object it's currently listening to.
|
||||
Events.stopListening = function(obj, name, callback) {
|
||||
Events.stopListening = function(obj, name, callback) {
|
||||
var listeningTo = this._listeningTo;
|
||||
if (!listeningTo) return this;
|
||||
|
||||
@ -224,14 +242,12 @@
|
||||
|
||||
listening.obj.off(name, callback, this);
|
||||
}
|
||||
if (_.isEmpty(listeningTo)) this._listeningTo = void 0;
|
||||
|
||||
return this;
|
||||
};
|
||||
|
||||
// The reducing API that removes a callback from the `events` object.
|
||||
var offApi = function(events, name, callback, options) {
|
||||
// No events to consider.
|
||||
if (!events) return;
|
||||
|
||||
var i = 0, listening;
|
||||
@ -282,21 +298,22 @@
|
||||
delete events[name];
|
||||
}
|
||||
}
|
||||
if (_.size(events)) return events;
|
||||
return events;
|
||||
};
|
||||
|
||||
// Bind an event to only be triggered a single time. After the first time
|
||||
// the callback is invoked, it will be removed. When multiple events are
|
||||
// passed in using the space-separated syntax, the event will fire once for every
|
||||
// event you passed in, not once for a combination of all events
|
||||
Events.once = function(name, callback, context) {
|
||||
// the callback is invoked, its listener will be removed. If multiple events
|
||||
// are passed in using the space-separated syntax, the handler will fire
|
||||
// once for each event, not once for a combination of all events.
|
||||
Events.once = function(name, callback, context) {
|
||||
// Map the event into a `{event: once}` object.
|
||||
var events = eventsApi(onceMap, {}, name, callback, _.bind(this.off, this));
|
||||
return this.on(events, void 0, context);
|
||||
if (typeof name === 'string' && context == null) callback = void 0;
|
||||
return this.on(events, callback, context);
|
||||
};
|
||||
|
||||
// Inversion-of-control versions of `once`.
|
||||
Events.listenToOnce = function(obj, name, callback) {
|
||||
Events.listenToOnce = function(obj, name, callback) {
|
||||
// Map the event into a `{event: once}` object.
|
||||
var events = eventsApi(onceMap, {}, name, callback, _.bind(this.stopListening, this, obj));
|
||||
return this.listenTo(obj, events);
|
||||
@ -319,7 +336,7 @@
|
||||
// passed the same arguments as `trigger` is, apart from the event name
|
||||
// (unless you're listening on `"all"`, which will cause your callback to
|
||||
// receive the true name of the event as the first argument).
|
||||
Events.trigger = function(name) {
|
||||
Events.trigger = function(name) {
|
||||
if (!this._events) return this;
|
||||
|
||||
var length = Math.max(0, arguments.length - 1);
|
||||
@ -331,7 +348,7 @@
|
||||
};
|
||||
|
||||
// Handles triggering the appropriate event callbacks.
|
||||
var triggerApi = function(objEvents, name, cb, args) {
|
||||
var triggerApi = function(objEvents, name, callback, args) {
|
||||
if (objEvents) {
|
||||
var events = objEvents[name];
|
||||
var allEvents = objEvents.all;
|
||||
@ -381,7 +398,8 @@
|
||||
this.attributes = {};
|
||||
if (options.collection) this.collection = options.collection;
|
||||
if (options.parse) attrs = this.parse(attrs, options) || {};
|
||||
attrs = _.defaults({}, attrs, _.result(this, 'defaults'));
|
||||
var defaults = _.result(this, 'defaults');
|
||||
attrs = _.defaults(_.extend({}, defaults, attrs), defaults);
|
||||
this.set(attrs, options);
|
||||
this.changed = {};
|
||||
this.initialize.apply(this, arguments);
|
||||
@ -476,9 +494,6 @@
|
||||
var changed = this.changed;
|
||||
var prev = this._previousAttributes;
|
||||
|
||||
// Check for changes of `id`.
|
||||
if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
|
||||
|
||||
// For each `set` attribute, update or delete the current value.
|
||||
for (var attr in attrs) {
|
||||
val = attrs[attr];
|
||||
@ -491,6 +506,9 @@
|
||||
unset ? delete current[attr] : current[attr] = val;
|
||||
}
|
||||
|
||||
// Update the `id`.
|
||||
if (this.idAttribute in attrs) this.id = this.get(this.idAttribute);
|
||||
|
||||
// Trigger all relevant attribute changes.
|
||||
if (!silent) {
|
||||
if (changes.length) this._pending = options;
|
||||
@ -602,8 +620,8 @@
|
||||
// the model will be valid when the attributes, if any, are set.
|
||||
if (attrs && !wait) {
|
||||
if (!this.set(attrs, options)) return false;
|
||||
} else {
|
||||
if (!this._validate(attrs, options)) return false;
|
||||
} else if (!this._validate(attrs, options)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// After a successful server-side save, the client is (optionally)
|
||||
@ -697,7 +715,7 @@
|
||||
|
||||
// Check if the model is currently in a valid state.
|
||||
isValid: function(options) {
|
||||
return this._validate({}, _.defaults({validate: true}, options));
|
||||
return this._validate({}, _.extend({}, options, {validate: true}));
|
||||
},
|
||||
|
||||
// Run validation against the next complete set of model attributes,
|
||||
@ -713,9 +731,10 @@
|
||||
|
||||
});
|
||||
|
||||
// Underscore methods that we want to implement on the Model.
|
||||
var modelMethods = { keys: 1, values: 1, pairs: 1, invert: 1, pick: 0,
|
||||
omit: 0, chain: 1, isEmpty: 1 };
|
||||
// Underscore methods that we want to implement on the Model, mapped to the
|
||||
// number of arguments they take.
|
||||
var modelMethods = {keys: 1, values: 1, pairs: 1, invert: 1, pick: 0,
|
||||
omit: 0, chain: 1, isEmpty: 1};
|
||||
|
||||
// Mix in each Underscore method as a proxy to `Model#attributes`.
|
||||
addUnderscoreMethods(Model, modelMethods, 'attributes');
|
||||
@ -746,6 +765,17 @@
|
||||
var setOptions = {add: true, remove: true, merge: true};
|
||||
var addOptions = {add: true, remove: false};
|
||||
|
||||
// Splices `insert` into `array` at index `at`.
|
||||
var splice = function(array, insert, at) {
|
||||
at = Math.min(Math.max(at, 0), array.length);
|
||||
var tail = Array(array.length - at);
|
||||
var length = insert.length;
|
||||
var i;
|
||||
for (i = 0; i < tail.length; i++) tail[i] = array[i + at];
|
||||
for (i = 0; i < length; i++) array[i + at] = insert[i];
|
||||
for (i = 0; i < tail.length; i++) array[i + length + at] = tail[i];
|
||||
};
|
||||
|
||||
// Define the Collection's inheritable methods.
|
||||
_.extend(Collection.prototype, Events, {
|
||||
|
||||
@ -768,7 +798,9 @@
|
||||
return Backbone.sync.apply(this, arguments);
|
||||
},
|
||||
|
||||
// Add a model, or list of models to the set.
|
||||
// Add a model, or list of models to the set. `models` may be Backbone
|
||||
// Models or raw JavaScript objects to be converted to Models, or any
|
||||
// combination of the two.
|
||||
add: function(models, options) {
|
||||
return this.set(models, _.extend({merge: false}, options, addOptions));
|
||||
},
|
||||
@ -777,9 +809,12 @@
|
||||
remove: function(models, options) {
|
||||
options = _.extend({}, options);
|
||||
var singular = !_.isArray(models);
|
||||
models = singular ? [models] : _.clone(models);
|
||||
models = singular ? [models] : models.slice();
|
||||
var removed = this._removeModels(models, options);
|
||||
if (!options.silent && removed) this.trigger('update', this, options);
|
||||
if (!options.silent && removed.length) {
|
||||
options.changes = {added: [], merged: [], removed: removed};
|
||||
this.trigger('update', this, options);
|
||||
}
|
||||
return singular ? removed[0] : removed;
|
||||
},
|
||||
|
||||
@ -788,97 +823,114 @@
|
||||
// already exist in the collection, as necessary. Similar to **Model#set**,
|
||||
// the core operation for updating the data contained by the collection.
|
||||
set: function(models, options) {
|
||||
options = _.defaults({}, options, setOptions);
|
||||
if (options.parse && !this._isModel(models)) models = this.parse(models, options);
|
||||
if (models == null) return;
|
||||
|
||||
options = _.extend({}, setOptions, options);
|
||||
if (options.parse && !this._isModel(models)) {
|
||||
models = this.parse(models, options) || [];
|
||||
}
|
||||
|
||||
var singular = !_.isArray(models);
|
||||
models = singular ? (models ? [models] : []) : models.slice();
|
||||
var id, model, attrs, existing, sort;
|
||||
models = singular ? [models] : models.slice();
|
||||
|
||||
var at = options.at;
|
||||
if (at != null) at = +at;
|
||||
if (at > this.length) at = this.length;
|
||||
if (at < 0) at += this.length + 1;
|
||||
var sortable = this.comparator && (at == null) && options.sort !== false;
|
||||
|
||||
var set = [];
|
||||
var toAdd = [];
|
||||
var toMerge = [];
|
||||
var toRemove = [];
|
||||
var modelMap = {};
|
||||
|
||||
var add = options.add;
|
||||
var merge = options.merge;
|
||||
var remove = options.remove;
|
||||
|
||||
var sort = false;
|
||||
var sortable = this.comparator && at == null && options.sort !== false;
|
||||
var sortAttr = _.isString(this.comparator) ? this.comparator : null;
|
||||
var toAdd = [], toRemove = [], modelMap = {};
|
||||
var add = options.add, merge = options.merge, remove = options.remove;
|
||||
var order = !sortable && add && remove ? [] : false;
|
||||
var orderChanged = false;
|
||||
|
||||
// Turn bare objects into model references, and prevent invalid models
|
||||
// from being added.
|
||||
for (var i = 0; i < models.length; i++) {
|
||||
attrs = models[i];
|
||||
var model, i;
|
||||
for (i = 0; i < models.length; i++) {
|
||||
model = models[i];
|
||||
|
||||
// If a duplicate is found, prevent it from being added and
|
||||
// optionally merge it into the existing model.
|
||||
if (existing = this.get(attrs)) {
|
||||
if (remove) modelMap[existing.cid] = true;
|
||||
if (merge && attrs !== existing) {
|
||||
attrs = this._isModel(attrs) ? attrs.attributes : attrs;
|
||||
var existing = this.get(model);
|
||||
if (existing) {
|
||||
if (merge && model !== existing) {
|
||||
var attrs = this._isModel(model) ? model.attributes : model;
|
||||
if (options.parse) attrs = existing.parse(attrs, options);
|
||||
existing.set(attrs, options);
|
||||
if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true;
|
||||
toMerge.push(existing);
|
||||
if (sortable && !sort) sort = existing.hasChanged(sortAttr);
|
||||
}
|
||||
if (!modelMap[existing.cid]) {
|
||||
modelMap[existing.cid] = true;
|
||||
set.push(existing);
|
||||
}
|
||||
models[i] = existing;
|
||||
|
||||
// If this is a new, valid model, push it to the `toAdd` list.
|
||||
} else if (add) {
|
||||
model = models[i] = this._prepareModel(attrs, options);
|
||||
if (!model) continue;
|
||||
toAdd.push(model);
|
||||
this._addReference(model, options);
|
||||
model = models[i] = this._prepareModel(model, options);
|
||||
if (model) {
|
||||
toAdd.push(model);
|
||||
this._addReference(model, options);
|
||||
modelMap[model.cid] = true;
|
||||
set.push(model);
|
||||
}
|
||||
}
|
||||
|
||||
// Do not add multiple models with the same `id`.
|
||||
model = existing || model;
|
||||
if (!model) continue;
|
||||
id = this.modelId(model.attributes);
|
||||
if (order && (model.isNew() || !modelMap[id])) {
|
||||
order.push(model);
|
||||
|
||||
// Check to see if this is actually a new model at this index.
|
||||
orderChanged = orderChanged || !this.models[i] || model.cid !== this.models[i].cid;
|
||||
}
|
||||
|
||||
modelMap[id] = true;
|
||||
}
|
||||
|
||||
// Remove nonexistent models if appropriate.
|
||||
// Remove stale models.
|
||||
if (remove) {
|
||||
for (var i = 0; i < this.length; i++) {
|
||||
if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model);
|
||||
for (i = 0; i < this.length; i++) {
|
||||
model = this.models[i];
|
||||
if (!modelMap[model.cid]) toRemove.push(model);
|
||||
}
|
||||
if (toRemove.length) this._removeModels(toRemove, options);
|
||||
}
|
||||
|
||||
// See if sorting is needed, update `length` and splice in new models.
|
||||
if (toAdd.length || orderChanged) {
|
||||
var orderChanged = false;
|
||||
var replace = !sortable && add && remove;
|
||||
if (set.length && replace) {
|
||||
orderChanged = this.length !== set.length || _.some(this.models, function(m, index) {
|
||||
return m !== set[index];
|
||||
});
|
||||
this.models.length = 0;
|
||||
splice(this.models, set, 0);
|
||||
this.length = this.models.length;
|
||||
} else if (toAdd.length) {
|
||||
if (sortable) sort = true;
|
||||
this.length += toAdd.length;
|
||||
if (at != null) {
|
||||
for (var i = 0; i < toAdd.length; i++) {
|
||||
this.models.splice(at + i, 0, toAdd[i]);
|
||||
}
|
||||
} else {
|
||||
if (order) this.models.length = 0;
|
||||
var orderedModels = order || toAdd;
|
||||
for (var i = 0; i < orderedModels.length; i++) {
|
||||
this.models.push(orderedModels[i]);
|
||||
}
|
||||
}
|
||||
splice(this.models, toAdd, at == null ? this.length : at);
|
||||
this.length = this.models.length;
|
||||
}
|
||||
|
||||
// Silently sort the collection if appropriate.
|
||||
if (sort) this.sort({silent: true});
|
||||
|
||||
// Unless silenced, it's time to fire all appropriate add/sort events.
|
||||
// Unless silenced, it's time to fire all appropriate add/sort/update events.
|
||||
if (!options.silent) {
|
||||
var addOpts = at != null ? _.clone(options) : options;
|
||||
for (var i = 0; i < toAdd.length; i++) {
|
||||
if (at != null) addOpts.index = at + i;
|
||||
(model = toAdd[i]).trigger('add', model, this, addOpts);
|
||||
for (i = 0; i < toAdd.length; i++) {
|
||||
if (at != null) options.index = at + i;
|
||||
model = toAdd[i];
|
||||
model.trigger('add', model, this, options);
|
||||
}
|
||||
if (sort || orderChanged) this.trigger('sort', this, options);
|
||||
if (toAdd.length || toRemove.length) this.trigger('update', this, options);
|
||||
if (toAdd.length || toRemove.length || toMerge.length) {
|
||||
options.changes = {
|
||||
added: toAdd,
|
||||
removed: toRemove,
|
||||
merged: toMerge
|
||||
};
|
||||
this.trigger('update', this, options);
|
||||
}
|
||||
}
|
||||
|
||||
// Return the added (or merged) model (or models).
|
||||
@ -928,11 +980,18 @@
|
||||
return slice.apply(this.models, arguments);
|
||||
},
|
||||
|
||||
// Get a model from the set by id.
|
||||
// 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;
|
||||
var id = this.modelId(this._isModel(obj) ? obj.attributes : obj);
|
||||
return this._byId[obj] || this._byId[id] || this._byId[obj.cid];
|
||||
return this._byId[obj] ||
|
||||
this._byId[this.modelId(obj.attributes || obj)] ||
|
||||
obj.cid && this._byId[obj.cid];
|
||||
},
|
||||
|
||||
// Returns `true` if the model is in the collection.
|
||||
has: function(obj) {
|
||||
return this.get(obj) != null;
|
||||
},
|
||||
|
||||
// Get the model at the given index.
|
||||
@ -944,10 +1003,7 @@
|
||||
// Return models with matching attributes. Useful for simple cases of
|
||||
// `filter`.
|
||||
where: function(attrs, first) {
|
||||
var matches = _.matches(attrs);
|
||||
return this[first ? 'find' : 'filter'](function(model) {
|
||||
return matches(model.attributes);
|
||||
});
|
||||
return this[first ? 'find' : 'filter'](attrs);
|
||||
},
|
||||
|
||||
// Return the first model with matching attributes. Useful for simple cases
|
||||
@ -960,23 +1016,26 @@
|
||||
// normal circumstances, as the set will maintain sort order as each item
|
||||
// is added.
|
||||
sort: function(options) {
|
||||
if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
|
||||
var comparator = this.comparator;
|
||||
if (!comparator) throw new Error('Cannot sort a set without a comparator');
|
||||
options || (options = {});
|
||||
|
||||
// Run sort based on type of `comparator`.
|
||||
if (_.isString(this.comparator) || this.comparator.length === 1) {
|
||||
this.models = this.sortBy(this.comparator, this);
|
||||
} else {
|
||||
this.models.sort(_.bind(this.comparator, this));
|
||||
}
|
||||
var length = comparator.length;
|
||||
if (_.isFunction(comparator)) comparator = _.bind(comparator, this);
|
||||
|
||||
// Run sort based on type of `comparator`.
|
||||
if (length === 1 || _.isString(comparator)) {
|
||||
this.models = this.sortBy(comparator);
|
||||
} else {
|
||||
this.models.sort(comparator);
|
||||
}
|
||||
if (!options.silent) this.trigger('sort', this, options);
|
||||
return this;
|
||||
},
|
||||
|
||||
// Pluck an attribute from each model in the collection.
|
||||
pluck: function(attr) {
|
||||
return _.invoke(this.models, 'get', attr);
|
||||
return this.map(attr + '');
|
||||
},
|
||||
|
||||
// Fetch the default set of models for this collection, resetting the
|
||||
@ -1007,9 +1066,9 @@
|
||||
if (!wait) this.add(model, options);
|
||||
var collection = this;
|
||||
var success = options.success;
|
||||
options.success = function(model, resp, callbackOpts) {
|
||||
if (wait) collection.add(model, callbackOpts);
|
||||
if (success) success.call(callbackOpts.context, model, resp, callbackOpts);
|
||||
options.success = function(m, resp, callbackOpts) {
|
||||
if (wait) collection.add(m, callbackOpts);
|
||||
if (success) success.call(callbackOpts.context, m, resp, callbackOpts);
|
||||
};
|
||||
model.save(null, options);
|
||||
return model;
|
||||
@ -1030,7 +1089,7 @@
|
||||
},
|
||||
|
||||
// Define how to uniquely identify models in the collection.
|
||||
modelId: function (attrs) {
|
||||
modelId: function(attrs) {
|
||||
return attrs[this.model.prototype.idAttribute || 'id'];
|
||||
},
|
||||
|
||||
@ -1058,7 +1117,6 @@
|
||||
},
|
||||
|
||||
// Internal method called by both remove and set.
|
||||
// Returns removed models, or false if nothing is removed.
|
||||
_removeModels: function(models, options) {
|
||||
var removed = [];
|
||||
for (var i = 0; i < models.length; i++) {
|
||||
@ -1069,6 +1127,12 @@
|
||||
this.models.splice(index, 1);
|
||||
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);
|
||||
if (id != null) delete this._byId[id];
|
||||
|
||||
if (!options.silent) {
|
||||
options.index = index;
|
||||
model.trigger('remove', model, this, options);
|
||||
@ -1077,12 +1141,12 @@
|
||||
removed.push(model);
|
||||
this._removeReference(model, options);
|
||||
}
|
||||
return removed.length ? removed : false;
|
||||
return removed;
|
||||
},
|
||||
|
||||
// Method for checking whether an object should be considered a model for
|
||||
// the purposes of adding to the collection.
|
||||
_isModel: function (model) {
|
||||
_isModel: function(model) {
|
||||
return model instanceof Model;
|
||||
},
|
||||
|
||||
@ -1108,14 +1172,16 @@
|
||||
// events simply proxy through. "add" and "remove" events that originate
|
||||
// in other collections are ignored.
|
||||
_onModelEvent: function(event, model, collection, options) {
|
||||
if ((event === 'add' || event === 'remove') && collection !== this) return;
|
||||
if (event === 'destroy') this.remove(model, options);
|
||||
if (event === 'change') {
|
||||
var prevId = this.modelId(model.previousAttributes());
|
||||
var id = this.modelId(model.attributes);
|
||||
if (prevId !== id) {
|
||||
if (prevId != null) delete this._byId[prevId];
|
||||
if (id != null) this._byId[id] = model;
|
||||
if (model) {
|
||||
if ((event === 'add' || event === 'remove') && collection !== this) return;
|
||||
if (event === 'destroy') this.remove(model, options);
|
||||
if (event === 'change') {
|
||||
var prevId = this.modelId(model.previousAttributes());
|
||||
var id = this.modelId(model.attributes);
|
||||
if (prevId !== id) {
|
||||
if (prevId != null) delete this._byId[prevId];
|
||||
if (id != null) this._byId[id] = model;
|
||||
}
|
||||
}
|
||||
}
|
||||
this.trigger.apply(this, arguments);
|
||||
@ -1126,31 +1192,18 @@
|
||||
// Underscore methods that we want to implement on the Collection.
|
||||
// 90% of the core usefulness of Backbone Collections is actually implemented
|
||||
// right here:
|
||||
var collectionMethods = { forEach: 3, each: 3, map: 3, collect: 3, reduce: 4,
|
||||
foldl: 4, inject: 4, reduceRight: 4, foldr: 4, find: 3, detect: 3, filter: 3,
|
||||
select: 3, reject: 3, every: 3, all: 3, some: 3, any: 3, include: 2,
|
||||
contains: 2, invoke: 0, max: 3, min: 3, toArray: 1, size: 1, first: 3,
|
||||
var collectionMethods = {forEach: 3, each: 3, map: 3, collect: 3, reduce: 0,
|
||||
foldl: 0, inject: 0, reduceRight: 0, foldr: 0, find: 3, detect: 3, filter: 3,
|
||||
select: 3, reject: 3, every: 3, all: 3, some: 3, any: 3, include: 3, includes: 3,
|
||||
contains: 3, invoke: 0, max: 3, min: 3, toArray: 1, size: 1, first: 3,
|
||||
head: 3, take: 3, initial: 3, rest: 3, tail: 3, drop: 3, last: 3,
|
||||
without: 0, difference: 0, indexOf: 3, shuffle: 1, lastIndexOf: 3,
|
||||
isEmpty: 1, chain: 1, sample: 3, partition: 3 };
|
||||
isEmpty: 1, chain: 1, sample: 3, partition: 3, groupBy: 3, countBy: 3,
|
||||
sortBy: 3, indexBy: 3, findIndex: 3, findLastIndex: 3};
|
||||
|
||||
// Mix in each Underscore method as a proxy to `Collection#models`.
|
||||
addUnderscoreMethods(Collection, collectionMethods, 'models');
|
||||
|
||||
// Underscore methods that take a property name as an argument.
|
||||
var attributeMethods = ['groupBy', 'countBy', 'sortBy', 'indexBy'];
|
||||
|
||||
// Use attributes instead of properties.
|
||||
_.each(attributeMethods, function(method) {
|
||||
if (!_[method]) return;
|
||||
Collection.prototype[method] = function(value, context) {
|
||||
var iterator = _.isFunction(value) ? value : function(model) {
|
||||
return model.get(value);
|
||||
};
|
||||
return _[method](this.models, iterator, context);
|
||||
};
|
||||
});
|
||||
|
||||
// Backbone.View
|
||||
// -------------
|
||||
|
||||
@ -1174,7 +1227,7 @@
|
||||
// Cached regex to split keys for `delegate`.
|
||||
var delegateEventSplitter = /^(\S+)\s*(.*)$/;
|
||||
|
||||
// List of view options to be merged as properties.
|
||||
// List of view options to be set as properties.
|
||||
var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events'];
|
||||
|
||||
// Set up all inheritable **Backbone.View** properties and methods.
|
||||
@ -1396,9 +1449,9 @@
|
||||
var methodMap = {
|
||||
'create': 'POST',
|
||||
'update': 'PUT',
|
||||
'patch': 'PATCH',
|
||||
'patch': 'PATCH',
|
||||
'delete': 'DELETE',
|
||||
'read': 'GET'
|
||||
'read': 'GET'
|
||||
};
|
||||
|
||||
// Set the default implementation of `Backbone.ajax` to proxy through to `$`.
|
||||
@ -1518,7 +1571,7 @@
|
||||
// falls back to polling.
|
||||
var History = Backbone.History = function() {
|
||||
this.handlers = [];
|
||||
_.bindAll(this, 'checkUrl');
|
||||
this.checkUrl = _.bind(this.checkUrl, this);
|
||||
|
||||
// Ensure that `History` can be used outside of the browser.
|
||||
if (typeof window !== 'undefined') {
|
||||
@ -1555,8 +1608,8 @@
|
||||
// Does the pathname match the root?
|
||||
matchRoot: function() {
|
||||
var path = this.decodeFragment(this.location.pathname);
|
||||
var root = path.slice(0, this.root.length - 1) + '/';
|
||||
return root === this.root;
|
||||
var rootPath = path.slice(0, this.root.length - 1) + '/';
|
||||
return rootPath === this.root;
|
||||
},
|
||||
|
||||
// Unicode characters in `location.pathname` are percent encoded so they're
|
||||
@ -1611,7 +1664,7 @@
|
||||
this.options = _.extend({root: '/'}, this.options, options);
|
||||
this.root = this.options.root;
|
||||
this._wantsHashChange = this.options.hashChange !== false;
|
||||
this._hasHashChange = 'onhashchange' in window;
|
||||
this._hasHashChange = 'onhashchange' in window && (document.documentMode === void 0 || document.documentMode > 7);
|
||||
this._useHashChange = this._wantsHashChange && this._hasHashChange;
|
||||
this._wantsPushState = !!this.options.pushState;
|
||||
this._hasPushState = !!(this.history && this.history.pushState);
|
||||
@ -1628,8 +1681,8 @@
|
||||
// If we've started off with a route from a `pushState`-enabled
|
||||
// browser, but we're currently in a browser that doesn't support it...
|
||||
if (!this._hasPushState && !this.atRoot()) {
|
||||
var root = this.root.slice(0, -1) || '/';
|
||||
this.location.replace(root + '#' + this.getPath());
|
||||
var rootPath = this.root.slice(0, -1) || '/';
|
||||
this.location.replace(rootPath + '#' + this.getPath());
|
||||
// Return immediately as browser will do redirect to new url
|
||||
return true;
|
||||
|
||||
@ -1658,7 +1711,7 @@
|
||||
}
|
||||
|
||||
// Add a cross-platform `addEventListener` shim for older browsers.
|
||||
var addEventListener = window.addEventListener || function (eventName, listener) {
|
||||
var addEventListener = window.addEventListener || function(eventName, listener) {
|
||||
return attachEvent('on' + eventName, listener);
|
||||
};
|
||||
|
||||
@ -1679,7 +1732,7 @@
|
||||
// but possibly useful for unit testing Routers.
|
||||
stop: function() {
|
||||
// Add a cross-platform `removeEventListener` shim for older browsers.
|
||||
var removeEventListener = window.removeEventListener || function (eventName, listener) {
|
||||
var removeEventListener = window.removeEventListener || function(eventName, listener) {
|
||||
return detachEvent('on' + eventName, listener);
|
||||
};
|
||||
|
||||
@ -1730,7 +1783,7 @@
|
||||
// If the root doesn't match, no routes can match either.
|
||||
if (!this.matchRoot()) return false;
|
||||
fragment = this.fragment = this.getFragment(fragment);
|
||||
return _.any(this.handlers, function(handler) {
|
||||
return _.some(this.handlers, function(handler) {
|
||||
if (handler.route.test(fragment)) {
|
||||
handler.callback(fragment);
|
||||
return true;
|
||||
@ -1753,11 +1806,11 @@
|
||||
fragment = this.getFragment(fragment || '');
|
||||
|
||||
// Don't include a trailing slash on the root.
|
||||
var root = this.root;
|
||||
var rootPath = this.root;
|
||||
if (fragment === '' || fragment.charAt(0) === '?') {
|
||||
root = root.slice(0, -1) || '/';
|
||||
rootPath = rootPath.slice(0, -1) || '/';
|
||||
}
|
||||
var url = root + fragment;
|
||||
var url = rootPath + fragment;
|
||||
|
||||
// Strip the hash and decode for matching.
|
||||
fragment = this.decodeFragment(fragment.replace(pathStripper, ''));
|
||||
@ -1773,7 +1826,7 @@
|
||||
// fragment to store history.
|
||||
} else if (this._wantsHashChange) {
|
||||
this._updateHash(this.location, fragment, options.replace);
|
||||
if (this.iframe && (fragment !== this.getHash(this.iframe.contentWindow))) {
|
||||
if (this.iframe && fragment !== this.getHash(this.iframe.contentWindow)) {
|
||||
var iWindow = this.iframe.contentWindow;
|
||||
|
||||
// Opening and closing the iframe tricks IE7 and earlier to push a
|
||||
@ -1835,14 +1888,9 @@
|
||||
_.extend(child, parent, staticProps);
|
||||
|
||||
// Set the prototype chain to inherit from `parent`, without calling
|
||||
// `parent` constructor function.
|
||||
var Surrogate = function(){ this.constructor = child; };
|
||||
Surrogate.prototype = parent.prototype;
|
||||
child.prototype = new Surrogate;
|
||||
|
||||
// Add prototype properties (instance properties) to the subclass,
|
||||
// if supplied.
|
||||
if (protoProps) _.extend(child.prototype, protoProps);
|
||||
// `parent`'s constructor function and add the prototype properties.
|
||||
child.prototype = _.create(parent.prototype, protoProps);
|
||||
child.prototype.constructor = child;
|
||||
|
||||
// Set a convenience property in case the parent's prototype is needed
|
||||
// later.
|
||||
@ -1869,5 +1917,4 @@
|
||||
};
|
||||
|
||||
return Backbone;
|
||||
|
||||
}));
|
||||
});
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
Copyright (c) 2015 Jed Watson.
|
||||
Copyright (c) 2016 Jed Watson.
|
||||
Licensed under the MIT License (MIT), see
|
||||
http://jedwatson.github.io/classnames
|
||||
*/
|
||||
@ -11,7 +11,7 @@
|
||||
var hasOwn = {}.hasOwnProperty;
|
||||
|
||||
function classNames () {
|
||||
var classes = '';
|
||||
var classes = [];
|
||||
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
var arg = arguments[i];
|
||||
@ -20,26 +20,26 @@
|
||||
var argType = typeof arg;
|
||||
|
||||
if (argType === 'string' || argType === 'number') {
|
||||
classes += ' ' + arg;
|
||||
classes.push(arg);
|
||||
} else if (Array.isArray(arg)) {
|
||||
classes += ' ' + classNames.apply(null, arg);
|
||||
classes.push(classNames.apply(null, arg));
|
||||
} else if (argType === 'object') {
|
||||
for (var key in arg) {
|
||||
if (hasOwn.call(arg, key) && arg[key]) {
|
||||
classes += ' ' + key;
|
||||
classes.push(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return classes.substr(1);
|
||||
return classes.join(' ');
|
||||
}
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports = classNames;
|
||||
} else if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
|
||||
// register as 'classnames', consistent with npm package name
|
||||
define('classnames', function () {
|
||||
define('classnames', [], function () {
|
||||
return classNames;
|
||||
});
|
||||
} else {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user