* Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
@@ -517,7 +517,7 @@
clearTimeout = context.clearTimeout,
floor = Math.floor,
fnToString = Function.prototype.toString,
- getPrototypeOf = reNative.test(getPrototypeOf = Object.getPrototypeOf) && getPrototypeOf,
+ getPrototypeOf = isNative(getPrototypeOf = Object.getPrototypeOf) && getPrototypeOf,
hasOwnProperty = objectProto.hasOwnProperty,
push = arrayRef.push,
propertyIsEnumerable = objectProto.propertyIsEnumerable,
@@ -530,18 +530,18 @@
// IE 8 only accepts DOM elements
try {
var o = {},
- func = reNative.test(func = Object.defineProperty) && func,
+ func = isNative(func = Object.defineProperty) && func,
result = func(o, o, o) && func;
} catch(e) { }
return result;
}());
/* Native method shortcuts for methods with the same name as other `lodash` methods */
- var nativeCreate = reNative.test(nativeCreate = Object.create) && nativeCreate,
- nativeIsArray = reNative.test(nativeIsArray = Array.isArray) && nativeIsArray,
+ var nativeCreate = isNative(nativeCreate = Object.create) && nativeCreate,
+ nativeIsArray = isNative(nativeIsArray = Array.isArray) && nativeIsArray,
nativeIsFinite = context.isFinite,
nativeIsNaN = context.isNaN,
- nativeKeys = reNative.test(nativeKeys = Object.keys) && nativeKeys,
+ nativeKeys = isNative(nativeKeys = Object.keys) && nativeKeys,
nativeMax = Math.max,
nativeMin = Math.min,
nativeParseInt = context.parseInt,
@@ -729,7 +729,7 @@
* @memberOf _.support
* @type boolean
*/
- support.funcDecomp = !reNative.test(context.WinRTError) && reThis.test(runInContext);
+ support.funcDecomp = !isNative(context.WinRTError) && reThis.test(runInContext);
/**
* Detect if `Function#name` is supported (all but IE).
@@ -1004,7 +1004,10 @@
// `Function#bind` spec
// http://es5.github.io/#x15.3.4.5
if (partialArgs) {
- var args = partialArgs.slice();
+ // avoid `arguments` object deoptimizations by using `slice` instead
+ // of `Array.prototype.slice.call` and not assigning `arguments` to a
+ // variable as a ternary expression
+ var args = slice(partialArgs);
push.apply(args, arguments);
}
// mimic the constructor's `return` behavior
@@ -1221,7 +1224,7 @@
function bound() {
var thisBinding = isBind ? thisArg : this;
if (partialArgs) {
- var args = partialArgs.slice();
+ var args = slice(partialArgs);
push.apply(args, arguments);
}
if (partialRightArgs || isCurry) {
@@ -1446,51 +1449,54 @@
// recursively compare objects and arrays (susceptible to call stack limits)
if (isArr) {
+ // compare lengths to determine if a deep comparison is necessary
length = a.length;
size = b.length;
-
- // compare lengths to determine if a deep comparison is necessary
- result = size == a.length;
- if (!result && !isWhere) {
- return result;
- }
- // deep compare the contents, ignoring non-numeric properties
- while (size--) {
- var index = length,
- value = b[size];
-
- if (isWhere) {
- while (index--) {
- if ((result = baseIsEqual(a[index], value, callback, isWhere, stackA, stackB))) {
- break;
+ result = size == length;
+
+ if (result || isWhere) {
+ // deep compare the contents, ignoring non-numeric properties
+ while (size--) {
+ var index = length,
+ value = b[size];
+
+ if (isWhere) {
+ while (index--) {
+ if ((result = baseIsEqual(a[index], value, callback, isWhere, stackA, stackB))) {
+ break;
+ }
}
+ } else if (!(result = baseIsEqual(a[size], value, callback, isWhere, stackA, stackB))) {
+ break;
}
- } else if (!(result = baseIsEqual(a[size], value, callback, isWhere, stackA, stackB))) {
- break;
}
}
- return result;
}
- // deep compare objects using `forIn`, instead of `forOwn`, to avoid `Object.keys`
- // which, in this case, is more costly
- forIn(b, function(value, key, b) {
- if (hasOwnProperty.call(b, key)) {
- // count the number of properties.
- size++;
- // deep compare each property value.
- return (result = hasOwnProperty.call(a, key) && baseIsEqual(a[key], value, callback, isWhere, stackA, stackB));
- }
- });
-
- if (result && !isWhere) {
- // ensure both objects have the same number of properties
- forIn(a, function(value, key, a) {
- if (hasOwnProperty.call(a, key)) {
- // `size` will be `-1` if `a` has more properties than `b`
- return (result = --size > -1);
+ else {
+ // deep compare objects using `forIn`, instead of `forOwn`, to avoid `Object.keys`
+ // which, in this case, is more costly
+ forIn(b, function(value, key, b) {
+ if (hasOwnProperty.call(b, key)) {
+ // count the number of properties.
+ size++;
+ // deep compare each property value.
+ return (result = hasOwnProperty.call(a, key) && baseIsEqual(a[key], value, callback, isWhere, stackA, stackB));
}
});
+
+ if (result && !isWhere) {
+ // ensure both objects have the same number of properties
+ forIn(a, function(value, key, a) {
+ if (hasOwnProperty.call(a, key)) {
+ // `size` will be `-1` if `a` has more properties than `b`
+ return (result = --size > -1);
+ }
+ });
+ }
}
+ stackA.pop();
+ stackB.pop();
+
if (initedStack) {
releaseArray(stackA);
releaseArray(stackB);
@@ -1597,13 +1603,8 @@
if (isLarge) {
var cache = createCache(seen);
- if (cache) {
- indexOf = cacheIndexOf;
- seen = cache;
- } else {
- isLarge = false;
- seen = callback ? seen : (releaseArray(seen), result);
- }
+ indexOf = cacheIndexOf;
+ seen = cache;
}
while (++index < length) {
var value = array[index],
@@ -1703,8 +1704,14 @@
}
var bindData = func && func.__bindData__;
if (bindData && bindData !== true) {
- bindData = bindData.slice();
-
+ // clone `bindData`
+ bindData = slice(bindData);
+ if (bindData[2]) {
+ bindData[2] = slice(bindData[2]);
+ }
+ if (bindData[3]) {
+ bindData[3] = slice(bindData[3]);
+ }
// set `thisBinding` is not previously bound
if (isBind && !(bindData[1] & 1)) {
bindData[4] = thisArg;
@@ -1723,7 +1730,7 @@
}
// append partial right arguments
if (isPartialRight) {
- push.apply(bindData[3] || (bindData[3] = []), partialRightArgs);
+ unshift.apply(bindData[3] || (bindData[3] = []), partialRightArgs);
}
// merge flags
bindData[1] |= bitmask;
@@ -1807,6 +1814,17 @@
return result;
}
+ /**
+ * Checks if `value` is a native function.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if the `value` is a native function, else `false`.
+ */
+ function isNative(value) {
+ return typeof value == 'function' && reNative.test(value);
+ }
+
/**
* Sets `this` binding data on a given function.
*
@@ -2858,7 +2876,7 @@
return false;
}
var valueOf = value.valueOf,
- objProto = typeof valueOf == 'function' && (objProto = getPrototypeOf(valueOf)) && getPrototypeOf(objProto);
+ objProto = isNative(valueOf) && (objProto = getPrototypeOf(valueOf)) && getPrototypeOf(objProto);
return objProto
? (value == objProto || getPrototypeOf(value) == objProto)
@@ -5361,7 +5379,7 @@
}
/**
- * Creates an array that is the smymetric difference of the provided arrays.
+ * Creates an array that is the symmetric difference of the provided arrays.
* See http://en.wikipedia.org/wiki/Symmetric_difference.
*
* @static
@@ -6330,7 +6348,7 @@
* _.defer(function() { console.log(_.now() - stamp); });
* // => logs the number of milliseconds it took for the deferred function to be called
*/
- var now = reNative.test(now = Date.now) && now || function() {
+ var now = isNative(now = Date.now) && now || function() {
return new Date().getTime();
};
@@ -7057,7 +7075,7 @@
* @memberOf _
* @type string
*/
- lodash.VERSION = '2.4.0';
+ lodash.VERSION = '2.4.1';
// add "Chaining" functions to the wrapper
lodash.prototype.chain = wrapperChain;
diff --git a/package.json b/package.json
index bec82e5179..499f5212a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "lodash",
- "version": "2.4.0",
+ "version": "2.4.1",
"description": "A utility library delivering consistency, customization, performance, & extras.",
"homepage": "http://lodash.com/",
"license": "MIT",
diff --git a/test/asset/qunit-extras.js b/test/asset/qunit-extras.js
deleted file mode 100644
index 3f54a89396..0000000000
--- a/test/asset/qunit-extras.js
+++ /dev/null
@@ -1,198 +0,0 @@
-;(function(root, undefined) {
- 'use strict';
-
- /** Native method shortcut */
- var unshift = Array.prototype.unshift;
-
- /** Used to match HTML entities */
- var reEscapedHtml = /(&|<|>|"|')/g;
-
- /** Used to match parts of the assert message */
- var reDied = /^Died on test #\d+/,
- reExpected = /Expected: *<\/th>([\s\S]*?)<\/pre>/,
- reMessage = /^([\s\S]*?)<\/span>/;
-
- /** Used to convert HTML entities to characters */
- var htmlUnescapes = {
- '&': '&',
- '<': '<',
- '>': '>',
- '"': '"',
- ''': "'"
- };
-
- /** Detect free variable `exports` */
- var freeExports = typeof exports == 'object' && exports;
-
- /** Detect free variable `global`, from Node.js or Browserified code, and use it as `root` */
- var freeGlobal = typeof global == 'object' && global;
- if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
- root = freeGlobal;
- }
-
- /*--------------------------------------------------------------------------*/
-
- /**
- * Checks if a given value is present in an array using strict equality
- * for comparisons, i.e. `===`.
- *
- * @oruvate
- * @param {Array} array The array to iterate over.
- * @param {*} target The value to check for.
- * @returns {boolean} Returns `true` if the `target` element is found, else `false`.
- */
- function contains(array, value) {
- var index = -1,
- length = array ? array.length : 0;
-
- while (++index < length) {
- if (array[index] === value) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Resolves the value of `property` on `object`. If `object` is falsey then
- * `undefined` is returned.
- *
- * @private
- * @param {Object} object The object to inspect.
- * @param {string} property The property to get the value of.
- * @returns {*} Returns the resolved value.
- */
- function result(object, property) {
- return object ? object[property] : undefined;
- }
-
- /**
- * Converts the HTML entities `&`, `<`, `>`, `"`, and `'`
- * in `string` to their corresponding characters.
- *
- * @private
- * @param {string} string The string to unescape.
- * @returns {string} Returns the unescaped string.
- */
- function unescape(string) {
- return string == null ? '' : String(string).replace(reEscapedHtml, unescapeHtmlChar);
- }
-
- /**
- * Used by `unescape` to convert HTML entities to characters.
- *
- * @private
- * @param {string} match The matched character to unescape.
- * @returns {string} Returns the unescaped character.
- */
- function unescapeHtmlChar(match) {
- return htmlUnescapes[match];
- }
-
- /*--------------------------------------------------------------------------*/
-
- /**
- * Installs the QUnit additions on the given `context` object.
- *
- * @memberOf exports
- * @param {Object} context The context object.
- */
- function runInContext(context) {
- // exit early if no `context` is provided or if `QUnit` does not exist
- if (!context || !context.QUnit) {
- return;
- }
-
- /** Shorten `context.QUnit.QUnit` to `context.QUnit` */
- var QUnit = context.QUnit = context.QUnit.QUnit || context.QUnit;
-
- /** The number of retries async tests have to succeed */
- QUnit.config.asyncRetries = 0;
-
- /** An object of excused tests and assertions */
- QUnit.config.excused = {};
-
- /**
- * A callback triggered at the start of every test.
- *
- * @memberOf QUnit
- * @param {Object} details An object with `module` and `name` properties.
- */
- QUnit.testStart(function(details) {
- var excused = QUnit.config.excused || {},
- excusedTests = excused[details.module],
- excusedAsserts = excusedTests && excusedTests[details.name];
-
- var test = QUnit.config.current,
- finish = test.finish;
-
- // allow async tests to retry
- if (test.async && !test.retries) {
- test.retries = 0;
- test.finish = function() {
- var asserts = this.assertions,
- index = -1,
- length = asserts.length,
- queue = QUnit.config.queue;
-
- while (++index < length) {
- var assert = asserts[index];
- if (!assert.result && this.retries < QUnit.config.asyncRetries) {
- this.retries++;
- asserts.length = 0;
-
- var oldLength = queue.length;
- this.queue();
- unshift.apply(queue, queue.splice(oldLength, queue.length - oldLength));
- return;
- }
- }
- finish.call(this);
- };
- }
- // nothing to excuse
- if (!excusedAsserts) {
- return;
- }
- // excuse the entire test
- if (excusedAsserts === true) {
- test.async = false;
- test.callback = function() {};
- test.expected = 0;
- return;
- }
- // excuse specific assertions
- test.finish = function() {
- var asserts = this.assertions,
- index = -1,
- length = asserts.length;
-
- while (++index < length) {
- var assert = asserts[index],
- message = unescape(result(reMessage.exec(assert.message), 1)),
- died = result(reDied.exec(message), 0),
- expected = unescape(result(reExpected.exec(assert.message), 1));
-
- if ((message && contains(excusedAsserts, message)) ||
- (died && contains(excusedAsserts, died)) ||
- (expected && (
- contains(excusedAsserts, expected) ||
- contains(excusedAsserts, expected.replace(/\s+/g, ''))
- ))) {
- assert.result = true;
- }
- }
- finish.call(this);
- };
- });
- }
-
- /*--------------------------------------------------------------------------*/
-
- // expose QUnit extras
- if (freeExports && !freeExports.nodeType) {
- freeExports.runInContext = runInContext;
- } else {
- runInContext(root);
- }
-}(this));
diff --git a/test/backbone.html b/test/backbone.html
index e3ebac16ac..4f7b03aa83 100644
--- a/test/backbone.html
+++ b/test/backbone.html
@@ -18,11 +18,11 @@
Test
+
+
-
-
+
-
+
-
|