Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-11 03:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix Safari 4.

Browse Source
This commit is contained in:
John-David Dalton
2014-06-05 08:51:21 -07:00
parent 036bf92223
commit 8b8a9ae854
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lodash.js
View File

@@ -103,10 +103,11 @@
/** Used to assign default `context` object properties */ /** Used to assign default `context` object properties */
var contextProps = [ var contextProps = [
'Array', 'ArrayBuffer', 'Boolean', 'Date', 'Error', 'Float64Array', 'Function', 'Array', 'ArrayBuffer', 'Boolean', 'Date', 'Error', 'Float32Array', 'Float64Array',
'Math', 'Number', 'Object', 'RegExp', 'Set', 'String', '_', 'clearTimeout', 'Function', 'Int8Array', 'Int16Array', 'Int32Array', 'Math', 'Number', 'Object',
'document', 'isFinite', 'isNaN','parseInt', 'setTimeout', 'TypeError', 'RegExp', 'Set', 'String', '_', 'clearTimeout', 'document', 'isFinite', 'isNaN',
'Uint8Array', 'window', 'WinRTError' 'parseInt', 'setTimeout', 'TypeError', 'Uint8Array', 'Uint8ClampedArray',
'Uint16Array', 'Uint32Array', 'window', 'WinRTError'
]; ];
/** Used to fix the JScript `[[DontEnum]]` bug */ /** Used to fix the JScript `[[DontEnum]]` bug */
@@ -692,6 +693,18 @@
nativeParseInt = context.parseInt, nativeParseInt = context.parseInt,
nativeRandom = Math.random; nativeRandom = Math.random;
/** Used to lookup a built-in constructor by [[Class]] */
var ctorByClass = {};
ctorByClass[float32Class] = context.Float32Array;
ctorByClass[float64Class] = context.Float64Array;
ctorByClass[int8Class] = context.Int8Array;
ctorByClass[int16Class] = context.Int16Array;
ctorByClass[int32Class] = context.Int32Array;
ctorByClass[uint8Class] = context.Uint8Array;
ctorByClass[uint8ClampedClass] = context.Uint8ClampedArray;
ctorByClass[uint16Class] = context.Uint16Array;
ctorByClass[uint32Class] = context.Uint32Array;
/** Used to avoid iterating over non-enumerable properties in IE < 9 */ /** Used to avoid iterating over non-enumerable properties in IE < 9 */
var nonEnumProps = {}; var nonEnumProps = {};
nonEnumProps[arrayClass] = nonEnumProps[dateClass] = nonEnumProps[numberClass] = { 'constructor': true, 'toLocaleString': true, 'toString': true, 'valueOf': true }; nonEnumProps[arrayClass] = nonEnumProps[dateClass] = nonEnumProps[numberClass] = { 'constructor': true, 'toLocaleString': true, 'toString': true, 'valueOf': true };
@@ -1239,7 +1252,7 @@
case float32Class: case float64Class: case float32Class: case float64Class:
case int8Class: case int16Class: case int32Class: case int8Class: case int16Class: case int32Class:
case uint8Class: case uint8ClampedClass: case uint16Class: case uint32Class: case uint8Class: case uint8ClampedClass: case uint16Class: case uint32Class:
return new Ctor(value.buffer); return new ctorByClass[className](cloneBuffer(value.buffer));
case numberClass: case numberClass:
case stringClass: case stringClass:
@@ -1265,7 +1278,7 @@
return stackB[length]; return stackB[length];
} }
} }
result = isArr ? Ctor(value.length) : Ctor(); result = isArr ? Ctor(value.length) : new Ctor();
} }
else { else {
result = isArr ? slice(value) : baseAssign({}, value); result = isArr ? slice(value) : baseAssign({}, value);

9
test/test.js
View File

@@ -210,6 +210,7 @@
/** Used to check whether methods support typed arrays */ /** Used to check whether methods support typed arrays */
var typedArrays = [ var typedArrays = [
'Float32Array', 'Float32Array',
'Float64Array',
'Int8Array', 'Int8Array',
'Int16Array', 'Int16Array',
'Int32Array', 'Int32Array',
@@ -1287,10 +1288,10 @@
test('`_.' + methodName + '` should clone ' + type + ' arrays', 2, function() { test('`_.' + methodName + '` should clone ' + type + ' arrays', 2, function() {
var Ctor = root[type]; var Ctor = root[type];
if (Ctor) { if (Ctor) {
var array = new Ctor(new ArrayBuffer(4)), var array = new Ctor(new ArrayBuffer(8)),
actual = func(array); actual = func(array);
deepEqual(actual, array); deepEqual(actual, array, ': ' + (array.constructor === ArrayBuffer));
notStrictEqual(actual, array); notStrictEqual(actual, array);
} }
else { else {
@@ -1300,7 +1301,7 @@
}); });
test('`_.' + methodName + '` should clone array buffers', 2, function() { test('`_.' + methodName + '` should clone array buffers', 2, function() {
var buffer = ArrayBuffer && new ArrayBuffer(4); var buffer = ArrayBuffer && new ArrayBuffer(8);
if (buffer) { if (buffer) {
var actual = func(buffer); var actual = func(buffer);
strictEqual(actual.byteLength, buffer.byteLength); strictEqual(actual.byteLength, buffer.byteLength);
@@ -4891,7 +4892,7 @@
test('should perform comparisons between typed arrays', 1, function() { test('should perform comparisons between typed arrays', 1, function() {
var pairs = _.map(typedArrays, function(type) { var pairs = _.map(typedArrays, function(type) {
var Ctor = root[type] || Array, var Ctor = root[type] || Array,
buffer = Ctor == Array ? 4 : new ArrayBuffer(4); buffer = Ctor == Array ? 4 : new ArrayBuffer(8);
return [new Ctor(buffer), new Ctor(buffer)]; return [new Ctor(buffer), new Ctor(buffer)];
}); });