mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-10 10:57:49 +00:00
Merge branch 'master' of git://github.com/iamnoah/underscore
This commit is contained in:
@@ -5,6 +5,31 @@
|
|||||||
var objects = _.map(numbers, function(n){ return {num : n}; });
|
var objects = _.map(numbers, function(n){ return {num : n}; });
|
||||||
var randomized = _.sortBy(numbers, function(){ return Math.random(); });
|
var randomized = _.sortBy(numbers, function(){ return Math.random(); });
|
||||||
|
|
||||||
|
JSLitmus.test('_.isNumber()', function() {
|
||||||
|
_.isNumber(123);
|
||||||
|
_.isNumber(null);
|
||||||
|
_.isNumber(NaN);
|
||||||
|
_.isNumber(/foo/);
|
||||||
|
_.isNumber("abc");
|
||||||
|
});
|
||||||
|
|
||||||
|
JSLitmus.test('_.isString()', function() {
|
||||||
|
_.isString(123);
|
||||||
|
_.isString(null);
|
||||||
|
_.isString(NaN);
|
||||||
|
_.isString(/foo/);
|
||||||
|
_.isString("abc");
|
||||||
|
});
|
||||||
|
|
||||||
|
JSLitmus.test('_.isDate()', function() {
|
||||||
|
_.isDate(123);
|
||||||
|
_.isDate(null);
|
||||||
|
_.isDate(NaN);
|
||||||
|
_.isDate(/foo/);
|
||||||
|
_.isDate("abc");
|
||||||
|
_.isDate(new Date());
|
||||||
|
});
|
||||||
|
|
||||||
JSLitmus.test('_.each()', function() {
|
JSLitmus.test('_.each()', function() {
|
||||||
var timesTwo = [];
|
var timesTwo = [];
|
||||||
_.each(numbers, function(num){ timesTwo.push(num * 2); });
|
_.each(numbers, function(num){ timesTwo.push(num * 2); });
|
||||||
|
|||||||
@@ -391,10 +391,11 @@
|
|||||||
/* ------------------------- Object Functions: ---------------------------- */
|
/* ------------------------- Object Functions: ---------------------------- */
|
||||||
|
|
||||||
// Retrieve the names of an object's properties.
|
// Retrieve the names of an object's properties.
|
||||||
|
var hasOwnProperty = Object.prototype.hasOwnProperty;
|
||||||
_.keys = function(obj) {
|
_.keys = function(obj) {
|
||||||
if(_.isArray(obj)) return _.range(0, obj.length);
|
if(_.isArray(obj)) return _.range(0, obj.length);
|
||||||
var keys = [];
|
var keys = [];
|
||||||
for (var key in obj) if (Object.prototype.hasOwnProperty.call(obj, key)) keys.push(key);
|
for (var key in obj) if (hasOwnProperty.call(obj, key)) keys.push(key);
|
||||||
return keys;
|
return keys;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -476,12 +477,18 @@
|
|||||||
_.isUndefined = function(obj) {
|
_.isUndefined = function(obj) {
|
||||||
return typeof obj == 'undefined';
|
return typeof obj == 'undefined';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// have to define isNumber before _.each will work in IE
|
||||||
|
_.isNumber = function(obj) {
|
||||||
|
return Object.prototype.toString.call(obj) == '[object Number]';
|
||||||
|
};
|
||||||
|
|
||||||
// Define the isArray, isDate, isFunction, isNumber, isRegExp, and
|
// Define the isArray, isDate, isFunction, isRegExp, and
|
||||||
// isString functions based on their toString identifiers.
|
// isString functions based on their toString identifiers.
|
||||||
_.each(['Array', 'Date', 'Function', 'Number', 'RegExp', 'String'], function(type) {
|
_.each(['Array', 'Date', 'Function', 'RegExp', 'String'], function(type) {
|
||||||
|
var toString = Object.prototype.toString, typeString = '[object ' + type + ']';
|
||||||
_['is' + type] = function(obj) {
|
_['is' + type] = function(obj) {
|
||||||
return Object.prototype.toString.call(obj) == '[object ' + type + ']';
|
return toString.call(obj) == typeString;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -556,24 +563,28 @@
|
|||||||
|
|
||||||
// Add all of the Underscore functions to the wrapper object.
|
// Add all of the Underscore functions to the wrapper object.
|
||||||
_.each(_.functions(_), function(name) {
|
_.each(_.functions(_), function(name) {
|
||||||
|
var unshift = Array.prototype.unshift,
|
||||||
|
method = _[name];
|
||||||
wrapper.prototype[name] = function() {
|
wrapper.prototype[name] = function() {
|
||||||
Array.prototype.unshift.call(arguments, this._wrapped);
|
unshift.call(arguments, this._wrapped);
|
||||||
return result(_[name].apply(_, arguments), this._chain);
|
return result(method.apply(_, arguments), this._chain);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add all mutator Array functions to the wrapper.
|
// Add all mutator Array functions to the wrapper.
|
||||||
_.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
|
_.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
|
||||||
|
var method = Array.prototype[name];
|
||||||
wrapper.prototype[name] = function() {
|
wrapper.prototype[name] = function() {
|
||||||
Array.prototype[name].apply(this._wrapped, arguments);
|
method.apply(this._wrapped, arguments);
|
||||||
return result(this._wrapped, this._chain);
|
return result(this._wrapped, this._chain);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add all accessor Array functions to the wrapper.
|
// Add all accessor Array functions to the wrapper.
|
||||||
_.each(['concat', 'join', 'slice'], function(name) {
|
_.each(['concat', 'join', 'slice'], function(name) {
|
||||||
|
var method = Array.prototype[name];
|
||||||
wrapper.prototype[name] = function() {
|
wrapper.prototype[name] = function() {
|
||||||
return result(Array.prototype[name].apply(this._wrapped, arguments), this._chain);
|
return result(method.apply(this._wrapped, arguments), this._chain);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user