Merge pull request #13 from optimizely/cooper-adobe_evar_refactor

refactor code to work in IE for eVar integration

Author: Bigspencey

Integrations/Analytics/Adobe Analytics/eVar-prop Integration/config.json

@@ -1,6 +1,6 @@
 {
   "plugin_type": "analytics_integration",
-  "name": "Custom Adobe Analytics",
+  "name": "Custom Adobe Analytics [eVar]",
   "form_schema": [
     {
       "default_value": "eVar1",
@@ -1625,6 +1625,6 @@
   ],
   "description": "",
   "options": {
-    "track_layer_decision": "var decisionString = window.optimizely.get('state').getDecisionString({campaignId: campaignId, shouldCleanString: true});\nvar redirectInfo = window.optimizely.get('state').getRedirectInfo();\nvar eVar = extension.eVar;\nvar prop = extension.prop;\nvar campaignObject = {};\nif (!!eVar) campaignObject[eVar] = decisionString;\nif (!!prop) campaignObject[prop] = decisionString;\n\n// Public Methods\nvar adobeIntegrator = {\n\t// Array of active campaigns/experiments\n\tcampaignArray: [],\n\t// Accepts \"s\" variable as a param and assigns eVars to object.\n\tassignCampaigns: function(sVariable) {\n    if (!!redirectInfo) sVariable.referrer = redirectInfo.referrer;\n\t\tfor (var i = this.campaignArray.length-1; i >= 0; i--) {\n\t\t\tObject.assign(sVariable, this.campaignArray[i]);\n\t\t\tthis.campaignArray.splice(i, 1);\n\t\t}\n\t},\n\t// Accepts \"s\" variable as a param and assigns eVars to object, then dispatches custom link tracking.\n\ttrackDelayedCampaigns: function(sVariable) {\n\t\tfor (var i = this.campaignArray.length-1; i >= 0; i--) {\n      sVariable.linkTrackVars += \",\" + Object.keys(this.campaignArray[i])[0];\n\t\t\tObject.assign(sVariable, this.campaignArray[i]);\n\t\t\tthis.campaignArray.splice(i, 1);\n\t\t}\n\t\tsVariable.tl(true, \"o\", \"OptimizelyLayerDecision\");\n\t}\n};\n\n// Scopes `campaignArray` to Optimizely object.\nif (!window.optimizely.get(\"custom/adobeIntegrator\")) {\n\twindow.optimizely.push({\n\t\ttype: \"registerModule\",\n\t\tmoduleName: \"adobeIntegrator\",\n\t\tmodule: adobeIntegrator\n\t});\n}\n\n// Failing Audiences returns `null`, failing Traffic Allocation returns `undefined` for decisionString.\nif (!!decisionString) window.optimizely.get(\"custom/adobeIntegrator\").campaignArray.push(campaignObject);"
+    "track_layer_decision": "var decisionString = window.optimizely.get('state').getDecisionString({\n  campaignId: campaignId,\n  shouldCleanString: true\n});\nvar redirectInfo = window.optimizely.get('state').getRedirectInfo();\nvar eVar = extension.eVar;\nvar prop = extension.prop;\n\n// Public Methods\nvar adobeIntegrator = {\n  campaignDecisions: {},\n  // Accepts \"s\" variable as a param and assigns eVars to object.\n  populateTrackerClearDecisions: function(sVariable) {\n    for (var allocation in this.campaignDecisions) {\n      sVariable[allocation] = this.campaignDecisions[allocation];\n    }\n    this.campaignDecisions = {};\n  },\n  assignCampaigns: function(sVariable) {\n    if (!!redirectInfo) sVariable.referrer = redirectInfo.referrer;\n    this.populateTrackerClearDecisions(sVariable);\n  },\n  // Accepts \"s\" variable as a param and assigns eVars to object, then dispatches custom link tracking.\n  trackDelayedCampaigns: function(sVariable) {\n    this.populateTrackerClearDecisions(sVariable);\n    sVariable.tl(true, \"o\", \"OptimizelyLayerDecision\");\n  }\n};\n\n// Scopes `campaignArray` to Optimizely object.\nif (!window.optimizely.get(\"custom/adobeIntegrator\")) {\n  window.optimizely.push({\n    type: \"registerModule\",\n    moduleName: \"adobeIntegrator\",\n    module: adobeIntegrator\n  });\n}\n\n// Failing Audiences returns `null`, failing Traffic Allocation returns `undefined` for decisionString.\nif (!!decisionString) {\n  if (eVar) window.optimizely.get(\"custom/adobeIntegrator\").campaignDecisions[eVar] = decisionString;\n  if (prop) window.optimizely.get(\"custom/adobeIntegrator\").campaignDecisions[prop] = decisionString;\n}"
   }
 }

Integrations/Analytics/Adobe Analytics/eVar-prop Integration/integration.js

@@ -1,42 +1,43 @@
-var decisionString = window.optimizely.get('state').getDecisionString({campaignId: campaignId, shouldCleanString: true});
+var decisionString = window.optimizely.get('state').getDecisionString({
+  campaignId: campaignId,
+  shouldCleanString: true
+});
 var redirectInfo = window.optimizely.get('state').getRedirectInfo();
 var eVar = extension.eVar;
 var prop = extension.prop;
-var campaignObject = {};
-if (!!eVar) campaignObject[eVar] = decisionString;
-if (!!prop) campaignObject[prop] = decisionString;
 
 // Public Methods
 var adobeIntegrator = {
-	// Array of active campaigns/experiments
-	campaignArray: [],
-	// Accepts "s" variable as a param and assigns eVars to object.
-	assignCampaigns: function(sVariable) {
+  campaignDecisions: {},
+  // Accepts "s" variable as a param and assigns eVars to object.
+  populateTrackerClearDecisions: function(sVariable) {
+    for (var allocation in this.campaignDecisions) {
+      sVariable[allocation] = this.campaignDecisions[allocation];
+    }
+    this.campaignDecisions = {};
+  },
+  assignCampaigns: function(sVariable) {
     if (!!redirectInfo) sVariable.referrer = redirectInfo.referrer;
-		for (var i = this.campaignArray.length-1; i >= 0; i--) {
-			Object.assign(sVariable, this.campaignArray[i]);
-			this.campaignArray.splice(i, 1);
-		}
-	},
-	// Accepts "s" variable as a param and assigns eVars to object, then dispatches custom link tracking.
-	trackDelayedCampaigns: function(sVariable) {
-		for (var i = this.campaignArray.length-1; i >= 0; i--) {
-      sVariable.linkTrackVars += "," + Object.keys(this.campaignArray[i])[0];
-			Object.assign(sVariable, this.campaignArray[i]);
-			this.campaignArray.splice(i, 1);
-		}
-		sVariable.tl(true, "o", "OptimizelyLayerDecision");
-	}
+    this.populateTrackerClearDecisions(sVariable);
+  },
+  // Accepts "s" variable as a param and assigns eVars to object, then dispatches custom link tracking.
+  trackDelayedCampaigns: function(sVariable) {
+    this.populateTrackerClearDecisions(sVariable);
+    sVariable.tl(true, "o", "OptimizelyLayerDecision");
+  }
 };
 
 // Scopes `campaignArray` to Optimizely object.
 if (!window.optimizely.get("custom/adobeIntegrator")) {
-	window.optimizely.push({
-		type: "registerModule",
-		moduleName: "adobeIntegrator",
-		module: adobeIntegrator
-	});
+  window.optimizely.push({
+    type: "registerModule",
+    moduleName: "adobeIntegrator",
+    module: adobeIntegrator
+  });
 }
 
 // Failing Audiences returns `null`, failing Traffic Allocation returns `undefined` for decisionString.
-if (!!decisionString) window.optimizely.get("custom/adobeIntegrator").campaignArray.push(campaignObject);
+if (!!decisionString) {
+  if (eVar) window.optimizely.get("custom/adobeIntegrator").campaignDecisions[eVar] = decisionString;
+  if (prop) window.optimizely.get("custom/adobeIntegrator").campaignDecisions[prop] = decisionString;
+}