MrChester
diff --git a/Collapse file
‎#5_DOM/homework4/consoleOutputElements.js‎
Copy file name to clipboard
+33Lines changed: 33 additions & 0 deletions b/Collapse file
‎#5_DOM/homework4/consoleOutputElements.js‎
Copy file name to clipboard
+33Lines changed: 33 additions & 0 deletions
diff --git a/Collapse file
‎#5_DOM/homework4/scanDom.js‎
Copy file name to clipboardExpand all lines: #5_DOM/homework4/scanDom.js
+24-2Lines changed: 24 additions & 2 deletions b/Collapse file
‎#5_DOM/homework4/scanDom.js‎
Copy file name to clipboardExpand all lines: #5_DOM/homework4/scanDom.js
+24-2Lines changed: 24 additions & 2 deletions
diff --git a/Collapse file
‎#5_DOM/js/main.js‎
Copy file name to clipboardExpand all lines: #5_DOM/js/main.js
+2-5Lines changed: 2 additions & 5 deletions b/Collapse file
‎#5_DOM/js/main.js‎
Copy file name to clipboardExpand all lines: #5_DOM/js/main.js
+2-5Lines changed: 2 additions & 5 deletions
@@ -0,0 +1,33 @@
+let scanDom = require('../homework4/scanDom.js');
+
+function consoleOutputElements() {
+
+    let tags = scanDom(document.documentElement);
+    let tag, classes, textNodes;
+
+    for(let i = 0; i<tags.length; i++){
+        switch (i){
+            case 0:
+                tag = tags[i];
+                break;
+            case 1:
+                classes = tags[i];
+                break;
+            case 2:
+                textNodes = tags[i];
+                break;
+        }
+    }
+
+    tag.forEach( (value, key) => {
+        console.log(`Тегов ${key}: ${value}`);
+    });
+    classes.forEach( (value, key) => {
+        console.log(`Классов ${key}: ${value}`);
+    });
+    textNodes.forEach( (value, key) => {
+        console.log(`Текстовых узлов: ${value}`);
+    });
+}
+
+module.exports = consoleOutputElements;
@@ -1,6 +1,7 @@
 /**
  * Created by fallenSoulDev on 10.09.2016.
  */
+var resultMap = new Map;
 var tagNameMap = new Map();
 var classNameMap = new Map();
 var textNodesMap = new Map();
@@ -10,7 +11,8 @@ function scanDom(Node) {
     for (var i = 0; i < Node.childNodes.length; i++) {
         var childNode = Node.childNodes[i];
         var tag = childNode.tagName;
-        // var className = childNode.className;
+        var nodeName = childNode.nodeName;
+        var className = childNode.className;
         if (childNode.nodeType === 1) {
             if (!tagNameMap.has(tag)) {
                 tagNameMap.set(tag, 1);
@@ -20,13 +22,33 @@ function scanDom(Node) {
                 let count = parseInt(val) + 1;
                 tagNameMap.set(tag, count);
             }
+            if (!classNameMap.has(className)) {
+                classNameMap.set(className, 1);
+            }
+            else {
+                let val = classNameMap.get(className);
+                let count = parseInt(val) + 1;
+                classNameMap.set(className, count);
+            }
         }
         if (childNode.nodeType !== 3) {
             scanDom(childNode);
         }
+        else{
+            if (!textNodesMap.has(nodeName)) {
+                textNodesMap.set(nodeName, 1);
+            }
+            else {
+                let val = textNodesMap.get(nodeName);
+                let count = parseInt(val) + 1;
+                textNodesMap.set(nodeName, count);
+            }
+        }
     }
+    return [tagNameMap, classNameMap, textNodesMap];
 }
-console.log(tagNameMap);
+
+// console.log(tagNameMap);
 // console.log(classNameMap);
 
 module.exports = scanDom;
 
@@ -5,7 +5,7 @@ let prepend = require('../homework1/prependFunction.js');
 let viewNodes = require('../_myTask/viewNodesFunction.js');
 let noRecursionDeleteTextNodes = require('../homework2/noRecursionDeleteTextNodes.js');
 let recursionDeleteTextNodes = require('../homework3/recursionDeleteTextNodes.js');
-let scanDom = require('../homework4/scanDom.js');
+let consoleOutputElements = require('../homework4/consoleOutputElements.js');
 // let scanDom2 = require('../homework4/scanDom2.js');
 
 
@@ -31,7 +31,4 @@ prepend(container, newElement);
 
 //сканирование дом дерева и подсчет узлов
 
-scanDom(document.documentElement);
-
-// scanDom2(document.body);
-
+consoleOutputElements();