Rename `nodeContains` to `containsNode`
Tim Yung committed
Nov 11, 2013 at 16:23 UTC
9fd28f44df088799e8bec59b2a9c7beda9aa8400
3 files changed
+8
-8
src/core/ReactInputSelection.js
+2
-2
@@ -20,11 +20,11 @@
20
21
var ReactDOMSelection = require('ReactDOMSelection');
22
23
+var containsNode = require('containsNode');
24
var getActiveElement = require('getActiveElement');
24
-var nodeContains = require('nodeContains');
25
26
function isInDocument(node) {
27
- return nodeContains(document.documentElement, node);
27
+ return containsNode(document.documentElement, node);
28
}
29
30
/**
src/core/ReactMount.js
+2
-2
@@ -22,9 +22,9 @@ var ReactEventEmitter = require('ReactEventEmitter');
22
var ReactInstanceHandles = require('ReactInstanceHandles');
23
24
var $ = require('$');
25
+var containsNode = require('containsNode');
26
var getReactRootElementInContainer = require('getReactRootElementInContainer');
27
var invariant = require('invariant');
27
-var nodeContains = require('nodeContains');
28
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
29
30
var SEPARATOR = ReactInstanceHandles.SEPARATOR;
@@ -142,7 +142,7 @@ function isValid(node, id) {
142
);
143
144
var container = ReactMount.findReactContainerForID(id);
145
- if (container && nodeContains(container, node)) {
145
+ if (container && containsNode(container, node)) {
146
return true;
147
}
148
}
src/vendor/core/dom/containsNode.js
renamed
+4
-4
@@ -13,7 +13,7 @@
13
* See the License for the specific language governing permissions and
14
* limitations under the License.
15
*
16
- * @providesModule nodeContains
16
+ * @providesModule containsNode
17
* @typechecks
18
*/
19
@@ -28,7 +28,7 @@ var isTextNode = require('isTextNode');
28
* @param {?DOMNode} innerNode Inner DOM node.
29
* @return {boolean} True if `outerNode` contains or is `innerNode`.
30
*/
31
-function nodeContains(outerNode, innerNode) {
31
+function containsNode(outerNode, innerNode) {
32
if (!outerNode || !innerNode) {
33
return false;
34
} else if (outerNode === innerNode) {
@@ -36,7 +36,7 @@ function nodeContains(outerNode, innerNode) {
36
} else if (isTextNode(outerNode)) {
37
return false;
38
} else if (isTextNode(innerNode)) {
39
- return nodeContains(outerNode, innerNode.parentNode);
39
+ return containsNode(outerNode, innerNode.parentNode);
40
} else if (outerNode.contains) {
41
return outerNode.contains(innerNode);
42
} else if (outerNode.compareDocumentPosition) {
@@ -46,4 +46,4 @@ function nodeContains(outerNode, innerNode) {
46
}
47
}
48
49
-module.exports = nodeContains;
49
+module.exports = containsNode;