Merge branch 'hman61-DooHTML-DOM-v0.92.1-beta'

Author: krausest

frameworks/keyed/doohtml-dom/js/Main.class.js

@@ -23,7 +23,7 @@ Doo.define(
 			this.runLots = this.runLots.bind(this)
 			this.update = this.update.bind(this)
 			this.clear = this.clear.bind(this)
-			this.swaprows = this.swapRows.bind(this)
+			this.swapRows = this.swapRows.bind(this)
 			this.addEventListeners()
 			this.selectedRow = undefined
 			document.querySelector(".ver").innerHTML += ` ${Doo.version} (keyed)`
@@ -58,20 +58,15 @@ Doo.define(
 			return data	
 		}
 		getIndex(row) {
-			let idx =  this.data.rows.findIndex((item, i) => {
-				if (item.id === row.key) {
-					return i
-				}
-			}) 
-			return idx
+			return this.data.rows.findIndex((item, i) => item.id === row.key) 
 		}
 
 		delete(elem) {
 			let row = this.getParentRow(elem)
 			if (row) {
 				let idx = this.getIndex(row)
 				this.tbody.removeChild(row)
-				if (idx !== undefined) {
+				if (idx !== undefined && idx !== -1) {
 					this.data.rows.splice(idx,1)
 				}
 			}
@@ -134,29 +129,28 @@ Doo.define(
 
 				this.data.rows[CHILD_1] = this.data.rows[CHILD_998];
 				this.data.rows[CHILD_998] = row1
-		 		this.tbody.insertBefore(swapRow, node1)
-		 		this.tbody.insertBefore(node1, node999)
+				this.tbody.insertBefore(node1.parentNode.replaceChild(swapRow, node1), node999)
 			}
 		}
 
 		addEventListeners() {
-			document.getElementById("main").addEventListener('click', e => {
-				e.preventDefault()
-				if (e.target.matches('#runlots')) {
-					this.runLots()
-				} else if (e.target.matches('#run')) {
-					this.run()
-				} else if (e.target.matches('#add')) {
-					this.add()
-				} else if (e.target.matches('#update')) {
-					this.update()
-				} else if (e.target.matches('#clear')) {
-					this.clear()
-				} else if (e.target.matches('#swaprows')) {
-					this.swapRows()
+			const actions = {
+				'run': this.run,
+				'runlots': this.runLots,
+				'add': this.add,
+				'update': this.update,
+				'clear': this.clear,
+				'swaprows': this.swapRows,
+				runAction: (e) => {
+					e.preventDefault()
+					if (actions[e.target.id]) {
+						actions[e.target.id]()
+					}	
 				}
-			})    
+			}	
+			document.getElementById("main").addEventListener('click', e => actions.runAction(e))    
     	}
+
 		async connectedCallback() {
 			super.connectedCallback()
 		}

frameworks/keyed/doohtml-dom/js/doo.html.min.js

@@ -1,6 +1,6 @@
 {
     "name": "js-framework-benchmark-doohtml",
-    "version": "0.91.7-beta",
+    "version": "0.92.1",
     "description": "DooHTML-DOM (no shadow) JS-Benchmark",
     "main": "Main.class.js",
     "js-framework-benchmark": {

frameworks/keyed/doohtml-dom/package.json

@@ -26,7 +26,7 @@ Doo.define(
 			this.runLots = this.runLots.bind(this)
 			this.update = this.update.bind(this)
 			this.clear = this.clear.bind(this)
-			this.swaprows = this.swapRows.bind(this)
+			this.swapRows = this.swapRows.bind(this)
 			this.addEventListeners()
 			this.selectedRow = undefined
 			document.querySelector(".ver").innerHTML += ` ${Doo.version} (keyed)`
@@ -143,23 +143,23 @@ Doo.define(
 		}
 
 		addEventListeners() {
-			document.getElementById("main").addEventListener('click', e => {
-				e.preventDefault()
-				if (e.target.matches('#runlots')) {
-					this.runLots()
-				} else if (e.target.matches('#run')) {
-					this.run()
-				} else if (e.target.matches('#add')) {
-					this.add()
-				} else if (e.target.matches('#update')) {
-					this.update()
-				} else if (e.target.matches('#clear')) {
-					this.clear()
-				} else if (e.target.matches('#swaprows')) {
-					this.swapRows()
+			const actions = {
+				'run': this.run,
+				'runlots': this.runLots,
+				'add': this.add,
+				'update': this.update,
+				'clear': this.clear,
+				'swaprows': this.swapRows,
+				runAction: (e) => {
+					e.preventDefault()
+					if (actions[e.target.id]) {
+						actions[e.target.id]()
+					}	
 				}
-			})    
+			}	
+			document.getElementById("main").addEventListener('click', e => actions.runAction(e))    
     	}
+
 		async connectedCallback() {
 			super.connectedCallback()
 		}

frameworks/keyed/doohtml/js/Main.class.js

@@ -1,6 +1,6 @@
 {
     "name": "js-framework-benchmark-doohtml",
-    "version": "0.91.7-beta",
+    "version": "0.92.1",
     "description": "DooHTML JS-Benchmark",
     "main": "Main.class.js",
     "js-framework-benchmark": {