From 9fd28f44df088799e8bec59b2a9c7beda9aa8400 Mon Sep 17 00:00:00 2001 From: Tim Yung Date: Mon, 11 Nov 2013 16:23:17 -0800 Subject: [PATCH] Rename `nodeContains` to `containsNode` --- src/core/ReactInputSelection.js | 4 ++-- src/core/ReactMount.js | 4 ++-- src/vendor/core/dom/{nodeContains.js => containsNode.js} | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/vendor/core/dom/{nodeContains.js => containsNode.js} (88%) diff --git a/src/core/ReactInputSelection.js b/src/core/ReactInputSelection.js index b1d9abfd22..aadde0e5ad 100644 --- a/src/core/ReactInputSelection.js +++ b/src/core/ReactInputSelection.js @@ -20,11 +20,11 @@ var ReactDOMSelection = require('ReactDOMSelection'); +var containsNode = require('containsNode'); var getActiveElement = require('getActiveElement'); -var nodeContains = require('nodeContains'); function isInDocument(node) { - return nodeContains(document.documentElement, node); + return containsNode(document.documentElement, node); } /** diff --git a/src/core/ReactMount.js b/src/core/ReactMount.js index 6ff7378bd5..46e296ea07 100644 --- a/src/core/ReactMount.js +++ b/src/core/ReactMount.js @@ -22,9 +22,9 @@ var ReactEventEmitter = require('ReactEventEmitter'); var ReactInstanceHandles = require('ReactInstanceHandles'); var $ = require('$'); +var containsNode = require('containsNode'); var getReactRootElementInContainer = require('getReactRootElementInContainer'); var invariant = require('invariant'); -var nodeContains = require('nodeContains'); var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); var SEPARATOR = ReactInstanceHandles.SEPARATOR; @@ -142,7 +142,7 @@ function isValid(node, id) { ); var container = ReactMount.findReactContainerForID(id); - if (container && nodeContains(container, node)) { + if (container && containsNode(container, node)) { return true; } } diff --git a/src/vendor/core/dom/nodeContains.js b/src/vendor/core/dom/containsNode.js similarity index 88% rename from src/vendor/core/dom/nodeContains.js rename to src/vendor/core/dom/containsNode.js index 1eadd340a0..dfd282f979 100644 --- a/src/vendor/core/dom/nodeContains.js +++ b/src/vendor/core/dom/containsNode.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * @providesModule nodeContains + * @providesModule containsNode * @typechecks */ @@ -28,7 +28,7 @@ var isTextNode = require('isTextNode'); * @param {?DOMNode} innerNode Inner DOM node. * @return {boolean} True if `outerNode` contains or is `innerNode`. */ -function nodeContains(outerNode, innerNode) { +function containsNode(outerNode, innerNode) { if (!outerNode || !innerNode) { return false; } else if (outerNode === innerNode) { @@ -36,7 +36,7 @@ function nodeContains(outerNode, innerNode) { } else if (isTextNode(outerNode)) { return false; } else if (isTextNode(innerNode)) { - return nodeContains(outerNode, innerNode.parentNode); + return containsNode(outerNode, innerNode.parentNode); } else if (outerNode.contains) { return outerNode.contains(innerNode); } else if (outerNode.compareDocumentPosition) { @@ -46,4 +46,4 @@ function nodeContains(outerNode, innerNode) { } } -module.exports = nodeContains; +module.exports = containsNode;