Merge branch 'master' of github.com:bestiejs/lodash

Former-commit-id: a4de2b320b871d2bfd689890fc526605215091bf
This commit is contained in:
John-David Dalton
2012-06-29 03:58:54 -04:00
2 changed files with 12 additions and 27 deletions

View File

@@ -14,7 +14,6 @@
'className',
'collection',
'ctor',
'false',
'funcClass',
'hasOwnProperty',
'identity',
@@ -36,8 +35,6 @@
'target',
'thisArg',
'toString',
'true',
'undefined',
'value'
];
@@ -270,16 +267,10 @@
isIteratorTemplate = /var iteratorTemplate\b/.test(snippet),
result = snippet;
// add brackets to whitelisted properties so Closure Compiler won't mung them
result = result.replace(RegExp('\\.(' + iteratorOptions.join('|') + ')\\b', 'g'), "['$1']");
if (isCreateIterator) {
// add `true` and `false` arguments to be minified
result = result
.replace(/(Function\(\s*'[\s\S]+?)undefined/, '$1true,false,undefined')
.replace(/factory\([^)]+/, '$&,true,false');
// replace with modified snippet early and clip snippet so other arguments
// aren't minified
source = source.replace(snippet, result);
@@ -295,12 +286,6 @@
if (variable == 'object') {
result = result.replace(RegExp("(typeof [^']+')" + minNames[index] + "'", 'g'), "$1object'");
}
// correct external boolean literals
else if (variable == 'true' || variable == 'false') {
result = result
.replace(RegExp(': *' + minNames[index] + '([,\\n])', 'g'), ':' + variable + '$1')
.replace(RegExp('\\b' + minNames[index] + ';', 'g'), variable + ';');
}
});
// minify `createIterator` option property names