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

Use String#slice instead of String#indexOf for _.endsWith and _.startsWith.

Browse Source
This commit is contained in:
John-David Dalton
2016-07-24 08:29:39 -07:00
parent 6a41a79ded
commit 6402af7db9
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lodash.js
View File

@@ -13703,8 +13703,9 @@
? length ? length
: baseClamp(toInteger(position), 0, length); : baseClamp(toInteger(position), 0, length);
var end = position;
position -= target.length; position -= target.length;
return position >= 0 && string.indexOf(target, position) == position; return position >= 0 && string.slice(position, end) == target;
} }
/** /**
@@ -14152,7 +14153,8 @@
function startsWith(string, target, position) { function startsWith(string, target, position) {
string = toString(string); string = toString(string);
position = baseClamp(toInteger(position), 0, string.length); position = baseClamp(toInteger(position), 0, string.length);
return string.lastIndexOf(baseToString(target), position) == position; target = baseToString(target);
return string.slice(position, position + target.length) == target;
} }
/** /**

27
test/test.js
View File

@@ -5393,14 +5393,6 @@
assert.strictEqual(_.endsWith(string, 'ab', 2.2), true); assert.strictEqual(_.endsWith(string, 'ab', 2.2), true);
}); });
QUnit.test('should return `true` when `target` is an empty string regardless of `position`', function(assert) {
assert.expect(1);
assert.ok(lodashStable.every([-Infinity, NaN, -3, -1, 0, 1, 2, 3, 5, MAX_SAFE_INTEGER, Infinity], function(position) {
return _.endsWith(string, '', position, true);
}));
});
}()); }());
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@@ -20885,14 +20877,6 @@
assert.strictEqual(_.startsWith(string, 'bc', 1.2), true); assert.strictEqual(_.startsWith(string, 'bc', 1.2), true);
}); });
QUnit.test('should return `true` when `target` is an empty string regardless of `position`', function(assert) {
assert.expect(1);
assert.ok(lodashStable.every([-Infinity, NaN, -3, -1, 0, 1, 2, 3, 5, MAX_SAFE_INTEGER, Infinity], function(position) {
return _.startsWith(string, '', position, true);
}));
});
}()); }());
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@@ -20924,9 +20908,20 @@
assert.expect(2); assert.expect(2);
var position = isStartsWith ? 1 : 2; var position = isStartsWith ? 1 : 2;
assert.strictEqual(func(string, 'b', Object(position)), true); assert.strictEqual(func(string, 'b', Object(position)), true);
assert.strictEqual(func(string, 'b', { 'toString': lodashStable.constant(String(position)) }), true); assert.strictEqual(func(string, 'b', { 'toString': lodashStable.constant(String(position)) }), true);
}); });
QUnit.test('should return `true` when `target` is an empty string regardless of `position`', function(assert) {
assert.expect(1);
var positions = [-Infinity, NaN, -3, -1, 0, 1, 2, 3, 5, MAX_SAFE_INTEGER, Infinity];
assert.ok(lodashStable.every(positions, function(position) {
return func(string, '', position);
}));
});
}); });
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/