Merge branch 'mksunny1-Vanillajs-3'

Author: krausest

frameworks/keyed/vanillajs-3/index.html

@@ -78,7 +78,8 @@ <h1>Vanillajs-3-"keyed"</h1>
             <span class="preloadicon glyphicon glyphicon-remove" aria-hidden="true"></span>
             </div>
           </div>
-          <template id="itemTemplate"><tr><td class='col-md-1'>{id}</td><td class='col-md-4'><a class='lbl'>{lbl}</a></td><td class='col-md-1'><a class='remove'><span class='remove glyphicon glyphicon-remove' aria-hidden='true'></span></a></td><td class='col-md-6'></td></tr></template>
+          <template id="t1000"><tr><td class='col-md-1'>{id}</td><td class='col-md-4'><a class='lbl'>{lbl}</a></td><td class='col-md-1'><a class='remove'><span class='remove glyphicon glyphicon-remove' aria-hidden='true'></span></a></td><td class='col-md-6'></td></tr></template>
+          <template id="t10000"><tr><td class='col-md-1'>{id}</td><td class='col-md-4'><a class='lbl'>{lbl}</a></td><td class='col-md-1'><a class='remove'><span class='remove glyphicon glyphicon-remove' aria-hidden='true'></span></a></td><td class='col-md-6'></td></tr></template>
           <script src='src/Main.js'></script>
     </body>
 </html>

frameworks/keyed/vanillajs-3/index_backup.html

@@ -1,28 +1,21 @@
 "use strict";
