Use extracted dom-utils module

ultraq · Apr 28, 2019 · fc2c9b0 · fc2c9b0
1 parent e81f5d3
commit fc2c9b0
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
 	},
 	"dependencies": {
 		"@ultraq/array-utils": "^1.1.0",
+		"@ultraq/dom-utils": "^0.1.1",
 		"@ultraq/string-utils": "^1.1.0",
 		"dumb-query-selector": "^3.3.0",
 		"jsdom": "~9.12.0"

diff --git a/source/standard/processors/IfAttributeProcessor.js b/source/standard/processors/IfAttributeProcessor.js
@@ -16,7 +16,8 @@
 
 import ExpressionProcessor from '../expressions/ExpressionProcessor.js';
 import AttributeProcessor  from '../../processors/AttributeProcessor.js';
-import {clearChildren}     from '../../utilities/Dom.js';
+
+import {clearChildren} from '@ultraq/dom-utils';
 
 /**
  * JS equivalent of Thymeleaf's `th:if` attribute processor, includes or

diff --git a/source/standard/processors/InsertAttributeProcessor.js b/source/standard/processors/InsertAttributeProcessor.js
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-import FragmentAttributeProcessor                  from './FragmentAttributeProcessor.js';
-import StandardDialect                             from '../StandardDialect.js';
-import ExpressionProcessor                         from '../expressions/ExpressionProcessor.js';
-import FragmentSignatureGrammar                    from '../expressions/FragmentSignatureGrammar.js';
-import AttributeProcessor                          from '../../processors/AttributeProcessor.js';
-import {clearChildren, getThymeleafAttributeValue} from '../../utilities/Dom.js';
-import {extractFragment}                           from '../../utilities/Fragments.js';
+import FragmentAttributeProcessor   from './FragmentAttributeProcessor.js';
+import StandardDialect              from '../StandardDialect.js';
+import ExpressionProcessor          from '../expressions/ExpressionProcessor.js';
+import FragmentSignatureGrammar     from '../expressions/FragmentSignatureGrammar.js';
+import AttributeProcessor           from '../../processors/AttributeProcessor.js';
+import {getThymeleafAttributeValue} from '../../utilities/Dom.js';
+import {extractFragment}            from '../../utilities/Fragments.js';
+
+import {clearChildren} from '@ultraq/dom-utils';
 
 /**
  * JS equivalent of Thymeleaf's `th:insert` attribute processor, inserts the

diff --git a/source/standard/processors/ReplaceAttributeProcessor.js b/source/standard/processors/ReplaceAttributeProcessor.js
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-import FragmentAttributeProcessor                  from './FragmentAttributeProcessor.js';
-import StandardDialect                             from '../StandardDialect.js';
-import ExpressionProcessor                         from '../expressions/ExpressionProcessor.js';
-import FragmentSignatureGrammar                    from '../expressions/FragmentSignatureGrammar.js';
-import AttributeProcessor                          from '../../processors/AttributeProcessor.js';
-import {clearChildren, getThymeleafAttributeValue} from '../../utilities/Dom.js';
-import {extractFragment}                           from '../../utilities/Fragments.js';
+import FragmentAttributeProcessor   from './FragmentAttributeProcessor.js';
+import StandardDialect              from '../StandardDialect.js';
+import ExpressionProcessor          from '../expressions/ExpressionProcessor.js';
+import FragmentSignatureGrammar     from '../expressions/FragmentSignatureGrammar.js';
+import AttributeProcessor           from '../../processors/AttributeProcessor.js';
+import {getThymeleafAttributeValue} from '../../utilities/Dom.js';
+import {extractFragment}            from '../../utilities/Fragments.js';
+
+import {clearChildren} from '@ultraq/dom-utils';
 
 /**
  * JS equivalent of Thymeleaf's `th:relace` attribute processor, replaces the

diff --git a/source/standard/processors/UnlessAttributeProcessor.js b/source/standard/processors/UnlessAttributeProcessor.js
@@ -16,7 +16,8 @@
 
 import ExpressionProcessor from '../expressions/ExpressionProcessor.js';
 import AttributeProcessor  from '../../processors/AttributeProcessor.js';
-import {clearChildren}     from '../../utilities/Dom.js';
+
+import {clearChildren} from '@ultraq/dom-utils';
 
 /**
  * JS equivalent of Thymeleaf's `th:unless` attribute processor, excludes or

diff --git a/source/utilities/Dom.js b/source/utilities/Dom.js
@@ -16,17 +16,6 @@
 
 /* global ENVIRONMENT */
 
-/**
- * Removes all of an element's child nodes.
- * 
- * @param {Element} element
- */
-export function clearChildren(element) {
-	while (element.firstChild) {
-		element.removeChild(element.firstChild);
-	}
-}
-
 /**
  * Sets a Thymeleaf attribute and value on an existing element.  Used primarily
  * in tests.
@@ -65,7 +54,7 @@ export function getThymeleafAttributeValue(element, prefix, processorName) {
 export function deserialize(htmlString) {
 	return ENVIRONMENT === 'browser' ?
 		/* istanbul ignore next */
-		document.createRange().createContextualFragment(htmlString) :
+		require('@ultraq/dom-utils').deserialize(htmlString) :
 		require('jsdom').jsdom(htmlString, {
 			features: {
 				FetchExternalResources: false,
@@ -84,6 +73,6 @@ export function deserialize(htmlString) {
 export function serialize(documentFragment) {
 	return ENVIRONMENT === 'browser' ?
 		/* istanbul ignore next */
-		new XMLSerializer().serializeToString(documentFragment) :
+		require('@ultraq/dom-utils').serialize(documentFragment) :
 		require('jsdom').serializeDocument(documentFragment);
 }