Consolidate returns in trim methods.

This commit is contained in:
John-David Dalton
2016-04-17 09:05:15 -07:00
parent 27dfe542bd
commit 161c17ce7f

View File

@@ -14116,13 +14116,10 @@
*/ */
function trim(string, chars, guard) { function trim(string, chars, guard) {
string = toString(string); string = toString(string);
if (!string) { if (string && (guard || chars === undefined)) {
return string;
}
if (guard || chars === undefined) {
return string.replace(reTrim, ''); return string.replace(reTrim, '');
} }
if (!(chars = baseToString(chars))) { if (!string || !(chars = baseToString(chars))) {
return string; return string;
} }
var strSymbols = stringToArray(string), var strSymbols = stringToArray(string),
@@ -14154,13 +14151,10 @@
*/ */
function trimEnd(string, chars, guard) { function trimEnd(string, chars, guard) {
string = toString(string); string = toString(string);
if (!string) { if (string && (guard || chars === undefined)) {
return string;
}
if (guard || chars === undefined) {
return string.replace(reTrimEnd, ''); return string.replace(reTrimEnd, '');
} }
if (!(chars = baseToString(chars))) { if (!string || !(chars = baseToString(chars))) {
return string; return string;
} }
var strSymbols = stringToArray(string), var strSymbols = stringToArray(string),
@@ -14190,13 +14184,10 @@
*/ */
function trimStart(string, chars, guard) { function trimStart(string, chars, guard) {
string = toString(string); string = toString(string);
if (!string) { if (string && (guard || chars === undefined)) {
return string;
}
if (guard || chars === undefined) {
return string.replace(reTrimStart, ''); return string.replace(reTrimStart, '');
} }
if (!(chars = baseToString(chars))) { if (!string || !(chars = baseToString(chars))) {
return string; return string;
} }
var strSymbols = stringToArray(string), var strSymbols = stringToArray(string),