+(function() {
+    let index = 1, data = [], labels = null, invalidLabels = true, selected = null;
+    const tbody = document.getElementsByTagName('tbody')[0];
 
-const gAdjectives = ["pretty", "large", "big", "small", "tall", "short", "long", "handsome", "plain", "quaint", "clean", "elegant", "easy", "angry", "crazy", "helpful", "mushy", "odd", "unsightly", "adorable", "important", "inexpensive", "cheap", "expensive", "fancy"];
-const gColours = ["red", "yellow", "blue", "green", "pink", "brown", "purple", "brown", "white", "black", "orange"];
-const gNouns = ["table", "chair", "house", "bbq", "desk", "car", "pony", "cookie", "sandwich", "burger", "pizza", "mouse", "keyboard"];
-const nts = {1000: 5, 10000: 125};
+    const adjectives = ["pretty", "large", "big", "small", "tall", "short", "long", "handsome", "plain", "quaint", "clean", "elegant", "easy", "angry", "crazy", "helpful", "mushy", "odd", "unsightly", "adorable", "important", "inexpensive", "cheap", "expensive", "fancy"];
+    const colours = ["red", "yellow", "blue", "green", "pink", "brown", "purple", "brown", "white", "black", "orange"];
+    const nouns = ["table", "chair", "house", "bbq", "desk", "car", "pony", "cookie", "sandwich", "burger", "pizza", "mouse", "keyboard"];
+    const l1 = adjectives.length, l2 = colours.length, l3 = nouns.length;
+    const nts = (n) => Math.round(n / 100)
 
-new class {
-    index = 1; data = []; labels = null; invalidLabels = true;
-    tbody = document.getElementsByTagName('tbody')[0];
-    constructor() {
-        this.tbody.onclick = this.onclick();
-        for (let key of ['run', 'runlots', 'add', 'update', 'clear', 'swaprows']) {
-            document.getElementById(key).onclick = (e) => { e.stopPropagation(); this[key](); }
-        }
-    };
-    run(n = 1000) { if (this.data.length) this.clear(); this.add(n); };
-    runlots() { this.run(10000) };
-    add(n = 1000) {
-        const adjectives = gAdjectives, colours = gColours, nouns = gNouns;
-        const l1 = adjectives.length, l2 = colours.length, l3 = nouns.length;
-        const nt = nts[n];
+    function run(n = 1000) { if (data.length) clear(); add(n); }
+    function runlots() { run(10000) }
+    function add(n = 1000) {
+        const nt = nts(n);
         let i, j = 0, r1, r2, r3;;
 
-        const itemTemplates = document.getElementById('itemTemplate').content.cloneNode(true);
+        const itemTemplates = document.getElementById(`t${n}`).content   // .cloneNode(true);
         if (itemTemplates.children.length < nt) {
             const itemTemplate = itemTemplates.firstElementChild;
             while (nt >= itemTemplates.children.length * 2) itemTemplates.appendChild(itemTemplates.cloneNode(true));
@@ -36,44 +29,42 @@ new class {
                 r1 = Math.round(Math.random() * 1000) % l1;
                 r2 = Math.round(Math.random() * 1000) % l2;
                 r3 = Math.round(Math.random() * 1000) % l3;
-                ids[i].nodeValue = this.index++;
-                this.data.push(labels[i].nodeValue = `${adjectives[r1]} ${colours[r2]} ${nouns[r3]}`);
+                ids[i].nodeValue = index++;
+                data.push(labels[i].nodeValue = `${adjectives[r1]} ${colours[r2]} ${nouns[r3]}`);
             }
-            this.tbody.appendChild(itemTemplates.cloneNode(true));
-        } this.invalidLabels = true;
+            tbody.appendChild(itemTemplates.cloneNode(true));
+        } invalidLabels = true;
     };
-    update() {
-        if (this.invalidLabels) this.labels = this.tbody.querySelectorAll('a.lbl'); this.invalidLabels = false;
-        const labels = this.labels, length = labels.length, data = this.data;
+    function update() {
+        if (invalidLabels) labels = tbody.querySelectorAll('a.lbl'); invalidLabels = false;
+        const length = labels.length;
         let i; for (i = 0; i < length; i += 10) labels[i].firstChild.nodeValue = data[i] += ' !!!';
     };
-    clear() { this.tbody.textContent = ''; this.data = []; this.invalidLabels = true; };
-    swaprows() {
-        const tbody = this.tbody, data = this.data;
-        if (tbody.children.length < 999) return; this.invalidLabels = true;
+    function clear() { tbody.textContent = ''; data = []; invalidLabels = true; };
+    function swaprows() {
+        if (tbody.children.length < 999) return; invalidLabels = true;
         const first = tbody.firstElementChild;
         [data[1], data[998]] = [data[998], data[1]];
         tbody.insertBefore(tbody.insertBefore(first.nextElementSibling, 
             tbody.children[998]).nextElementSibling, first.nextElementSibling);
     };
-    onclick() {
-        let selected;
-        return (e) => {
-            e.stopPropagation;
-            if (e.target.matches('a.lbl')) {
-                e.preventDefault;
-                const element = e.target.parentNode.parentNode;
-                if (element === selected) selected.className = selected.className ? "" : "danger";
-                else {
-                    if (selected) selected.className = "";
-                    element.className = "danger"; selected = element;
-                }
-            } else if (e.target.matches('span.remove')) { 
-                const element = e.target.parentNode.parentNode.parentNode;
-                const index = Array.prototype.indexOf.call(this.tbody.children, element);
-                element.remove(); this.invalidLabels = true;
-                this.data.splice(index, 1);
+    tbody.onclick = (e) => {
+        e.stopPropagation;
+        if (e.target.matches('a.lbl')) {
+            e.preventDefault;
+            const element = e.target.parentNode.parentNode;
+            if (element === selected) selected.className = selected.className ? "" : "danger";
+            else {
+                if (selected) selected.className = "";
+                element.className = "danger"; selected = element;
             }
+        } else if (e.target.matches('span.remove')) { 
+            const element = e.target.parentNode.parentNode.parentNode;
+            const index = Array.prototype.indexOf.call(tbody.children, element);
+            element.remove(); data.splice(index, 1); invalidLabels = true;
         }
     }
-}();
+    for (let [key, value] of Object.entries({run, runlots, add, update, clear, swaprows})) {
+        document.getElementById(key).onclick = (e) => { e.stopPropagation(); value(); }
+    }
+})();