From 86a37559ba71bf0cd3b52cffdf8ea167068e4877 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Tue, 6 Nov 2012 02:56:34 -0800 Subject: [PATCH] Update build dependencies. Former-commit-id: 6a9680a118115e059636a5fc0125c4efa5161765 --- build.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/build.js b/build.js index 552e6fadc..3d9a2e3a2 100755 --- a/build.js +++ b/build.js @@ -70,7 +70,7 @@ 'clone': ['extend', 'forEach', 'forOwn', 'isArguments', 'isPlainObject'], 'compact': [], 'compose': [], - 'contains': ['indexOf', 'some'], + 'contains': ['indexOf', 'isString', 'some'], 'countBy': ['forEach'], 'debounce': [], 'defaults': ['isArguments'], @@ -118,10 +118,10 @@ 'lastIndexOf': [], 'lateBind': ['isFunction'], 'map': ['forEach', 'isArray'], - 'max': ['forEach', 'isArray'], + 'max': ['forEach', 'isArray', 'isString'], 'memoize': [], 'merge': ['forOwn', 'isArray', 'isPlainObject'], - 'min': ['forEach', 'isArray'], + 'min': ['forEach', 'isArray', 'isString'], 'mixin': ['forEach', 'functions'], 'noConflict': [], 'object': [], @@ -134,7 +134,7 @@ 'random': [], 'range': [], 'reduce': ['forEach'], - 'reduceRight': ['forEach', 'keys'], + 'reduceRight': ['forEach', 'isString', 'keys'], 'reject': ['filter'], 'rest': [], 'result': ['isFunction'], @@ -964,9 +964,15 @@ }, []); // update dependencies + if (isMobile) { + dependencyMap.reduceRight = ['forEach', 'keys']; + } if (isUnderscore) { + dependencyMap.contains = ['indexOf', 'some'], dependencyMap.isEqual = ['isArray', 'isFunction']; dependencyMap.isEmpty = ['isArray', 'isString']; + dependencyMap.max = ['forEach', 'isArray']; + dependencyMap.min = ['forEach', 'isArray']; dependencyMap.pick = []; dependencyMap.template = ['defaults', 'escape']; @@ -1221,6 +1227,9 @@ // simplify DOM node check from `_.isEqual` source = source.replace(/(if *\(className *!= *objectClass).+?noNodeClass[\s\S]+?{/, '$1) {'); + // remove string collection callback definition from `_.max` and `_.min` + source = source.replace(/( +)if *\(!callback *&& *isString\(collection\)\)[\s\S]+?\n\1}\n/g, ''); + // remove unused features from `createBound` if (buildMethods.indexOf('partial') == -1) { source = source.replace(matchFunction(source, 'createBound'), function(match) {