intermediary changes for eslint and browserify

rudderlabs · Sep 30, 2019 · 478d0d8 · 478d0d8
1 parent 36cdd39
commit 478d0d8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 39 deletions.
diff --git a/rudder-client-javascript/RudderClient.js b/rudder-client-javascript/RudderClient.js
@@ -44,15 +44,11 @@ function getCurrentTimeFormatted() {
 
 //Utility function to retrieve configuration JSON from server
 function getJSON(url, wrappers, isLoaded, callback) {
-  var xhr = null;
 
-  if (typeof window === "undefined") {
+
     //server-side integration, XHR is node module
-    var xmlHttpRequest = require("xmlhttprequest").XMLHttpRequest;
-    xhr = new xmlHttpRequest();
-  } else {
-    xhr = new XMLHttpRequest();
-  }
+
+  var xhr = new XMLHttpRequest();
   xhr.open("GET", url, false);
   xhr.onload = function () {
     var status = xhr.status;
@@ -1386,12 +1382,14 @@ class AnalyticsManager {
 
   initializeHubSpot(hubId, wrappers) {
     if (typeof window !== undefined) {
-      $.ajax({
+      /* $.ajax({
         async: false,
         url: "/integration/HubSpot.js",
         dataType: "script"
-      });
-    var _hub = new HubspotAnalyticsManager(hubId).init();
+      }); */
+    //var _hub = new HubspotAnalyticsManager(hubId).init();
+    var HubspotAnalyticsManager = require("./integration/Hubspot.js");
+    var _hub = new HubspotAnalyticsManager();
     if(_hub){
       console.log("===_hub===", _hub)
       wrappers.push(_hub)
@@ -1465,16 +1463,10 @@ class EventRepository {
     payload.batch = this.eventsBuffer;
     payload.write_key = this.write_key;
     payload.sent_at = getCurrentTimeFormatted();
-
-    var xhr = null;
-
-    if (typeof window === "undefined") {
       //server-side integration, XHR is node module
-      var xmlHttpRequest = require("xmlhttprequest").XMLHttpRequest;
-      xhr = new xmlHttpRequest();
-    } else {
-      xhr = new XMLHttpRequest();
-    }
+
+    var  xhr = new XMLHttpRequest();
+
 
     console.log(JSON.stringify(payload, replacer));
 
@@ -1995,6 +1987,9 @@ var RudderClient = (function () {
   };
 })();
 
+window.RudderClient = RudderClient; 
+window.RudderConfig = RudderConfig;
+
 //Sample Usage
 
 /* var client

diff --git a/rudder-client-javascript/integration/HubSpot.js b/rudder-client-javascript/integration/HubSpot.js
@@ -1,4 +1,4 @@
-function HubspotAnalyticsManager(hubId) {
+var HubspotAnalyticsManager = function HubspotAnalyticsManager(hubId) {
   this.hubId = hubId
   this.init = function(){
     if(typeof window !== undefined){
@@ -50,38 +50,29 @@ function HubspotAnalyticsManager(hubId) {
       var traits = rudderElement.rl_message.rl_context.rl_traits
       var traitsValue = {}
 
-      for(k in traits){
-        if(traits.hasOwnProperty(k)){
+      for(var k in traits){
           if(traits[k]){
             var hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
             traitsValue[hubspotkey] = traits[k]
           }
-
-        }
       }
       if(traitsValue['address']){
         var address = traitsValue['address']
         //traitsValue.delete(address)
         delete traitsValue['address']
         for(k in address){
-          if(address.hasOwnProperty(k)){
-            if(address[k]){
-              var hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
-              hubspotkey = (hubspotkey == 'street') ? 'address' : hubspotkey
-              traitsValue[hubspotkey] = address[k]
-            }
-
+          if(address[k]){
+            hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
+            hubspotkey = (hubspotkey == 'street') ? 'address' : hubspotkey
+            traitsValue[hubspotkey] = address[k]
           }
         }
       }
       var userProperties = rudderElement.rl_message.rl_context.rl_user_properties
       for(k in userProperties){
-        if(userProperties.hasOwnProperty(k)){
-          if(userProperties[k]){
-            var hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
-            traitsValue[hubspotkey] = userProperties[k]
-          }
-
+        if(userProperties[k]){
+          hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
+          traitsValue[hubspotkey] = userProperties[k]
         }
       }
 
@@ -114,9 +105,10 @@ function HubspotAnalyticsManager(hubId) {
       _hsq.push(['trackPageView']);
     }
   }
-  var hb
+  /* var hb
   function initHubSpot(hubId){//6405167
     hb = hb || new HubspotAnalyticsManager(hubId)
     return hb
-  }
+  } */
+  module.exports = HubspotAnalyticsManager