mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
Rename nodeContains to containsNode
This commit is contained in:
committed by
Paul O’Shannessy
parent
1ffe2d0927
commit
9fd28f44df
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
Reference in New Issue
Block a user