mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-12-14 11:23:42 +02:00
updated backbone to 0.9.10
updated marionette 1.0.0-rc5
This commit is contained in:
Keivan Beigi
kay.one
parent
eab6abc8c9
commit
78d007791f
@ -1,4 +1,4 @@
|
||||
// Backbone.js 0.9.9
|
||||
// Backbone.js 0.9.10
|
||||
|
||||
// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
|
||||
// Backbone may be freely distributed under the MIT license.
|
||||
@ -34,7 +34,7 @@
|
||||
}
|
||||
|
||||
// Current version of the library. Keep in sync with `package.json`.
|
||||
Backbone.VERSION = '0.9.9';
|
||||
Backbone.VERSION = '0.9.10';
|
||||
|
||||
// Require Underscore, if we're on the server, and it's not already present.
|
||||
var _ = root._;
|
||||
@ -88,7 +88,7 @@
|
||||
|
||||
// Optimized internal dispatch function for triggering events. Tries to
|
||||
// keep the usual cases speedy (most Backbone events have 3 arguments).
|
||||
var triggerEvents = function(obj, events, args) {
|
||||
var triggerEvents = function (events, args) {
|
||||
var ev, i = -1, l = events.length;
|
||||
switch (args.length) {
|
||||
case 0: while (++i < l) (ev = events[i]).callback.call(ev.ctx);
|
||||
@ -142,7 +142,7 @@
|
||||
|
||||
// Remove one or many callbacks. If `context` is null, removes all
|
||||
// callbacks with that function. If `callback` is null, removes all
|
||||
// callbacks for the event. If `events` is null, removes all bound
|
||||
// callbacks for the event. If `name` is null, removes all bound
|
||||
// callbacks for all events.
|
||||
off: function (name, callback, context) {
|
||||
var list, ev, events, names, i, l, j, k;
|
||||
@ -160,7 +160,8 @@
|
||||
if (callback || context) {
|
||||
for (j = 0, k = list.length; j < k; j++) {
|
||||
ev = list[j];
|
||||
if ((callback && callback !== (ev.callback._callback || ev.callback)) ||
|
||||
if ((callback && callback !== ev.callback &&
|
||||
callback !== ev.callback._callback) ||
|
||||
(context && context !== ev.context)) {
|
||||
events.push(ev);
|
||||
}
|
||||
@ -183,32 +184,33 @@
|
||||
if (!eventsApi(this, 'trigger', name, args)) return this;
|
||||
var events = this._events[name];
|
||||
var allEvents = this._events.all;
|
||||
if (events) triggerEvents(this, events, args);
|
||||
if (allEvents) triggerEvents(this, allEvents, arguments);
|
||||
if (events) triggerEvents(events, args);
|
||||
if (allEvents) triggerEvents(allEvents, arguments);
|
||||
return this;
|
||||
},
|
||||
|
||||
// An inversion-of-control version of `on`. Tell *this* object to listen to
|
||||
// an event in another object ... keeping track of what it's listening to.
|
||||
listenTo: function(object, events, callback) {
|
||||
listenTo: function (obj, name, callback) {
|
||||
var listeners = this._listeners || (this._listeners = {});
|
||||
var id = object._listenerId || (object._listenerId = _.uniqueId('l'));
|
||||
listeners[id] = object;
|
||||
object.on(events, callback || this, this);
|
||||
var id = obj._listenerId || (obj._listenerId = _.uniqueId('l'));
|
||||
listeners[id] = obj;
|
||||
obj.on(name, typeof name === 'object' ? this : callback, this);
|
||||
return this;
|
||||
},
|
||||
|
||||
// Tell this object to stop listening to either specific events ... or
|
||||
// to every object it's currently listening to.
|
||||
stopListening: function(object, events, callback) {
|
||||
stopListening: function (obj, name, callback) {
|
||||
var listeners = this._listeners;
|
||||
if (!listeners) return;
|
||||
if (object) {
|
||||
object.off(events, callback, this);
|
||||
if (!events && !callback) delete listeners[object._listenerId];
|
||||
if (obj) {
|
||||
obj.off(name, typeof name === 'object' ? this : callback, this);
|
||||
if (!name && !callback) delete listeners[obj._listenerId];
|
||||
} else {
|
||||
if (typeof name === 'object') callback = this;
|
||||
for (var id in listeners) {
|
||||
listeners[id].off(null, null, this);
|
||||
listeners[id].off(name, callback, this);
|
||||
}
|
||||
this._listeners = {};
|
||||
}
|
||||
@ -233,15 +235,14 @@
|
||||
var defaults;
|
||||
var attrs = attributes || {};
|
||||
this.cid = _.uniqueId('c');
|
||||
this.changed = {};
|
||||
this.attributes = {};
|
||||
this._changes = [];
|
||||
if (options && options.collection) this.collection = options.collection;
|
||||
if (options && options.parse) attrs = this.parse(attrs);
|
||||
if (defaults = _.result(this, 'defaults')) _.defaults(attrs, defaults);
|
||||
this.set(attrs, {silent: true});
|
||||
this._currentAttributes = _.clone(this.attributes);
|
||||
this._previousAttributes = _.clone(this.attributes);
|
||||
if (options && options.parse) attrs = this.parse(attrs, options) || {};
|
||||
if (defaults = _.result(this, 'defaults')) {
|
||||
attrs = _.defaults({}, attrs, defaults);
|
||||
}
|
||||
this.set(attrs, options);
|
||||
this.changed = {};
|
||||
this.initialize.apply(this, arguments);
|
||||
};
|
||||
|
||||
@ -285,47 +286,72 @@
|
||||
return this.get(attr) != null;
|
||||
},
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
// Set a hash of model attributes on the object, firing `"change"` unless
|
||||
// you choose to silence it.
|
||||
set: function (key, val, options) {
|
||||
var attr, attrs;
|
||||
var attr, attrs, unset, changes, silent, changing, prev, current;
|
||||
if (key == null) return this;
|
||||
|
||||
// Handle both `"key", value` and `{key: value}` -style arguments.
|
||||
if (_.isObject(key)) {
|
||||
if (typeof key === 'object') {
|
||||
attrs = key;
|
||||
options = val;
|
||||
} else {
|
||||
(attrs = {})[key] = val;
|
||||
}
|
||||
|
||||
// Extract attributes and options.
|
||||
var silent = options && options.silent;
|
||||
var unset = options && options.unset;
|
||||
options || (options = {});
|
||||
|
||||
// Run validation.
|
||||
if (!this._validate(attrs, options)) return false;
|
||||
|
||||
// Extract attributes and options.
|
||||
unset = options.unset;
|
||||
silent = options.silent;
|
||||
changes = [];
|
||||
changing = this._changing;
|
||||
this._changing = true;
|
||||
|
||||
if (!changing) {
|
||||
this._previousAttributes = _.clone(this.attributes);
|
||||
this.changed = {};
|
||||
}
|
||||
current = this.attributes, prev = this._previousAttributes;
|
||||
|
||||
// Check for changes of `id`.
|
||||
if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
|
||||
|
||||
var now = this.attributes;
|
||||
|
||||
// For each `set` attribute...
|
||||
// For each `set` attribute, update or delete the current value.
|
||||
for (attr in attrs) {
|
||||
val = attrs[attr];
|
||||
|
||||
// Update or delete the current value, and track the change.
|
||||
unset ? delete now[attr] : now[attr] = val;
|
||||
this._changes.push(attr, val);
|
||||
if (!_.isEqual(current[attr], val)) changes.push(attr);
|
||||
if (!_.isEqual(prev[attr], val)) {
|
||||
this.changed[attr] = val;
|
||||
} else {
|
||||
delete this.changed[attr];
|
||||
}
|
||||
unset ? delete current[attr] : current[attr] = val;
|
||||
}
|
||||
|
||||
// Signal that the model's state has potentially changed, and we need
|
||||
// to recompute the actual changes.
|
||||
this._hasComputed = false;
|
||||
// Trigger all relevant attribute changes.
|
||||
if (!silent) {
|
||||
if (changes.length) this._pending = true;
|
||||
for (var i = 0, l = changes.length; i < l; i++) {
|
||||
this.trigger('change:' + changes[i], this, current[changes[i]], options);
|
||||
}
|
||||
}
|
||||
|
||||
// Fire the `"change"` events.
|
||||
if (!silent) this.change(options);
|
||||
if (changing) return this;
|
||||
if (!silent) {
|
||||
while (this._pending) {
|
||||
this._pending = false;
|
||||
this.trigger('change', this, options);
|
||||
}
|
||||
}
|
||||
this._pending = false;
|
||||
this._changing = false;
|
||||
return this;
|
||||
},
|
||||
|
||||
@ -343,16 +369,54 @@
|
||||
return this.set(attrs, _.extend({}, options, { unset: true }));
|
||||
},
|
||||
|
||||
// Determine if the model has changed since the last `"change"` event.
|
||||
// If you specify an attribute name, determine if that attribute has changed.
|
||||
hasChanged: function (attr) {
|
||||
if (attr == null) return !_.isEmpty(this.changed);
|
||||
return _.has(this.changed, attr);
|
||||
},
|
||||
|
||||
// Return an object containing all the attributes that have changed, or
|
||||
// false if there are no changed attributes. Useful for determining what
|
||||
// parts of a view need to be updated and/or what attributes need to be
|
||||
// persisted to the server. Unset attributes will be set to undefined.
|
||||
// You can also pass an attributes object to diff against the model,
|
||||
// determining if there *would be* a change.
|
||||
changedAttributes: function (diff) {
|
||||
if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
|
||||
var val, changed = false;
|
||||
var old = this._changing ? this._previousAttributes : this.attributes;
|
||||
for (var attr in diff) {
|
||||
if (_.isEqual(old[attr], (val = diff[attr]))) continue;
|
||||
(changed || (changed = {}))[attr] = val;
|
||||
}
|
||||
return changed;
|
||||
},
|
||||
|
||||
// Get the previous value of an attribute, recorded at the time the last
|
||||
// `"change"` event was fired.
|
||||
previous: function (attr) {
|
||||
if (attr == null || !this._previousAttributes) return null;
|
||||
return this._previousAttributes[attr];
|
||||
},
|
||||
|
||||
// Get all of the attributes of the model at the time of the previous
|
||||
// `"change"` event.
|
||||
previousAttributes: function () {
|
||||
return _.clone(this._previousAttributes);
|
||||
},
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
// Fetch the model from the server. If the server's representation of the
|
||||
// model differs from its current attributes, they will be overriden,
|
||||
// triggering a `"change"` event.
|
||||
fetch: function (options) {
|
||||
options = options ? _.clone(options) : {};
|
||||
if (options.parse === void 0) options.parse = true;
|
||||
var model = this;
|
||||
var success = options.success;
|
||||
options.success = function(resp, status, xhr) {
|
||||
if (!model.set(model.parse(resp), options)) return false;
|
||||
options.success = function (model, resp, options) {
|
||||
if (!model.set(model.parse(resp, options), options)) return false;
|
||||
if (success) success(model, resp, options);
|
||||
};
|
||||
return this.sync('read', this, options);
|
||||
@ -362,55 +426,51 @@
|
||||
// If the server returns an attributes hash that differs, the model's
|
||||
// state will be `set` again.
|
||||
save: function (key, val, options) {
|
||||
var attrs, current, done;
|
||||
var attrs, success, method, xhr, attributes = this.attributes;
|
||||
|
||||
// Handle both `"key", value` and `{key: value}` -style arguments.
|
||||
if (key == null || _.isObject(key)) {
|
||||
if (key == null || typeof key === 'object') {
|
||||
attrs = key;
|
||||
options = val;
|
||||
} else if (key != null) {
|
||||
} else {
|
||||
(attrs = {})[key] = val;
|
||||
}
|
||||
options = options ? _.clone(options) : {};
|
||||
|
||||
// If we're "wait"-ing to set changed attributes, validate early.
|
||||
if (options.wait) {
|
||||
if (attrs && !this._validate(attrs, options)) return false;
|
||||
current = _.clone(this.attributes);
|
||||
}
|
||||
// If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`.
|
||||
if (attrs && (!options || !options.wait) && !this.set(attrs, options)) return false;
|
||||
|
||||
// Regular saves `set` attributes before persisting to the server.
|
||||
var silentOptions = _.extend({}, options, {silent: true});
|
||||
if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) {
|
||||
return false;
|
||||
}
|
||||
options = _.extend({ validate: true }, options);
|
||||
|
||||
// Do not persist invalid models.
|
||||
if (!attrs && !this._validate(null, options)) return false;
|
||||
if (!this._validate(attrs, options)) return false;
|
||||
|
||||
// Set temporary attributes if `{wait: true}`.
|
||||
if (attrs && options.wait) {
|
||||
this.attributes = _.extend({}, attributes, attrs);
|
||||
}
|
||||
|
||||
// After a successful server-side save, the client is (optionally)
|
||||
// updated with the server-side state.
|
||||
var model = this;
|
||||
var success = options.success;
|
||||
options.success = function(resp, status, xhr) {
|
||||
done = true;
|
||||
var serverAttrs = model.parse(resp);
|
||||
if (options.parse === void 0) options.parse = true;
|
||||
success = options.success;
|
||||
options.success = function (model, resp, options) {
|
||||
// Ensure attributes are restored during synchronous saves.
|
||||
model.attributes = attributes;
|
||||
var serverAttrs = model.parse(resp, options);
|
||||
if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs);
|
||||
if (!model.set(serverAttrs, options)) return false;
|
||||
if (_.isObject(serverAttrs) && !model.set(serverAttrs, options)) {
|
||||
return false;
|
||||
}
|
||||
if (success) success(model, resp, options);
|
||||
};
|
||||
|
||||
// Finish configuring and sending the Ajax request.
|
||||
var method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update');
|
||||
if (method == 'patch') options.attrs = attrs;
|
||||
var xhr = this.sync(method, this, options);
|
||||
method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update');
|
||||
if (method === 'patch') options.attrs = attrs;
|
||||
xhr = this.sync(method, this, options);
|
||||
|
||||
// When using `wait`, reset attributes to original values unless
|
||||
// `success` has been called already.
|
||||
if (!done && options.wait) {
|
||||
this.clear(silentOptions);
|
||||
this.set(current, silentOptions);
|
||||
}
|
||||
// Restore attributes.
|
||||
if (attrs && options.wait) this.attributes = attributes;
|
||||
|
||||
return xhr;
|
||||
},
|
||||
@ -427,13 +487,13 @@
|
||||
model.trigger('destroy', model, model.collection, options);
|
||||
};
|
||||
|
||||
options.success = function(resp) {
|
||||
options.success = function (model, resp, options) {
|
||||
if (options.wait || model.isNew()) destroy();
|
||||
if (success) success(model, resp, options);
|
||||
};
|
||||
|
||||
if (this.isNew()) {
|
||||
options.success();
|
||||
options.success(this, null, options);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -453,7 +513,7 @@
|
||||
|
||||
// **parse** converts a response into the hash of attributes to be `set` on
|
||||
// the model. The default implementation is just to pass the response along.
|
||||
parse: function(resp) {
|
||||
parse: function (resp, options) {
|
||||
return resp;
|
||||
},
|
||||
|
||||
@ -467,115 +527,20 @@
|
||||
return this.id == null;
|
||||
},
|
||||
|
||||
// Call this method to manually fire a `"change"` event for this model and
|
||||
// a `"change:attribute"` event for each changed attribute.
|
||||
// Calling this will cause all objects observing the model to update.
|
||||
change: function(options) {
|
||||
var changing = this._changing;
|
||||
this._changing = true;
|
||||
|
||||
// Generate the changes to be triggered on the model.
|
||||
var triggers = this._computeChanges(true);
|
||||
|
||||
this._pending = !!triggers.length;
|
||||
|
||||
for (var i = triggers.length - 2; i >= 0; i -= 2) {
|
||||
this.trigger('change:' + triggers[i], this, triggers[i + 1], options);
|
||||
}
|
||||
|
||||
if (changing) return this;
|
||||
|
||||
// Trigger a `change` while there have been changes.
|
||||
while (this._pending) {
|
||||
this._pending = false;
|
||||
this.trigger('change', this, options);
|
||||
this._previousAttributes = _.clone(this.attributes);
|
||||
}
|
||||
|
||||
this._changing = false;
|
||||
return this;
|
||||
},
|
||||
|
||||
// Determine if the model has changed since the last `"change"` event.
|
||||
// If you specify an attribute name, determine if that attribute has changed.
|
||||
hasChanged: function(attr) {
|
||||
if (!this._hasComputed) this._computeChanges();
|
||||
if (attr == null) return !_.isEmpty(this.changed);
|
||||
return _.has(this.changed, attr);
|
||||
},
|
||||
|
||||
// Return an object containing all the attributes that have changed, or
|
||||
// false if there are no changed attributes. Useful for determining what
|
||||
// parts of a view need to be updated and/or what attributes need to be
|
||||
// persisted to the server. Unset attributes will be set to undefined.
|
||||
// You can also pass an attributes object to diff against the model,
|
||||
// determining if there *would be* a change.
|
||||
changedAttributes: function(diff) {
|
||||
if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
|
||||
var val, changed = false, old = this._previousAttributes;
|
||||
for (var attr in diff) {
|
||||
if (_.isEqual(old[attr], (val = diff[attr]))) continue;
|
||||
(changed || (changed = {}))[attr] = val;
|
||||
}
|
||||
return changed;
|
||||
},
|
||||
|
||||
// Looking at the built up list of `set` attribute changes, compute how
|
||||
// many of the attributes have actually changed. If `loud`, return a
|
||||
// boiled-down list of only the real changes.
|
||||
_computeChanges: function(loud) {
|
||||
this.changed = {};
|
||||
var already = {};
|
||||
var triggers = [];
|
||||
var current = this._currentAttributes;
|
||||
var changes = this._changes;
|
||||
|
||||
// Loop through the current queue of potential model changes.
|
||||
for (var i = changes.length - 2; i >= 0; i -= 2) {
|
||||
var key = changes[i], val = changes[i + 1];
|
||||
if (already[key]) continue;
|
||||
already[key] = true;
|
||||
|
||||
// Check if the attribute has been modified since the last change,
|
||||
// and update `this.changed` accordingly. If we're inside of a `change`
|
||||
// call, also add a trigger to the list.
|
||||
if (current[key] !== val) {
|
||||
this.changed[key] = val;
|
||||
if (!loud) continue;
|
||||
triggers.push(key, val);
|
||||
current[key] = val;
|
||||
}
|
||||
}
|
||||
if (loud) this._changes = [];
|
||||
|
||||
// Signals `this.changed` is current to prevent duplicate calls from `this.hasChanged`.
|
||||
this._hasComputed = true;
|
||||
return triggers;
|
||||
},
|
||||
|
||||
// Get the previous value of an attribute, recorded at the time the last
|
||||
// `"change"` event was fired.
|
||||
previous: function(attr) {
|
||||
if (attr == null || !this._previousAttributes) return null;
|
||||
return this._previousAttributes[attr];
|
||||
},
|
||||
|
||||
// Get all of the attributes of the model at the time of the previous
|
||||
// `"change"` event.
|
||||
previousAttributes: function() {
|
||||
return _.clone(this._previousAttributes);
|
||||
// Check if the model is currently in a valid state.
|
||||
isValid: function (options) {
|
||||
return !this.validate || !this.validate(this.attributes, options);
|
||||
},
|
||||
|
||||
// Run validation against the next complete set of model attributes,
|
||||
// returning `true` if all is well. If a specific `error` callback has
|
||||
// been passed, call that instead of firing the general `"error"` event.
|
||||
// returning `true` if all is well. Otherwise, fire a general
|
||||
// `"error"` event and call the error callback, if specified.
|
||||
_validate: function (attrs, options) {
|
||||
if (!this.validate) return true;
|
||||
if (!options.validate || !this.validate) return true;
|
||||
attrs = _.extend({}, this.attributes, attrs);
|
||||
var error = this.validate(attrs, options);
|
||||
var error = this.validationError = this.validate(attrs, options) || null;
|
||||
if (!error) return true;
|
||||
if (options && options.error) options.error(this, error, options);
|
||||
this.trigger('error', this, error, options);
|
||||
this.trigger('invalid', this, error, options || {});
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -591,6 +556,7 @@
|
||||
options || (options = {});
|
||||
if (options.model) this.model = options.model;
|
||||
if (options.comparator !== void 0) this.comparator = options.comparator;
|
||||
this.models = [];
|
||||
this._reset();
|
||||
this.initialize.apply(this, arguments);
|
||||
if (models) this.reset(models, _.extend({ silent: true }, options));
|
||||
@ -618,74 +584,81 @@
|
||||
return Backbone.sync.apply(this, arguments);
|
||||
},
|
||||
|
||||
// Add a model, or list of models to the set. Pass **silent** to avoid
|
||||
// firing the `add` event for every new model.
|
||||
// Add a model, or list of models to the set.
|
||||
add: function (models, options) {
|
||||
var i, args, length, model, existing, needsSort;
|
||||
var at = options && options.at;
|
||||
var sort = ((options && options.sort) == null ? true : options.sort);
|
||||
models = _.isArray(models) ? models.slice() : [models];
|
||||
options || (options = {});
|
||||
var i, l, model, attrs, existing, doSort, add, at, sort, sortAttr;
|
||||
add = [];
|
||||
at = options.at;
|
||||
sort = this.comparator && (at == null) && options.sort != false;
|
||||
sortAttr = _.isString(this.comparator) ? this.comparator : null;
|
||||
|
||||
// Turn bare objects into model references, and prevent invalid models
|
||||
// from being added.
|
||||
for (i = models.length - 1; i >= 0; i--) {
|
||||
if(!(model = this._prepareModel(models[i], options))) {
|
||||
this.trigger("error", this, models[i], options);
|
||||
models.splice(i, 1);
|
||||
for (i = 0, l = models.length; i < l; i++) {
|
||||
if (!(model = this._prepareModel(attrs = models[i], options))) {
|
||||
this.trigger('invalid', this, attrs, options);
|
||||
continue;
|
||||
}
|
||||
models[i] = model;
|
||||
|
||||
existing = model.id != null && this._byId[model.id];
|
||||
// If a duplicate is found, prevent it from being added and
|
||||
// optionally merge it into the existing model.
|
||||
if (existing || this._byCid[model.cid]) {
|
||||
if (options && options.merge && existing) {
|
||||
existing.set(model.attributes, options);
|
||||
needsSort = sort;
|
||||
if (existing = this.get(model)) {
|
||||
if (options.merge) {
|
||||
existing.set(attrs === model ? model.attributes : attrs, options);
|
||||
if (sort && !doSort && existing.hasChanged(sortAttr)) doSort = true;
|
||||
}
|
||||
models.splice(i, 1);
|
||||
continue;
|
||||
}
|
||||
|
||||
// This is a new model, push it to the `add` list.
|
||||
add.push(model);
|
||||
|
||||
// Listen to added models' events, and index models for lookup by
|
||||
// `id` and by `cid`.
|
||||
model.on('all', this._onModelEvent, this);
|
||||
this._byCid[model.cid] = model;
|
||||
this._byId[model.cid] = model;
|
||||
if (model.id != null) this._byId[model.id] = model;
|
||||
}
|
||||
|
||||
// See if sorting is needed, update `length` and splice in new models.
|
||||
if (models.length) needsSort = sort;
|
||||
this.length += models.length;
|
||||
args = [at != null ? at : this.models.length, 0];
|
||||
push.apply(args, models);
|
||||
splice.apply(this.models, args);
|
||||
if (add.length) {
|
||||
if (sort) doSort = true;
|
||||
this.length += add.length;
|
||||
if (at != null) {
|
||||
splice.apply(this.models, [at, 0].concat(add));
|
||||
} else {
|
||||
push.apply(this.models, add);
|
||||
}
|
||||
}
|
||||
|
||||
// Sort the collection if appropriate.
|
||||
if (needsSort && this.comparator && at == null) this.sort({silent: true});
|
||||
// Silently sort the collection if appropriate.
|
||||
if (doSort) this.sort({ silent: true });
|
||||
|
||||
if (options && options.silent) return this;
|
||||
if (options.silent) return this;
|
||||
|
||||
// Trigger `add` events.
|
||||
while (model = models.shift()) {
|
||||
model.trigger('add', model, this, options);
|
||||
for (i = 0, l = add.length; i < l; i++) {
|
||||
(model = add[i]).trigger('add', model, this, options);
|
||||
}
|
||||
|
||||
// Trigger `sort` if the collection was sorted.
|
||||
if (doSort) this.trigger('sort', this, options);
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
// Remove a model, or a list of models from the set. Pass silent to avoid
|
||||
// firing the `remove` event for every model removed.
|
||||
// Remove a model, or a list of models from the set.
|
||||
remove: function (models, options) {
|
||||
var i, l, index, model;
|
||||
options || (options = {});
|
||||
models = _.isArray(models) ? models.slice() : [models];
|
||||
options || (options = {});
|
||||
var i, l, index, model;
|
||||
for (i = 0, l = models.length; i < l; i++) {
|
||||
model = this.get(models[i]);
|
||||
if (!model) continue;
|
||||
delete this._byId[model.id];
|
||||
delete this._byCid[model.cid];
|
||||
delete this._byId[model.cid];
|
||||
index = this.indexOf(model);
|
||||
this.models.splice(index, 1);
|
||||
this.length--;
|
||||
@ -734,7 +707,8 @@
|
||||
// Get a model from the set by id.
|
||||
get: function (obj) {
|
||||
if (obj == null) return void 0;
|
||||
return this._byId[obj.id != null ? obj.id : obj] || this._byCid[obj.cid || obj];
|
||||
this._idAttr || (this._idAttr = this.model.prototype.idAttribute);
|
||||
return this._byId[obj.id || obj.cid || obj[this._idAttr] || obj];
|
||||
},
|
||||
|
||||
// Get the model at the given index.
|
||||
@ -760,14 +734,16 @@
|
||||
if (!this.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));
|
||||
}
|
||||
|
||||
if (!options || !options.silent) this.trigger('sort', this, options);
|
||||
if (!options.silent) this.trigger('sort', this, options);
|
||||
return this;
|
||||
},
|
||||
|
||||
@ -779,11 +755,10 @@
|
||||
// Smartly update a collection with a change set of models, adding,
|
||||
// removing, and merging as necessary.
|
||||
update: function (models, options) {
|
||||
options = _.extend({ add: true, merge: true, remove: true }, options);
|
||||
if (options.parse) models = this.parse(models, options);
|
||||
var model, i, l, existing;
|
||||
var add = [], remove = [], modelMap = {};
|
||||
var idAttr = this.model.prototype.idAttribute;
|
||||
options = _.extend({add: true, merge: true, remove: true}, options);
|
||||
if (options.parse) models = this.parse(models);
|
||||
|
||||
// Allow a single model (or no argument) to be passed.
|
||||
if (!_.isArray(models)) models = models ? [models] : [];
|
||||
@ -794,7 +769,7 @@
|
||||
// Determine which models to add and merge, and which to remove.
|
||||
for (i = 0, l = models.length; i < l; i++) {
|
||||
model = models[i];
|
||||
existing = this.get(model.id || model.cid || model[idAttr]);
|
||||
existing = this.get(model);
|
||||
if (options.remove && existing) modelMap[existing.cid] = true;
|
||||
if ((options.add && !existing) || (options.merge && existing)) {
|
||||
add.push(model);
|
||||
@ -818,11 +793,11 @@
|
||||
// any `add` or `remove` events. Fires `reset` when finished.
|
||||
reset: function (models, options) {
|
||||
options || (options = {});
|
||||
if (options.parse) models = this.parse(models);
|
||||
if (options.parse) models = this.parse(models, options);
|
||||
for (var i = 0, l = this.models.length; i < l; i++) {
|
||||
this._removeReference(this.models[i]);
|
||||
}
|
||||
options.previousModels = this.models;
|
||||
options.previousModels = this.models.slice();
|
||||
this._reset();
|
||||
if (models) this.add(models, _.extend({ silent: true }, options));
|
||||
if (!options.silent) this.trigger('reset', this, options);
|
||||
@ -830,14 +805,13 @@
|
||||
},
|
||||
|
||||
// Fetch the default set of models for this collection, resetting the
|
||||
// collection when they arrive. If `add: true` is passed, appends the
|
||||
// models to the collection instead of resetting.
|
||||
// collection when they arrive. If `update: true` is passed, the response
|
||||
// data will be passed through the `update` method instead of `reset`.
|
||||
fetch: function (options) {
|
||||
options = options ? _.clone(options) : {};
|
||||
if (options.parse === void 0) options.parse = true;
|
||||
var collection = this;
|
||||
var success = options.success;
|
||||
options.success = function(resp, status, xhr) {
|
||||
options.success = function (collection, resp, options) {
|
||||
var method = options.update ? 'update' : 'reset';
|
||||
collection[method](resp, options);
|
||||
if (success) success(collection, resp, options);
|
||||
@ -849,11 +823,10 @@
|
||||
// collection immediately, unless `wait: true` is passed, in which case we
|
||||
// wait for the server to agree.
|
||||
create: function (model, options) {
|
||||
var collection = this;
|
||||
options = options ? _.clone(options) : {};
|
||||
model = this._prepareModel(model, options);
|
||||
if (!model) return false;
|
||||
if (!options.wait) collection.add(model, options);
|
||||
if (!(model = this._prepareModel(model, options))) return false;
|
||||
if (!options.wait) this.add(model, options);
|
||||
var collection = this;
|
||||
var success = options.success;
|
||||
options.success = function (model, resp, options) {
|
||||
if (options.wait) collection.add(model, options);
|
||||
@ -865,7 +838,7 @@
|
||||
|
||||
// **parse** converts a response into a list of models to be added to the
|
||||
// collection. The default implementation is just to pass it through.
|
||||
parse: function(resp) {
|
||||
parse: function (resp, options) {
|
||||
return resp;
|
||||
},
|
||||
|
||||
@ -874,19 +847,11 @@
|
||||
return new this.constructor(this.models);
|
||||
},
|
||||
|
||||
// Proxy to _'s chain. Can't be proxied the same way the rest of the
|
||||
// underscore methods are proxied because it relies on the underscore
|
||||
// constructor.
|
||||
chain: function() {
|
||||
return _(this.models).chain();
|
||||
},
|
||||
|
||||
// Reset all internal state. Called when the collection is reset.
|
||||
_reset: function () {
|
||||
this.length = 0;
|
||||
this.models = [];
|
||||
this.models.length = 0;
|
||||
this._byId = {};
|
||||
this._byCid = {};
|
||||
},
|
||||
|
||||
// Prepare a model or hash of attributes to be added to this collection.
|
||||
@ -920,6 +885,14 @@
|
||||
if (model.id != null) this._byId[model.id] = model;
|
||||
}
|
||||
this.trigger.apply(this, arguments);
|
||||
},
|
||||
|
||||
sortedIndex: function (model, value, context) {
|
||||
value || (value = this.comparator);
|
||||
var iterator = _.isFunction(value) ? value : function (model) {
|
||||
return model.get(value);
|
||||
};
|
||||
return _.sortedIndex(this.models, model, iterator, context);
|
||||
}
|
||||
|
||||
});
|
||||
@ -928,9 +901,9 @@
|
||||
var methods = ['forEach', 'each', 'map', 'collect', 'reduce', 'foldl',
|
||||
'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select',
|
||||
'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke',
|
||||
'max', 'min', 'sortedIndex', 'toArray', 'size', 'first', 'head', 'take',
|
||||
'initial', 'rest', 'tail', 'last', 'without', 'indexOf', 'shuffle',
|
||||
'lastIndexOf', 'isEmpty'];
|
||||
'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest',
|
||||
'tail', 'drop', 'last', 'without', 'indexOf', 'shuffle', 'lastIndexOf',
|
||||
'isEmpty', 'chain'];
|
||||
|
||||
// Mix in each Underscore method as a proxy to `Collection#models`.
|
||||
_.each(methods, function (method) {
|
||||
@ -969,7 +942,7 @@
|
||||
// Cached regular expressions for matching named param parts and splatted
|
||||
// parts of route strings.
|
||||
var optionalParam = /\((.*?)\)/g;
|
||||
var namedParam = /:\w+/g;
|
||||
var namedParam = /(\(\?)?:\w+/g;
|
||||
var splatParam = /\*\w+/g;
|
||||
var escapeRegExp = /[\-{}\[\]+?.,\\\^$|#\s]/g;
|
||||
|
||||
@ -993,6 +966,7 @@
|
||||
var args = this._extractParameters(route, fragment);
|
||||
callback && callback.apply(this, args);
|
||||
this.trigger.apply(this, ['route:' + name].concat(args));
|
||||
this.trigger('route', name, args);
|
||||
Backbone.history.trigger('route', this, name, args);
|
||||
}, this));
|
||||
return this;
|
||||
@ -1020,7 +994,9 @@
|
||||
_routeToRegExp: function (route) {
|
||||
route = route.replace(escapeRegExp, '\\$&')
|
||||
.replace(optionalParam, '(?:$1)?')
|
||||
.replace(namedParam, '([^\/]+)')
|
||||
.replace(namedParam, function (match, optional) {
|
||||
return optional ? match : '([^\/]+)';
|
||||
})
|
||||
.replace(splatParam, '(.*?)');
|
||||
return new RegExp('^' + route + '$');
|
||||
},
|
||||
@ -1121,9 +1097,9 @@
|
||||
// Depending on whether we're using pushState or hashes, and whether
|
||||
// 'onhashchange' is supported, determine how we check the URL state.
|
||||
if (this._hasPushState) {
|
||||
Backbone.$(window).bind('popstate', this.checkUrl);
|
||||
Backbone.$(window).on('popstate', this.checkUrl);
|
||||
} else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
|
||||
Backbone.$(window).bind('hashchange', this.checkUrl);
|
||||
Backbone.$(window).on('hashchange', this.checkUrl);
|
||||
} else if (this._wantsHashChange) {
|
||||
this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
|
||||
}
|
||||
@ -1155,7 +1131,7 @@
|
||||
// Disable Backbone.history, perhaps temporarily. Not useful in a real app,
|
||||
// but possibly useful for unit testing Routers.
|
||||
stop: function () {
|
||||
Backbone.$(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
|
||||
Backbone.$(window).off('popstate', this.checkUrl).off('hashchange', this.checkUrl);
|
||||
clearInterval(this._checkUrlInterval);
|
||||
History.started = false;
|
||||
},
|
||||
@ -1298,18 +1274,6 @@
|
||||
return this;
|
||||
},
|
||||
|
||||
// For small amounts of DOM Elements, where a full-blown template isn't
|
||||
// needed, use **make** to manufacture elements, one at a time.
|
||||
//
|
||||
// var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
|
||||
//
|
||||
make: function(tagName, attributes, content) {
|
||||
var el = document.createElement(tagName);
|
||||
if (attributes) Backbone.$(el).attr(attributes);
|
||||
if (content != null) Backbone.$(el).html(content);
|
||||
return el;
|
||||
},
|
||||
|
||||
// Change the view's element (`this.el` property), including event
|
||||
// re-delegation.
|
||||
setElement: function (element, delegate) {
|
||||
@ -1347,9 +1311,9 @@
|
||||
method = _.bind(method, this);
|
||||
eventName += '.delegateEvents' + this.cid;
|
||||
if (selector === '') {
|
||||
this.$el.bind(eventName, method);
|
||||
this.$el.on(eventName, method);
|
||||
} else {
|
||||
this.$el.delegate(selector, eventName, method);
|
||||
this.$el.on(eventName, selector, method);
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1358,7 +1322,7 @@
|
||||
// You usually don't need to use this, but may wish to if you have multiple
|
||||
// Backbone views attached to the same DOM element.
|
||||
undelegateEvents: function () {
|
||||
this.$el.unbind('.delegateEvents' + this.cid);
|
||||
this.$el.off('.delegateEvents' + this.cid);
|
||||
},
|
||||
|
||||
// Performs the initial configuration of a View with a set of options.
|
||||
@ -1379,7 +1343,8 @@
|
||||
var attrs = _.extend({}, _.result(this, 'attributes'));
|
||||
if (this.id) attrs.id = _.result(this, 'id');
|
||||
if (this.className) attrs['class'] = _.result(this, 'className');
|
||||
this.setElement(this.make(_.result(this, 'tagName'), attrs), false);
|
||||
var $el = Backbone.$('<' + _.result(this, 'tagName') + '>').attr(attrs);
|
||||
this.setElement($el, false);
|
||||
} else {
|
||||
this.setElement(_.result(this, 'el'), false);
|
||||
}
|
||||
@ -1461,19 +1426,19 @@
|
||||
}
|
||||
|
||||
var success = options.success;
|
||||
options.success = function(resp, status, xhr) {
|
||||
if (success) success(resp, status, xhr);
|
||||
options.success = function (resp) {
|
||||
if (success) success(model, resp, options);
|
||||
model.trigger('sync', model, resp, options);
|
||||
};
|
||||
|
||||
var error = options.error;
|
||||
options.error = function(xhr, status, thrown) {
|
||||
options.error = function (xhr) {
|
||||
if (error) error(model, xhr, options);
|
||||
model.trigger('error', model, xhr, options);
|
||||
};
|
||||
|
||||
// Make the request, allowing the user to override any Ajax options.
|
||||
var xhr = Backbone.ajax(_.extend(params, options));
|
||||
var xhr = options.xhr = Backbone.ajax(_.extend(params, options));
|
||||
model.trigger('request', model, xhr, options);
|
||||
return xhr;
|
||||
};
|
||||
@ -1499,7 +1464,7 @@
|
||||
if (protoProps && _.has(protoProps, 'constructor')) {
|
||||
child = protoProps.constructor;
|
||||
} else {
|
||||
child = function(){ parent.apply(this, arguments); };
|
||||
child = function () { return parent.apply(this, arguments); };
|
||||
}
|
||||
|
||||
// Add static properties to the constructor function, if supplied.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Backbone.Marionette, v1.0.0-rc3
|
||||
// Backbone.Marionette, v1.0.0-rc5
|
||||
// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
|
||||
// Distributed under MIT license
|
||||
// http://github.com/marionettejs/backbone.marionette
|
||||
@ -207,12 +207,12 @@ Backbone.ChildViewContainer = (function (Backbone, _) {
|
||||
return Container;
|
||||
})(Backbone, _);
|
||||
|
||||
// Backbone.Wreqr, v0.2.0
|
||||
// Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
|
||||
// Backbone.Wreqr, v0.1.1
|
||||
// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
|
||||
// Distributed under MIT license
|
||||
// http://github.com/marionettejs/backbone.wreqr
|
||||
Backbone.Wreqr = (function (Backbone, Marionette, _) {
|
||||
"option strict";
|
||||
"use strict";
|
||||
var Wreqr = {};
|
||||
|
||||
// Handlers
|
||||
@ -220,13 +220,12 @@ Backbone.Wreqr = (function (Backbone, Marionette, _) {
|
||||
// A registry of functions to call, given a name
|
||||
|
||||
Wreqr.Handlers = (function (Backbone, _) {
|
||||
"option strict";
|
||||
"use strict";
|
||||
|
||||
// Constructor
|
||||
// -----------
|
||||
|
||||
var Handlers = function () {
|
||||
"use strict";
|
||||
this._handlers = {};
|
||||
};
|
||||
|
||||
@ -284,7 +283,7 @@ Backbone.Wreqr = (function (Backbone, Marionette, _) {
|
||||
// A simple command pattern implementation. Register a command
|
||||
// handler and execute it.
|
||||
Wreqr.Commands = (function (Wreqr) {
|
||||
"option strict";
|
||||
"use strict";
|
||||
|
||||
return Wreqr.Handlers.extend({
|
||||
execute: function () {
|
||||
@ -303,7 +302,7 @@ Backbone.Wreqr = (function (Backbone, Marionette, _) {
|
||||
// A simple request/response implementation. Register a
|
||||
// request handler, and return a response from it
|
||||
Wreqr.RequestResponse = (function (Wreqr) {
|
||||
"option strict";
|
||||
"use strict";
|
||||
|
||||
return Wreqr.Handlers.extend({
|
||||
request: function () {
|
||||
@ -322,32 +321,16 @@ Backbone.Wreqr = (function (Backbone, Marionette, _) {
|
||||
// of an application through event-driven architecture.
|
||||
|
||||
Wreqr.EventAggregator = (function (Backbone, _) {
|
||||
"use strict";
|
||||
var EA = function () { };
|
||||
|
||||
// Grab a reference to the original listenTo
|
||||
var listenTo = Backbone.Events.listenTo;
|
||||
// Copy the `extend` function used by Backbone's classes
|
||||
EA.extend = Backbone.Model.extend;
|
||||
|
||||
// Create a version of listenTo that allows contexting binding
|
||||
function contextBoundListenTo(obj, evtSource, events, callback, context) {
|
||||
context = context || obj;
|
||||
return listenTo.call(obj, evtSource, events, _.bind(callback, context));
|
||||
}
|
||||
// Copy the basic Backbone.Events on to the event aggregator
|
||||
_.extend(EA.prototype, Backbone.Events);
|
||||
|
||||
// Define the EventAggregator
|
||||
function EventAggregator() { }
|
||||
|
||||
// Mix Backbone.Events in to it
|
||||
_.extend(EventAggregator.prototype, Backbone.Events, {
|
||||
// Override the listenTo so that we can have a version that
|
||||
// correctly binds context
|
||||
listenTo: function (evtSource, events, callback, context) {
|
||||
return contextBoundListenTo(this, evtSource, events, callback, context);
|
||||
}
|
||||
});
|
||||
|
||||
// Allow it to be extended
|
||||
EventAggregator.extend = Backbone.Model.extend;
|
||||
|
||||
return EventAggregator;
|
||||
return EA;
|
||||
})(Backbone, _);
|
||||
|
||||
|
||||
@ -381,7 +364,7 @@ var Marionette = (function (Backbone, _, $) {
|
||||
if (!target || !optionName) { return; }
|
||||
var value;
|
||||
|
||||
if (target.options && target.options[optionName]) {
|
||||
if (target.options && (optionName in target.options) && (target.options[optionName] !== undefined)) {
|
||||
value = target.options[optionName];
|
||||
} else {
|
||||
value = target[optionName];
|
||||
@ -509,56 +492,6 @@ var Marionette = (function (Backbone, _, $) {
|
||||
})();
|
||||
|
||||
|
||||
// addEventBinder
|
||||
// --------------
|
||||
//
|
||||
// Mixes in Backbone.Events to the target object, if it is not present
|
||||
// already. Also adjusts the listenTo method to accept a 4th parameter
|
||||
// for the callback context.
|
||||
|
||||
(function (Backbone, Marionette, _) {
|
||||
|
||||
// grab a reference to the original listenTo
|
||||
var listenTo = Backbone.Events.listenTo;
|
||||
|
||||
// Fix the listenTo method on the target object, allowing the 4th
|
||||
// context parameter to be specified
|
||||
Marionette.addEventBinder = function (target) {
|
||||
// If the target is not already extending Backbone.Events,
|
||||
// then extend that on to it first
|
||||
if (!target.on && !target.off && !target.listenTo && !target.stopListening) {
|
||||
_.extend(target, Backbone.Events);
|
||||
}
|
||||
|
||||
// Override the built-in listenTo method to make sure we
|
||||
// account for context
|
||||
target.listenTo = function (evtSource, events, callback, context) {
|
||||
context = context || this;
|
||||
return listenTo.call(this, evtSource, events, _.bind(callback, context));
|
||||
};
|
||||
};
|
||||
|
||||
})(Backbone, Marionette, _);
|
||||
|
||||
|
||||
// Event Aggregator
|
||||
// ----------------
|
||||
// A pub-sub object that can be used to decouple various parts
|
||||
// of an application through event-driven architecture.
|
||||
//
|
||||
// Extends [Backbone.Wreqr.EventAggregator](https://github.com/marionettejs/backbone.wreqr)
|
||||
// and mixes in an EventBinder from [Backbone.EventBinder](https://github.com/marionettejs/backbone.eventbinder).
|
||||
Marionette.EventAggregator = Backbone.Wreqr.EventAggregator.extend({
|
||||
|
||||
constructor: function () {
|
||||
Marionette.addEventBinder(this);
|
||||
|
||||
var args = Array.prototype.slice.apply(arguments);
|
||||
Backbone.Wreqr.EventAggregator.prototype.constructor.apply(this, args);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
// Marionette.bindEntityEvents & unbindEntityEvents
|
||||
// ---------------------------
|
||||
//
|
||||
@ -707,8 +640,6 @@ var Marionette = (function (Backbone, _, $) {
|
||||
this.triggerMethod = Marionette.triggerMethod;
|
||||
this.options = options || {};
|
||||
|
||||
Marionette.addEventBinder(this);
|
||||
|
||||
if (_.isFunction(this.initialize)) {
|
||||
this.initialize(this.options);
|
||||
}
|
||||
@ -737,8 +668,6 @@ var Marionette = (function (Backbone, _, $) {
|
||||
Marionette.Region = function (options) {
|
||||
this.options = options || {};
|
||||
|
||||
Marionette.addEventBinder(this);
|
||||
|
||||
this.el = Marionette.getOption(this, "el");
|
||||
|
||||
if (!this.el) {
|
||||
@ -953,7 +882,7 @@ var Marionette = (function (Backbone, _, $) {
|
||||
// and know whether or not it has been loaded
|
||||
_.extend(Marionette.TemplateCache.prototype, {
|
||||
|
||||
// Internal method to load the template asynchronously.
|
||||
// Internal method to load the template
|
||||
load: function () {
|
||||
var that = this;
|
||||
|
||||
@ -970,12 +899,12 @@ var Marionette = (function (Backbone, _, $) {
|
||||
},
|
||||
|
||||
// Load a template from the DOM, by default. Override
|
||||
// this method to provide your own template retrieval,
|
||||
// such as asynchronous loading from a server.
|
||||
// this method to provide your own template retrieval
|
||||
// For asynchronous loading with AMD/RequireJS, consider
|
||||
// using a template-loader plugin as described here:
|
||||
// https://github.com/marionettejs/backbone.marionette/wiki/Using-marionette-with-requirejs
|
||||
loadTemplate: function (templateId) {
|
||||
|
||||
var templateEl = $(templateId);
|
||||
var template = templateEl.html();
|
||||
var template = $(templateId).html();
|
||||
|
||||
if (!template || template.length === 0) {
|
||||
var msg = "Could not find template: '" + templateId + "'";
|
||||
@ -984,7 +913,6 @@ var Marionette = (function (Backbone, _, $) {
|
||||
throw err;
|
||||
}
|
||||
|
||||
templateEl.remove();
|
||||
return template;
|
||||
},
|
||||
|
||||
@ -1026,7 +954,6 @@ var Marionette = (function (Backbone, _, $) {
|
||||
|
||||
constructor: function () {
|
||||
_.bindAll(this, "render");
|
||||
Marionette.addEventBinder(this);
|
||||
|
||||
var args = Array.prototype.slice.apply(arguments);
|
||||
Backbone.View.prototype.constructor.apply(this, args);
|
||||
@ -1091,7 +1018,7 @@ var Marionette = (function (Backbone, _, $) {
|
||||
};
|
||||
|
||||
// trigger the event
|
||||
that.trigger(value, args);
|
||||
that.triggerMethod(value, args);
|
||||
};
|
||||
|
||||
});
|
||||
@ -1401,15 +1328,15 @@ var Marionette = (function (Backbone, _, $) {
|
||||
// remove and/or close it later
|
||||
this.children.add(view);
|
||||
|
||||
// Render it and show it
|
||||
this.renderItemView(view, index);
|
||||
|
||||
// call the "show" method if the collection view
|
||||
// has already been shown
|
||||
if (this._isShown) {
|
||||
Marionette.triggerMethod.call(view, "show");
|
||||
}
|
||||
|
||||
// Render it and show it
|
||||
var renderResult = this.renderItemView(view, index);
|
||||
|
||||
// this view was added
|
||||
this.triggerMethod("after:item:added", view);
|
||||
},
|
||||
@ -1447,6 +1374,7 @@ var Marionette = (function (Backbone, _, $) {
|
||||
removeItemView: function (item) {
|
||||
var view = this.children.findByModel(item);
|
||||
this.removeChildView(view);
|
||||
this.checkEmpty();
|
||||
},
|
||||
|
||||
// Remove the child view and close it
|
||||
@ -1464,13 +1392,16 @@ var Marionette = (function (Backbone, _, $) {
|
||||
this.children.remove(view);
|
||||
}
|
||||
|
||||
this.triggerMethod("item:removed", view);
|
||||
},
|
||||
|
||||
// helper to show the empty view if the collection is empty
|
||||
checkEmpty: function () {
|
||||
// check if we're empty now, and if we are, show the
|
||||
// empty view
|
||||
if (!this.collection || this.collection.length === 0) {
|
||||
this.showEmptyView();
|
||||
}
|
||||
|
||||
this.triggerMethod("item:removed", view);
|
||||
},
|
||||
|
||||
// Append the HTML to the collection's `el`.
|
||||
@ -1505,9 +1436,7 @@ var Marionette = (function (Backbone, _, $) {
|
||||
this.children.each(function (child) {
|
||||
this.removeChildView(child);
|
||||
}, this);
|
||||
|
||||
// re-initialize to clean up after ourselves
|
||||
this._initChildViewStorage();
|
||||
this.checkEmpty();
|
||||
}
|
||||
});
|
||||
|
||||
@ -1845,14 +1774,13 @@ var Marionette = (function (Backbone, _, $) {
|
||||
// event aggregator as `app.vent`
|
||||
Marionette.Application = function (options) {
|
||||
this.initCallbacks = new Marionette.Callbacks();
|
||||
this.vent = new Marionette.EventAggregator();
|
||||
this.vent = new Backbone.Wreqr.EventAggregator();
|
||||
this.commands = new Backbone.Wreqr.Commands();
|
||||
this.reqres = new Backbone.Wreqr.RequestResponse();
|
||||
this.submodules = {};
|
||||
|
||||
_.extend(this, options);
|
||||
|
||||
Marionette.addEventBinder(this);
|
||||
this.triggerMethod = Marionette.triggerMethod;
|
||||
};
|
||||
|
||||
@ -1939,8 +1867,6 @@ var Marionette = (function (Backbone, _, $) {
|
||||
this.app = app;
|
||||
this.startWithParent = true;
|
||||
|
||||
// extend this module with an event binder
|
||||
Marionette.addEventBinder(this);
|
||||
this.triggerMethod = Marionette.triggerMethod;
|
||||
};
|
||||
|
||||
@ -2001,7 +1927,7 @@ var Marionette = (function (Backbone, _, $) {
|
||||
_.each(this.submodules, function (mod) { mod.stop(); });
|
||||
|
||||
// run the finalizers
|
||||
this._finalizerCallbacks.run();
|
||||
this._finalizerCallbacks.run(undefined, this);
|
||||
|
||||
// reset the initializers and finalizers
|
||||
this._initializerCallbacks.reset();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user