Merge pull request #402 from diegonvs/401

Fixes #401 | Revert deprecation of contains function
metal · Nov 28, 2018 · b7c606a · b7c606a
2 parents fe43748 + 2cfb601
commit b7c606a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/packages/metal-dom/src/domNamed.js b/packages/metal-dom/src/domNamed.js
@@ -216,7 +216,12 @@ export function buildFragment(htmlString) {
  * @return {boolean}
  */
 export function contains(element1, element2) {
-	return element1.contains(element2);
+	if (isDocument(element1)) {
+		// document.contains is not defined on IE9, so call it on documentElement instead.
+		return element1.documentElement.contains(element2);
+	} else {
+		return element1.contains(element2);
+	}
 }
 
 /**

diff --git a/packages/metal-dom/src/events.js b/packages/metal-dom/src/events.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import {isServerSide} from 'metal';
-import {registerCustomEvent} from './dom';
+import {registerCustomEvent, contains} from './dom';
 import features from './features';
 
 /**
@@ -23,7 +23,7 @@ function registerEvents() {
 				// eslint-disable-next-line
 				if (
 					!related ||
-					(related !== target && !target.contains(related))
+					(related !== target && !contains(target, related))
 				) {
 					event.customType = eventName;
 					return callback(event);

diff --git a/packages/metal-dom/test/dom.js b/packages/metal-dom/test/dom.js
@@ -175,13 +175,13 @@ describe('dom', function() {
 			dom.append(element1, element2);
 			dom.enterDocument(element3);
 
-			assert.ok(dom.contains(element1, element2));
-			assert.ok(dom.contains(document, element3));
+			assert.isTrue(dom.contains(element1, element2));
+			assert.isTrue(dom.contains(document, element3));
 
-			assert.ok(!dom.contains(element1, element3));
-			assert.ok(!dom.contains(element2, element1));
-			assert.ok(!dom.contains(document, element1));
-			assert.ok(!dom.contains(document, element2));
+			assert.isFalse(dom.contains(element1, element3));
+			assert.isFalse(dom.contains(element2, element1));
+			assert.isFalse(dom.contains(document, element1));
+			assert.isFalse(dom.contains(document, element2));
 		});
 	});