code clean up and logger

rudderlabs · Feb 17, 2020 · 306047c · 306047c
1 parent 95c98fe
commit 306047c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 28 deletions.
diff --git a/rudder-client-javascript/analytics/dist/rudder.min.js b/rudder-client-javascript/analytics/dist/rudder.min.js
diff --git a/rudder-client-javascript/analytics/utils/autotrack.js b/rudder-client-javascript/analytics/utils/autotrack.js
@@ -1,10 +1,6 @@
 import {getDefaultPageProperties} from "./utils"
+import logger from "./logUtil";
 function addDomEventHandlers(rudderanalytics) {
-    /* var handler = bind(function(e) {
-        console.log("handler");
-        e = e || window.event;
-        console.log("handler");
-    }, this); */
     var handler = e => {
         e = e || window.event;
         var target = e.target || e.srcElement;
@@ -13,9 +9,9 @@ function addDomEventHandlers(rudderanalytics) {
             target = target.parentNode;
         }
         if(shouldTrackDomEvent(target, e)){
-            console.log("to be tracked ", e.type);
+            logger.debug("to be tracked ", e.type);
         } else {
-            console.log("not to be tracked ", e.type);
+            logger.debug("not to be tracked ", e.type);
         }
         trackWindowEvent(e, rudderanalytics);
 
@@ -28,7 +24,7 @@ function addDomEventHandlers(rudderanalytics) {
 
 function register_event (element, type, handler, useCapture) {
     if (!element) {
-        console.error('No valid element provided to register_event');
+        logger.error('No valid element provided to register_event');
         return;
     }
     element.addEventListener(type, handler, !!useCapture);
@@ -95,13 +91,11 @@ function trackWindowEvent(e, rudderanalytics) {
 
     if (shouldTrackDomEvent(target, e)) {
         var targetElementList = [target];
-        console.log(targetElementList)
         var curEl = target;
         while (curEl.parentNode && !isTag(curEl, 'body')) {
             targetElementList.push(curEl.parentNode);
             curEl = curEl.parentNode;
         }
-        console.log(targetElementList)
 
         var elementsJson = [];
         var href, explicitNoTrack = false;
@@ -142,7 +136,7 @@ function trackWindowEvent(e, rudderanalytics) {
             'el_attr_href': href,
             'el_text': elementText
         }
-        console.log('web_event', props);
+        logger.debug('web_event', props);
         rudderanalytics.track('autotrack', props);
         return true;
     }
@@ -152,7 +146,6 @@ function getText(el){
     var text = "";
     el.childNodes.forEach(function(value){
         if(value.nodeType === Node.TEXT_NODE) { 
-           console.log("Current textNode value is : ", value.nodeValue.trim())
            text += value.nodeValue;
         }
     });	
@@ -164,10 +157,8 @@ function getPropertiesFromElement(elem) {
         'classes': getClassName(elem).split(' '),
         'tag_name': elem.tagName.toLowerCase()
     };
-    console.log(elem.attributes)
 
     let attrLength = elem.attributes.length;
-    console.log(elem.attributes.length, typeof(elem.attributes))
     for(let i=0;i<attrLength;i++){
         let name = elem.attributes[i].name;
         let value = elem.attributes[i].value;

diff --git a/tests/html/browser.js b/tests/html/browser.js
@@ -5660,11 +5660,6 @@ var rudderanalytics = (function (exports) {
   var eventRepository = new EventRepository();
 
   function addDomEventHandlers(rudderanalytics) {
-    /* var handler = bind(function(e) {
-        console.log("handler");
-        e = e || window.event;
-        console.log("handler");
-    }, this); */
     var handler = function handler(e) {
       e = e || window.event;
       var target = e.target || e.srcElement;
@@ -5674,9 +5669,9 @@ var rudderanalytics = (function (exports) {
       }
 
       if (shouldTrackDomEvent(target, e)) {
-        console.log("to be tracked ", e.type);
+        logger.debug("to be tracked ", e.type);
       } else {
-        console.log("not to be tracked ", e.type);
+        logger.debug("not to be tracked ", e.type);
       }
 
       trackWindowEvent(e, rudderanalytics);
@@ -5690,7 +5685,7 @@ var rudderanalytics = (function (exports) {
 
   function register_event(element, type, handler, useCapture) {
     if (!element) {
-      console.error('No valid element provided to register_event');
+      logger.error('No valid element provided to register_event');
       return;
     }
 
@@ -5768,15 +5763,13 @@ var rudderanalytics = (function (exports) {
 
     if (shouldTrackDomEvent(target, e)) {
       var targetElementList = [target];
-      console.log(targetElementList);
       var curEl = target;
 
       while (curEl.parentNode && !isTag(curEl, 'body')) {
         targetElementList.push(curEl.parentNode);
         curEl = curEl.parentNode;
       }
 
-      console.log(targetElementList);
       var elementsJson = [];
       var href,
           explicitNoTrack = false;
@@ -5817,7 +5810,7 @@ var rudderanalytics = (function (exports) {
         'el_attr_href': href,
         'el_text': elementText
       };
-      console.log('web_event', props);
+      logger.debug('web_event', props);
       rudderanalytics.track('autotrack', props);
       return true;
     }
@@ -5827,7 +5820,6 @@ var rudderanalytics = (function (exports) {
     var text = "";
     el.childNodes.forEach(function (value) {
       if (value.nodeType === Node.TEXT_NODE) {
-        console.log("Current textNode value is : ", value.nodeValue.trim());
         text += value.nodeValue;
       }
     });
@@ -5839,9 +5831,7 @@ var rudderanalytics = (function (exports) {
       'classes': getClassName(elem).split(' '),
       'tag_name': elem.tagName.toLowerCase()
     };
-    console.log(elem.attributes);
     var attrLength = elem.attributes.length;
-    console.log(elem.attributes.length, _typeof(elem.attributes));
 
     for (var i = 0; i < attrLength; i++) {
       var name = elem.attributes[i].name;