mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-07 10:07:48 +00:00
Update vendors, minified files, and docs.
Former-commit-id: 018dfcade1386aa84492f60c8404ea00c01cbe11
This commit is contained in:
180
vendor/backbone/backbone.js
vendored
180
vendor/backbone/backbone.js
vendored
@@ -184,22 +184,20 @@
|
||||
var Model = Backbone.Model = function(attributes, options) {
|
||||
var defaults;
|
||||
var attrs = attributes || {};
|
||||
if (options && options.collection) this.collection = options.collection;
|
||||
this.attributes = {};
|
||||
this._escapedAttributes = {};
|
||||
this.cid = _.uniqueId('c');
|
||||
this.changed = {};
|
||||
this._changes = {};
|
||||
this._pending = {};
|
||||
this.attributes = {};
|
||||
this._escapedAttributes = {};
|
||||
this._modelState = [];
|
||||
if (options && options.collection) this.collection = options.collection;
|
||||
if (options && options.parse) attrs = this.parse(attrs);
|
||||
if (defaults = _.result(this, 'defaults')) {
|
||||
attrs = _.extend({}, defaults, attrs);
|
||||
}
|
||||
this.set(attrs, {silent: true});
|
||||
// Reset change tracking.
|
||||
this.changed = {};
|
||||
this._changes = {};
|
||||
this._pending = {};
|
||||
this._cleanChange = true;
|
||||
this._modelState = [];
|
||||
this._currentState = _.clone(this.attributes);
|
||||
this._previousAttributes = _.clone(this.attributes);
|
||||
this.initialize.apply(this, arguments);
|
||||
};
|
||||
@@ -210,17 +208,26 @@
|
||||
// A hash of attributes whose current and previous value differ.
|
||||
changed: null,
|
||||
|
||||
// A hash of attributes that have changed since the last time `change`
|
||||
// was called.
|
||||
_changes: null,
|
||||
// Whether there is a pending request to fire in the final `change` loop.
|
||||
_pending: false,
|
||||
|
||||
// A hash of attributes that have changed since the last `change` event
|
||||
// began.
|
||||
_pending: null,
|
||||
// Whether the model is in the midst of a change cycle.
|
||||
_changing: false,
|
||||
|
||||
// A hash of attributes with the current model state to determine if
|
||||
// a `change` should be recorded within a nested `change` block.
|
||||
_changing : null,
|
||||
// Whether there has been a `set` call since the last
|
||||
// calculation of the changed hash, for efficiency.
|
||||
_cleanChange: true,
|
||||
|
||||
// The model state used for comparison in determining if a
|
||||
// change should be fired.
|
||||
_currentState: null,
|
||||
|
||||
// An array queue of all changes attributed to a model
|
||||
// on the next non-silent change event.
|
||||
_modelState: null,
|
||||
|
||||
// A hash of the model's attributes when the last `change` occured.
|
||||
_previousAttributes: null,
|
||||
|
||||
// The default name for the JSON `id` attribute is `"id"`. MongoDB and
|
||||
// CouchDB users may want to set this to `"_id"`.
|
||||
@@ -276,6 +283,7 @@
|
||||
// Extract attributes and options.
|
||||
var silent = options && options.silent;
|
||||
var unset = options && options.unset;
|
||||
|
||||
if (attrs instanceof Model) attrs = attrs.attributes;
|
||||
if (unset) for (attr in attrs) attrs[attr] = void 0;
|
||||
|
||||
@@ -285,38 +293,26 @@
|
||||
// Check for changes of `id`.
|
||||
if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
|
||||
|
||||
var changing = this._changing;
|
||||
var now = this.attributes;
|
||||
var escaped = this._escapedAttributes;
|
||||
var prev = this._previousAttributes || {};
|
||||
var esc = this._escapedAttributes;
|
||||
|
||||
// For each `set` attribute...
|
||||
for (attr in attrs) {
|
||||
val = attrs[attr];
|
||||
|
||||
// If the new and current value differ, record the change.
|
||||
if (!_.isEqual(now[attr], val) || (unset && _.has(now, attr))) {
|
||||
delete escaped[attr];
|
||||
this._changes[attr] = true;
|
||||
}
|
||||
// If an escaped attr exists, and the new and current value differ, remove the escaped attr.
|
||||
if (esc[attr] && !_.isEqual(now[attr], val) || (unset && _.has(now, attr))) delete esc[attr];
|
||||
|
||||
// Update or delete the current value.
|
||||
unset ? delete now[attr] : now[attr] = val;
|
||||
|
||||
// If the new and previous value differ, record the change. If not,
|
||||
// then remove changes for this attribute.
|
||||
if (!_.isEqual(prev[attr], val) || (_.has(now, attr) !== _.has(prev, attr))) {
|
||||
this.changed[attr] = val;
|
||||
if (!silent) this._pending[attr] = true;
|
||||
} else {
|
||||
delete this.changed[attr];
|
||||
delete this._pending[attr];
|
||||
if (!changing) delete this._changes[attr];
|
||||
}
|
||||
|
||||
if (changing && _.isEqual(now[attr], changing[attr])) delete this._changes[attr];
|
||||
// Track any action on the attribute.
|
||||
this._modelState.push(attr, val, unset);
|
||||
}
|
||||
|
||||
// Signal that the model's state has potentially changed.
|
||||
this._cleanChange = false;
|
||||
|
||||
// Fire the `"change"` events.
|
||||
if (!silent) this.change(options);
|
||||
return this;
|
||||
@@ -341,6 +337,7 @@
|
||||
// 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) {
|
||||
@@ -461,37 +458,23 @@
|
||||
// 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;
|
||||
var current = this._changing = {};
|
||||
var i, changing = this._changing;
|
||||
this._changing = true;
|
||||
|
||||
// Silent changes become pending changes.
|
||||
for (var attr in this._changes) this._pending[attr] = true;
|
||||
// Generate the changes to be triggered on the model.
|
||||
var triggers = this._changeCenter(true);
|
||||
this._pending = triggers.length;
|
||||
|
||||
// Trigger 'change:attr' for any new or silent changes.
|
||||
var changes = this._changes;
|
||||
this._changes = {};
|
||||
|
||||
// Set the correct state for this._changing values
|
||||
var triggers = [];
|
||||
for (var attr in changes) {
|
||||
current[attr] = this.get(attr);
|
||||
triggers.push(attr);
|
||||
for (i = triggers.length - 2; i >= 0; i -= 2) {
|
||||
this.trigger('change:' + triggers[i], this, triggers[i + 1], options);
|
||||
}
|
||||
|
||||
for (var i=0, l=triggers.length; i < l; i++) {
|
||||
this.trigger('change:' + triggers[i], this, current[triggers[i]], options);
|
||||
}
|
||||
if (changing) return this;
|
||||
|
||||
// Continue firing `"change"` events while there are pending changes.
|
||||
while (!_.isEmpty(this._pending)) {
|
||||
this._pending = {};
|
||||
// Trigger a `change` while there have been changes.
|
||||
while (this._pending) {
|
||||
this._pending = false;
|
||||
this.trigger('change', this, options);
|
||||
// Pending and silent changes still remain.
|
||||
for (var attr in this.changed) {
|
||||
if (this._pending[attr] || this._changes[attr]) continue;
|
||||
delete this.changed[attr];
|
||||
}
|
||||
this._previousAttributes = _.clone(this.attributes);
|
||||
}
|
||||
|
||||
@@ -502,6 +485,7 @@
|
||||
// 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._cleanChange) this._changeCenter();
|
||||
if (attr == null) return !_.isEmpty(this.changed);
|
||||
return _.has(this.changed, attr);
|
||||
},
|
||||
@@ -522,6 +506,42 @@
|
||||
return changed;
|
||||
},
|
||||
|
||||
// Calculates and handles any changes in `this._modelState`,
|
||||
// checking against `this._currentState` to determine current changes.
|
||||
_changeCenter: function (change) {
|
||||
this.changed = {};
|
||||
var local = {};
|
||||
var triggers = [];
|
||||
var modelState = this._modelState;
|
||||
var currentState = this._currentState;
|
||||
|
||||
// Loop through the current queue of potential model changes.
|
||||
for (var i = modelState.length - 3; i >= 0; i -= 3) {
|
||||
var key = modelState[i], val = modelState[i + 1], unset = modelState[i + 2];
|
||||
|
||||
// If the item hasn't been set locally this round, proceed.
|
||||
if (!local[key]) {
|
||||
local[key] = val;
|
||||
|
||||
// Check if the attribute has been modified since the last change,
|
||||
// and update `this.changed` accordingly.
|
||||
if (currentState[key] !== val || (_.has(currentState, key) && unset)) {
|
||||
this.changed[key] = val;
|
||||
|
||||
// Triggers & modifications are only created inside a `change` call.
|
||||
if (!change) continue;
|
||||
triggers.push(key, val);
|
||||
(!unset) ? currentState[key] = val : delete currentState[key];
|
||||
}
|
||||
}
|
||||
modelState.splice(i,3);
|
||||
}
|
||||
|
||||
// Signals `this.changed` is current to prevent duplicate calls from `this.hasChanged`.
|
||||
this._cleanChange = true;
|
||||
return triggers;
|
||||
},
|
||||
|
||||
// Get the previous value of an attribute, recorded at the time the last
|
||||
// `"change"` event was fired.
|
||||
previous: function(attr) {
|
||||
@@ -599,26 +619,27 @@
|
||||
// Add a model, or list of models to the set. Pass **silent** to avoid
|
||||
// firing the `add` event for every new model.
|
||||
add: function(models, options) {
|
||||
var i, args, length, model, existing;
|
||||
var i, args, length, model, existing, sort;
|
||||
var at = options && options.at;
|
||||
models = _.isArray(models) ? models.slice() : [models];
|
||||
|
||||
// Begin by turning bare objects into model references, and preventing
|
||||
// invalid models from being added.
|
||||
for (i = 0, length = models.length; i < length; i++) {
|
||||
if (models[i] = this._prepareModel(models[i], options)) continue;
|
||||
throw new Error("Can't add an invalid model to a collection");
|
||||
}
|
||||
|
||||
// Turn bare objects into model references, and prevent invalid models
|
||||
// from being added.
|
||||
for (i = models.length - 1; i >= 0; i--) {
|
||||
model = models[i];
|
||||
existing = model.id != null && this._byId[model.id];
|
||||
if(!(model = this._prepareModel(models[i], options))) {
|
||||
this.trigger("error", this, models[i], options);
|
||||
models.splice(i, 1);
|
||||
continue;
|
||||
}
|
||||
models[i] = model;
|
||||
|
||||
// If a duplicate is found, splice it out and optionally merge it into
|
||||
// the existing 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, options);
|
||||
sort = true;
|
||||
}
|
||||
models.splice(i, 1);
|
||||
continue;
|
||||
@@ -631,14 +652,15 @@
|
||||
if (model.id != null) this._byId[model.id] = model;
|
||||
}
|
||||
|
||||
// Update `length` and splice in new models.
|
||||
// See if sorting is needed, update `length` and splice in new models.
|
||||
if (models.length) sort = true;
|
||||
this.length += models.length;
|
||||
args = [at != null ? at : this.models.length, 0];
|
||||
push.apply(args, models);
|
||||
splice.apply(this.models, args);
|
||||
|
||||
// Sort the collection if appropriate.
|
||||
if (this.comparator && at == null) this.sort({silent: true});
|
||||
if (sort && this.comparator && at == null) this.sort({silent: true});
|
||||
|
||||
if (options && options.silent) return this;
|
||||
|
||||
@@ -821,7 +843,7 @@
|
||||
},
|
||||
|
||||
// Reset all internal state. Called when the collection is reset.
|
||||
_reset: function(options) {
|
||||
_reset: function() {
|
||||
this.length = 0;
|
||||
this.models = [];
|
||||
this._byId = {};
|
||||
@@ -1313,7 +1335,7 @@
|
||||
// Keys with special meaning *(model, collection, id, className)*, are
|
||||
// attached directly to the view.
|
||||
_configure: function(options) {
|
||||
if (this.options) options = _.extend({}, this.options, options);
|
||||
if (this.options) options = _.extend({}, _.result(this, 'options'), options);
|
||||
_.extend(this, _.pick(options, viewOptions));
|
||||
this.options = options;
|
||||
},
|
||||
@@ -1381,7 +1403,7 @@
|
||||
// Ensure that we have the appropriate request data.
|
||||
if (!options.data && model && (method === 'create' || method === 'update')) {
|
||||
params.contentType = 'application/json';
|
||||
params.data = JSON.stringify(model);
|
||||
params.data = JSON.stringify(model.toJSON(options));
|
||||
}
|
||||
|
||||
// For older servers, emulate JSON by encoding the request into an HTML-form.
|
||||
|
||||
42
vendor/backbone/test/collection.js
vendored
42
vendor/backbone/test/collection.js
vendored
@@ -542,8 +542,7 @@ $(document).ready(function() {
|
||||
equal(col.length, 0);
|
||||
});
|
||||
|
||||
test("#861, adding models to a collection which do not pass validation", 1, function() {
|
||||
raises(function() {
|
||||
test("#861, adding models to a collection which do not pass validation", 2, function() {
|
||||
var Model = Backbone.Model.extend({
|
||||
validate: function(attrs) {
|
||||
if (attrs.id == 3) return "id can't be 3";
|
||||
@@ -554,26 +553,26 @@ $(document).ready(function() {
|
||||
model: Model
|
||||
});
|
||||
|
||||
var col = new Collection;
|
||||
var collection = new Collection;
|
||||
collection.on("error", function() { ok(true); });
|
||||
|
||||
col.add([{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}]);
|
||||
}, function(e) {
|
||||
return e.message === "Can't add an invalid model to a collection";
|
||||
});
|
||||
collection.add([{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}]);
|
||||
deepEqual(collection.pluck('id'), [1, 2, 4, 5, 6]);
|
||||
});
|
||||
|
||||
test("throwing during add leaves consistent state", 4, function() {
|
||||
var col = new Backbone.Collection();
|
||||
col.on('test', function() { ok(false); });
|
||||
col.model = Backbone.Model.extend({
|
||||
test("Invalid models are discarded.", 5, function() {
|
||||
var collection = new Backbone.Collection;
|
||||
collection.on('test', function() { ok(true); });
|
||||
collection.model = Backbone.Model.extend({
|
||||
validate: function(attrs){ if (!attrs.valid) return 'invalid'; }
|
||||
});
|
||||
var model = new col.model({id: 1, valid: true});
|
||||
raises(function() { col.add([model, {id: 2}]); });
|
||||
var model = new collection.model({id: 1, valid: true});
|
||||
collection.add([model, {id: 2}]);;
|
||||
model.trigger('test');
|
||||
ok(!col.getByCid(model.cid));
|
||||
ok(!col.get(1));
|
||||
equal(col.length, 0);
|
||||
ok(collection.getByCid(model.cid));
|
||||
ok(collection.get(1));
|
||||
ok(!collection.get(2));
|
||||
equal(collection.length, 1);
|
||||
});
|
||||
|
||||
test("multiple copies of the same model", 3, function() {
|
||||
@@ -716,4 +715,15 @@ $(document).ready(function() {
|
||||
this.ajaxSettings.success([model]);
|
||||
});
|
||||
|
||||
test("`sort` shouldn't always fire on `add`", 1, function() {
|
||||
var c = new Backbone.Collection([{id: 1}, {id: 2}, {id: 3}], {
|
||||
comparator: 'id'
|
||||
});
|
||||
c.sort = function(){ ok(true); };
|
||||
c.add([]);
|
||||
c.add({id: 1});
|
||||
c.add([{id: 2}, {id: 3}]);
|
||||
c.add({id: 4});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
14
vendor/backbone/test/model.js
vendored
14
vendor/backbone/test/model.js
vendored
@@ -903,4 +903,18 @@ $(document).ready(function() {
|
||||
expect(0);
|
||||
});
|
||||
|
||||
test("silent changes in last `change` event back to original does not trigger change", 2, function() {
|
||||
var changes = [];
|
||||
var model = new Backbone.Model();
|
||||
model.on('change:a change:b change:c', function(model, val) { changes.push(val); });
|
||||
model.on('change', function() {
|
||||
model.set({a:'c'}, {silent:true});
|
||||
});
|
||||
model.set({a:'a'});
|
||||
deepEqual(changes, ['a']);
|
||||
model.set({a:'a'}, {silent:true});
|
||||
model.change();
|
||||
deepEqual(changes, ['a']);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
24
vendor/backbone/test/view.js
vendored
24
vendor/backbone/test/view.js
vendored
@@ -165,6 +165,30 @@ $(document).ready(function() {
|
||||
strictEqual(new View().el.id, 'id');
|
||||
});
|
||||
|
||||
test("with options function", 3, function() {
|
||||
var View1 = Backbone.View.extend({
|
||||
options: function() {
|
||||
return {
|
||||
title: 'title1',
|
||||
acceptText: 'confirm'
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
var View2 = View1.extend({
|
||||
options: function() {
|
||||
return _.extend(View1.prototype.options.call(this), {
|
||||
title: 'title2',
|
||||
fixed: true
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
strictEqual(new View2().options.title, 'title2');
|
||||
strictEqual(new View2().options.acceptText, 'confirm');
|
||||
strictEqual(new View2().options.fixed, true);
|
||||
});
|
||||
|
||||
test("with attributes", 2, function() {
|
||||
var View = Backbone.View.extend({
|
||||
attributes: {
|
||||
|
||||
82
vendor/requirejs/require.js
vendored
82
vendor/requirejs/require.js
vendored
@@ -1,5 +1,5 @@
|
||||
/** vim: et:ts=4:sw=4:sts=4
|
||||
* @license RequireJS 2.1.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||
* @license RequireJS 2.1.2 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||
* Available via the MIT or new BSD license.
|
||||
* see: http://github.com/jrburke/requirejs for details
|
||||
*/
|
||||
@@ -12,7 +12,7 @@ var requirejs, require, define;
|
||||
(function (global) {
|
||||
var req, s, head, baseElement, dataMain, src,
|
||||
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
||||
version = '2.1.1',
|
||||
version = '2.1.2',
|
||||
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
||||
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
||||
jsSuffixRegExp = /\.js$/,
|
||||
@@ -81,6 +81,10 @@ var requirejs, require, define;
|
||||
return hasOwn.call(obj, prop);
|
||||
}
|
||||
|
||||
function getOwn(obj, prop) {
|
||||
return hasProp(obj, prop) && obj[prop];
|
||||
}
|
||||
|
||||
/**
|
||||
* Cycles over properties in an object and calls a function for each
|
||||
* property value. If the function returns a truthy value, then the
|
||||
@@ -89,7 +93,7 @@ var requirejs, require, define;
|
||||
function eachProp(obj, func) {
|
||||
var prop;
|
||||
for (prop in obj) {
|
||||
if (obj.hasOwnProperty(prop)) {
|
||||
if (hasProp(obj, prop)) {
|
||||
if (func(obj[prop], prop)) {
|
||||
break;
|
||||
}
|
||||
@@ -261,7 +265,7 @@ var requirejs, require, define;
|
||||
//otherwise, assume it is a top-level require that will
|
||||
//be relative to baseUrl in the end.
|
||||
if (baseName) {
|
||||
if (config.pkgs[baseName]) {
|
||||
if (getOwn(config.pkgs, baseName)) {
|
||||
//If the baseName is a package name, then just treat it as one
|
||||
//name to concat the name with.
|
||||
normalizedBaseParts = baseParts = [baseName];
|
||||
@@ -279,7 +283,7 @@ var requirejs, require, define;
|
||||
|
||||
//Some use of packages may use a . path to reference the
|
||||
//'main' module name, so normalize for that.
|
||||
pkgConfig = config.pkgs[(pkgName = name[0])];
|
||||
pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
|
||||
name = name.join('/');
|
||||
if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
|
||||
name = pkgName;
|
||||
@@ -302,12 +306,12 @@ var requirejs, require, define;
|
||||
//Find the longest baseName segment match in the config.
|
||||
//So, do joins on the biggest to smallest lengths of baseParts.
|
||||
for (j = baseParts.length; j > 0; j -= 1) {
|
||||
mapValue = map[baseParts.slice(0, j).join('/')];
|
||||
mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
|
||||
|
||||
//baseName segment has config, find if it has one for
|
||||
//this name.
|
||||
if (mapValue) {
|
||||
mapValue = mapValue[nameSegment];
|
||||
mapValue = getOwn(mapValue, nameSegment);
|
||||
if (mapValue) {
|
||||
//Match, update name to the new value.
|
||||
foundMap = mapValue;
|
||||
@@ -325,8 +329,8 @@ var requirejs, require, define;
|
||||
//Check for a star map match, but just hold on to it,
|
||||
//if there is a shorter segment match later in a matching
|
||||
//config, then favor over this star map.
|
||||
if (!foundStarMap && starMap && starMap[nameSegment]) {
|
||||
foundStarMap = starMap[nameSegment];
|
||||
if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
|
||||
foundStarMap = getOwn(starMap, nameSegment);
|
||||
starI = i;
|
||||
}
|
||||
}
|
||||
@@ -358,7 +362,7 @@ var requirejs, require, define;
|
||||
}
|
||||
|
||||
function hasPathFallback(id) {
|
||||
var pathConfig = config.paths[id];
|
||||
var pathConfig = getOwn(config.paths, id);
|
||||
if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
|
||||
removeScript(id);
|
||||
//Pop off the first array value, since it failed, and
|
||||
@@ -419,7 +423,7 @@ var requirejs, require, define;
|
||||
|
||||
if (prefix) {
|
||||
prefix = normalize(prefix, parentName, applyMap);
|
||||
pluginModule = defined[prefix];
|
||||
pluginModule = getOwn(defined, prefix);
|
||||
}
|
||||
|
||||
//Account for relative paths if there is a base name.
|
||||
@@ -472,7 +476,7 @@ var requirejs, require, define;
|
||||
|
||||
function getModule(depMap) {
|
||||
var id = depMap.id,
|
||||
mod = registry[id];
|
||||
mod = getOwn(registry, id);
|
||||
|
||||
if (!mod) {
|
||||
mod = registry[id] = new context.Module(depMap);
|
||||
@@ -483,7 +487,7 @@ var requirejs, require, define;
|
||||
|
||||
function on(depMap, name, fn) {
|
||||
var id = depMap.id,
|
||||
mod = registry[id];
|
||||
mod = getOwn(registry, id);
|
||||
|
||||
if (hasProp(defined, id) &&
|
||||
(!mod || mod.defineEmitComplete)) {
|
||||
@@ -503,7 +507,7 @@ var requirejs, require, define;
|
||||
errback(err);
|
||||
} else {
|
||||
each(ids, function (id) {
|
||||
var mod = registry[id];
|
||||
var mod = getOwn(registry, id);
|
||||
if (mod) {
|
||||
//Set error on module, so it skips timeout checks.
|
||||
mod.error = err;
|
||||
@@ -562,7 +566,7 @@ var requirejs, require, define;
|
||||
id: mod.map.id,
|
||||
uri: mod.map.url,
|
||||
config: function () {
|
||||
return (config.config && config.config[mod.map.id]) || {};
|
||||
return (config.config && getOwn(config.config, mod.map.id)) || {};
|
||||
},
|
||||
exports: defined[mod.map.id]
|
||||
});
|
||||
@@ -584,14 +588,14 @@ var requirejs, require, define;
|
||||
traced[id] = true;
|
||||
each(mod.depMaps, function (depMap, i) {
|
||||
var depId = depMap.id,
|
||||
dep = registry[depId];
|
||||
dep = getOwn(registry, depId);
|
||||
|
||||
//Only force things that have not completed
|
||||
//being defined, so still in the registry,
|
||||
//and only if it has not been matched up
|
||||
//in the module already.
|
||||
if (dep && !mod.depMatched[i] && !processed[depId]) {
|
||||
if (traced[depId]) {
|
||||
if (getOwn(traced, depId)) {
|
||||
mod.defineDep(i, defined[depId]);
|
||||
mod.check(); //pass false?
|
||||
} else {
|
||||
@@ -691,9 +695,9 @@ var requirejs, require, define;
|
||||
}
|
||||
|
||||
Module = function (map) {
|
||||
this.events = undefEvents[map.id] || {};
|
||||
this.events = getOwn(undefEvents, map.id) || {};
|
||||
this.map = map;
|
||||
this.shim = config.shim[map.id];
|
||||
this.shim = getOwn(config.shim, map.id);
|
||||
this.depExports = [];
|
||||
this.depMaps = [];
|
||||
this.depMatched = [];
|
||||
@@ -940,7 +944,7 @@ var requirejs, require, define;
|
||||
});
|
||||
}));
|
||||
|
||||
normalizedMod = registry[normalizedMap.id];
|
||||
normalizedMod = getOwn(registry, normalizedMap.id);
|
||||
if (normalizedMod) {
|
||||
//Mark this as a dependency for this plugin, so it
|
||||
//can be traced for cycles.
|
||||
@@ -1005,6 +1009,11 @@ var requirejs, require, define;
|
||||
//it.
|
||||
getModule(moduleMap);
|
||||
|
||||
//Transfer any config to this other module.
|
||||
if (hasProp(config.config, id)) {
|
||||
config.config[moduleName] = config.config[id];
|
||||
}
|
||||
|
||||
try {
|
||||
req.exec(text);
|
||||
} catch (e) {
|
||||
@@ -1060,7 +1069,7 @@ var requirejs, require, define;
|
||||
!this.skipMap);
|
||||
this.depMaps[i] = depMap;
|
||||
|
||||
handler = handlers[depMap.id];
|
||||
handler = getOwn(handlers, depMap.id);
|
||||
|
||||
if (handler) {
|
||||
this.depExports[i] = handler(this);
|
||||
@@ -1085,7 +1094,7 @@ var requirejs, require, define;
|
||||
//Skip special modules like 'require', 'exports', 'module'
|
||||
//Also, don't call enable if it is already enabled,
|
||||
//important in circular dependency cases.
|
||||
if (!handlers[id] && mod && !mod.enabled) {
|
||||
if (!hasProp(handlers, id) && mod && !mod.enabled) {
|
||||
context.enable(depMap, this);
|
||||
}
|
||||
}));
|
||||
@@ -1093,7 +1102,7 @@ var requirejs, require, define;
|
||||
//Enable each plugin that is used in
|
||||
//a dependency
|
||||
eachProp(this.pluginMaps, bind(this, function (pluginMap) {
|
||||
var mod = registry[pluginMap.id];
|
||||
var mod = getOwn(registry, pluginMap.id);
|
||||
if (mod && !mod.enabled) {
|
||||
context.enable(pluginMap, this);
|
||||
}
|
||||
@@ -1126,7 +1135,10 @@ var requirejs, require, define;
|
||||
};
|
||||
|
||||
function callGetModule(args) {
|
||||
getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
|
||||
//Skip modules already defined.
|
||||
if (!hasProp(defined, args[0])) {
|
||||
getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
|
||||
}
|
||||
}
|
||||
|
||||
function removeListener(node, func, name, ieName) {
|
||||
@@ -1239,7 +1251,7 @@ var requirejs, require, define;
|
||||
deps: value
|
||||
};
|
||||
}
|
||||
if (value.exports && !value.exportsFn) {
|
||||
if ((value.exports || value.init) && !value.exportsFn) {
|
||||
value.exportsFn = context.makeShimExports(value);
|
||||
}
|
||||
shim[id] = value;
|
||||
@@ -1301,7 +1313,7 @@ var requirejs, require, define;
|
||||
if (value.init) {
|
||||
ret = value.init.apply(global, arguments);
|
||||
}
|
||||
return ret || getGlobal(value.exports);
|
||||
return ret || (value.exports && getGlobal(value.exports));
|
||||
}
|
||||
return fn;
|
||||
},
|
||||
@@ -1325,7 +1337,7 @@ var requirejs, require, define;
|
||||
//If require|exports|module are requested, get the
|
||||
//value for them from the special handlers. Caveat:
|
||||
//this only works while module is being defined.
|
||||
if (relMap && handlers[deps]) {
|
||||
if (relMap && hasProp(handlers, deps)) {
|
||||
return handlers[deps](registry[relMap.id]);
|
||||
}
|
||||
|
||||
@@ -1413,7 +1425,7 @@ var requirejs, require, define;
|
||||
takeGlobalQueue();
|
||||
|
||||
var map = makeModuleMap(id, relMap, true),
|
||||
mod = registry[id];
|
||||
mod = getOwn(registry, id);
|
||||
|
||||
delete defined[id];
|
||||
delete urlFetched[map.url];
|
||||
@@ -1441,7 +1453,7 @@ var requirejs, require, define;
|
||||
* used by the optimizer.
|
||||
*/
|
||||
enable: function (depMap, parent) {
|
||||
var mod = registry[depMap.id];
|
||||
var mod = getOwn(registry, depMap.id);
|
||||
if (mod) {
|
||||
getModule(depMap).enable();
|
||||
}
|
||||
@@ -1455,7 +1467,7 @@ var requirejs, require, define;
|
||||
*/
|
||||
completeLoad: function (moduleName) {
|
||||
var found, args, mod,
|
||||
shim = config.shim[moduleName] || {},
|
||||
shim = getOwn(config.shim, moduleName) || {},
|
||||
shExports = shim.exports;
|
||||
|
||||
takeGlobalQueue();
|
||||
@@ -1481,9 +1493,9 @@ var requirejs, require, define;
|
||||
|
||||
//Do this after the cycle of callGetModule in case the result
|
||||
//of those calls/init calls changes the registry.
|
||||
mod = registry[moduleName];
|
||||
mod = getOwn(registry, moduleName);
|
||||
|
||||
if (!found && !defined[moduleName] && mod && !mod.inited) {
|
||||
if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
|
||||
if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
|
||||
if (hasPathFallback(moduleName)) {
|
||||
return;
|
||||
@@ -1534,8 +1546,8 @@ var requirejs, require, define;
|
||||
//and work up from it.
|
||||
for (i = syms.length; i > 0; i -= 1) {
|
||||
parentModule = syms.slice(0, i).join('/');
|
||||
pkg = pkgs[parentModule];
|
||||
parentPath = paths[parentModule];
|
||||
pkg = getOwn(pkgs, parentModule);
|
||||
parentPath = getOwn(paths, parentModule);
|
||||
if (parentPath) {
|
||||
//If an array, it means there are a few choices,
|
||||
//Choose the one that is desired
|
||||
@@ -1660,7 +1672,7 @@ var requirejs, require, define;
|
||||
contextName = config.context;
|
||||
}
|
||||
|
||||
context = contexts[contextName];
|
||||
context = getOwn(contexts, contextName);
|
||||
if (!context) {
|
||||
context = contexts[contextName] = req.s.newContext(contextName);
|
||||
}
|
||||
|
||||
7
vendor/underscore/test/collections.js
vendored
7
vendor/underscore/test/collections.js
vendored
@@ -418,6 +418,13 @@ $(document).ready(function() {
|
||||
|
||||
var numbers = _.toArray({one : 1, two : 2, three : 3});
|
||||
equal(numbers.join(', '), '1, 2, 3', 'object flattened into array');
|
||||
|
||||
// test in IE < 9
|
||||
try {
|
||||
var actual = _.toArray(document.childNodes);
|
||||
} catch(ex) { }
|
||||
|
||||
ok(_.isArray(actual), 'should not throw converting a node list');
|
||||
});
|
||||
|
||||
test('size', function() {
|
||||
|
||||
4
vendor/underscore/test/functions.js
vendored
4
vendor/underscore/test/functions.js
vendored
@@ -34,8 +34,10 @@ $(document).ready(function() {
|
||||
// To test this with a modern browser, set underscore's nativeBind to undefined
|
||||
var F = function () { return this; };
|
||||
var Boundf = _.bind(F, {hello: "moe curly"});
|
||||
equal(new Boundf().hello, undefined, "function should not be bound to the context, to comply with ECMAScript 5");
|
||||
var newBoundf = new Boundf();
|
||||
equal(newBoundf.hello, undefined, "function should not be bound to the context, to comply with ECMAScript 5");
|
||||
equal(Boundf().hello, "moe curly", "When called without the new operator, it's OK to be bound to the context");
|
||||
ok(newBoundf instanceof Boundf && newBoundf instanceof F, "a bound instance is an instance of the bound and original function");
|
||||
});
|
||||
|
||||
test("bindAll", function() {
|
||||
|
||||
2
vendor/underscore/underscore-min.js
vendored
2
vendor/underscore/underscore-min.js
vendored
File diff suppressed because one or more lines are too long
22
vendor/underscore/underscore.js
vendored
22
vendor/underscore/underscore.js
vendored
@@ -358,7 +358,8 @@
|
||||
// Safely convert anything iterable into a real, live array.
|
||||
_.toArray = function(obj) {
|
||||
if (!obj) return [];
|
||||
if (obj.length === +obj.length) return slice.call(obj);
|
||||
if (_.isArray(obj)) return slice.call(obj);
|
||||
if (obj.length === +obj.length) return _.map(obj, _.identity);
|
||||
return _.values(obj);
|
||||
};
|
||||
|
||||
@@ -408,7 +409,7 @@
|
||||
|
||||
// Trim out all falsy values from an array.
|
||||
_.compact = function(array) {
|
||||
return _.filter(array, function(value){ return !!value; });
|
||||
return _.filter(array, _.identity);
|
||||
};
|
||||
|
||||
// Internal implementation of a recursive `flatten` function.
|
||||
@@ -573,18 +574,21 @@
|
||||
// Delegates to **ECMAScript 5**'s native `Function.bind` if available.
|
||||
// We check for `func.bind` first, to fail fast when `func` is undefined.
|
||||
_.bind = function bind(func, context) {
|
||||
var bound, args;
|
||||
if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
|
||||
if (!_.isFunction(func)) throw new TypeError;
|
||||
args = slice.call(arguments, 2);
|
||||
return bound = function() {
|
||||
var args = slice.call(arguments, 2);
|
||||
var bound = function() {
|
||||
if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
|
||||
ctor.prototype = func.prototype;
|
||||
var self = new ctor;
|
||||
var result = func.apply(self, args.concat(slice.call(arguments)));
|
||||
var result = func.apply(this, args.concat(slice.call(arguments)));
|
||||
if (Object(result) === result) return result;
|
||||
return self;
|
||||
return this;
|
||||
};
|
||||
if (func && func.prototype) {
|
||||
ctor.prototype = func.prototype;
|
||||
bound.prototype = new ctor;
|
||||
ctor.prototype = null;
|
||||
}
|
||||
return bound;
|
||||
};
|
||||
|
||||
// Bind all of an object's methods to that object. Useful for ensuring that
|
||||
|
||||
Reference in New Issue
Block a user