diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js index 85e38bb0ff..9a3436401c 100644 --- a/src/core/ReactCompositeComponent.js +++ b/src/core/ReactCompositeComponent.js @@ -35,7 +35,7 @@ var keyMirror = require('keyMirror'); var merge = require('merge'); var mixInto = require('mixInto'); var monitorCodeUse = require('monitorCodeUse'); -var objMap = require('objMap'); +var mapObject = require('mapObject'); var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); var warning = require('warning'); @@ -542,7 +542,7 @@ function mergeObjectsWithNoDuplicateKeys(one, two) { 'mergeObjectsWithNoDuplicateKeys(): Cannot merge non-objects' ); - objMap(two, function(value, key) { + mapObject(two, function(value, key) { invariant( one[key] === undefined, 'mergeObjectsWithNoDuplicateKeys(): ' + diff --git a/src/vendor/core/objMap.js b/src/vendor/core/mapObject.js similarity index 87% rename from src/vendor/core/objMap.js rename to src/vendor/core/mapObject.js index 5aeea4c2f1..44600978cc 100644 --- a/src/vendor/core/objMap.js +++ b/src/vendor/core/mapObject.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * @providesModule objMap + * @providesModule mapObject */ "use strict"; @@ -25,12 +25,17 @@ * * func(value, key, iteration) * + * Grepable names: + * + * function objectMap() + * function objMap() + * * @param {?object} obj Object to map keys over * @param {function} func Invoked for each key/val pair. * @param {?*} context * @return {?object} Result of mapping or null if obj is falsey */ -function objMap(obj, func, context) { +function mapObject(obj, func, context) { if (!obj) { return null; } @@ -44,4 +49,4 @@ function objMap(obj, func, context) { return ret; } -module.exports = objMap; +module.exports = mapObject;