Bump to v4.11.2.

This commit is contained in:
John-David Dalton
2016-04-19 22:21:01 -07:00
parent 692aabae13
commit 35805ec250
87 changed files with 342 additions and 163 deletions

View File

@@ -1,3 +1,4 @@
import baseToString from './_baseToString';
import castSlice from './_castSlice';
import isObject from './isObject';
import isRegExp from './isRegExp';
@@ -58,7 +59,7 @@ function truncate(string, options) {
if (isObject(options)) {
var separator = 'separator' in options ? options.separator : separator;
length = 'length' in options ? toInteger(options.length) : length;
omission = 'omission' in options ? toString(options.omission) : omission;
omission = 'omission' in options ? baseToString(options.omission) : omission;
}
string = toString(string);
@@ -98,7 +99,7 @@ function truncate(string, options) {
}
result = result.slice(0, newEnd === undefined ? end : newEnd);
}
} else if (string.indexOf(separator, end) != end) {
} else if (string.indexOf(baseToString(separator), end) != end) {
var index = result.lastIndexOf(separator);
if (index > -1) {
result = result.slice(0, index);