Add templateSettings to the Chaining category and cleanup _.difference use.

Former-commit-id: acccb5d3868cf6e38b9f6f87b6107cf4c7b1ec30
This commit is contained in:
John-David Dalton
2013-06-30 21:39:50 -07:00
parent 6054f6bfe1
commit 69cbb6e109
2 changed files with 8 additions and 7 deletions

View File

@@ -251,7 +251,7 @@
'template': ['reInterpolate'], 'template': ['reInterpolate'],
}; };
/** Used to track the category of functions */ /** Used to track the category of identifiers */
var categoryMap = { var categoryMap = {
'Arrays': [ 'Arrays': [
'compact', 'compact',
@@ -367,6 +367,7 @@
'result', 'result',
'runInContext', 'runInContext',
'template', 'template',
'templateSettings',
'times', 'times',
'unescape', 'unescape',
'uniqueId' 'uniqueId'
@@ -450,7 +451,6 @@
'nonEnumProps', 'nonEnumProps',
'shadowedProps', 'shadowedProps',
'support', 'support',
'templateSettings',
'whitespace' 'whitespace'
]; ];
@@ -523,10 +523,10 @@
var allFuncs = _.keys(funcDependencyMap); var allFuncs = _.keys(funcDependencyMap);
/** List of Lo-Dash functions */ /** List of Lo-Dash functions */
var lodashFuncs = _.difference(allFuncs, privateFuncs.concat('findWhere')); var lodashFuncs = _.difference(allFuncs, privateFuncs, 'findWhere');
/** List of Underscore functions */ /** List of Underscore functions */
var underscoreFuncs = _.difference(allFuncs, lodashOnlyFuncs.concat(privateFuncs)); var underscoreFuncs = _.difference(allFuncs, lodashOnlyFuncs, privateFuncs);
/** List of all property dependencies */ /** List of all property dependencies */
var propDependencies = _.uniq(_.transform(propDependencyMap, function(result, propNames) { var propDependencies = _.uniq(_.transform(propDependencyMap, function(result, propNames) {
@@ -2374,7 +2374,7 @@
}, },
'exports': { 'exports': {
'entries': exportsOptions, 'entries': exportsOptions,
'validEntries': ['amd', 'commonjs', 'global', 'node', 'none'] 'validEntries': allExports
}, },
'include': { 'include': {
'entries': includeFuncs, 'entries': includeFuncs,
@@ -2389,7 +2389,7 @@
'validEntries': allFuncs 'validEntries': allFuncs
} }
}, function(data, commandName) { }, function(data, commandName) {
invalidArgs = _.difference(data.entries, data.validEntries.concat('none')); invalidArgs = _.difference(data.entries, data.validEntries, 'none');
if (invalidArgs.length) { if (invalidArgs.length) {
warnings.push('Invalid `' + commandName + '` entr' + (invalidArgs.length > 1 ? 'ies' : 'y') + ' passed: ' + invalidArgs.join(', ')); warnings.push('Invalid `' + commandName + '` entr' + (invalidArgs.length > 1 ? 'ies' : 'y') + ' passed: ' + invalidArgs.join(', '));
} }

View File

@@ -89,7 +89,7 @@
'zipObject': ['object'] 'zipObject': ['object']
}; };
/** Used to track the category of functions */ /** Used to track the category of identifiers */
var categoryMap = { var categoryMap = {
'Arrays': [ 'Arrays': [
'compact', 'compact',
@@ -205,6 +205,7 @@
'result', 'result',
'runInContext', 'runInContext',
'template', 'template',
'templateSettings',
'times', 'times',
'unescape', 'unescape',
'uniqueId' 'uniqueId'