mod-build 3.6.52-beta.3 → 3.6.52-beta.4

package/gulp-tasks/templates.js

@@ -242,11 +242,11 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	};
 
 	return async function() {
-		if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
+		if (templatesData && !templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
 			await getDefaultFormFieldConfig();
 		}
 
-		if (!templatesData.tcpaText && templatesData.primary_trade) {
+		if (templatesData && !templatesData.tcpaText && templatesData.primary_trade) {
 			await fetchTcpaFromSitegenie();
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.52-beta.3",
+  "version": "3.6.52-beta.4",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/scripts/mod-form-contractor.js

@@ -137,21 +137,17 @@ modForm.mapProjectValue = function(trade) {
  */
 modForm.preprocessContractorFormData = function(formData, currentStep) {
 	if (currentStep === 0) {
-		var heapCookie = window.heap && window.heap.appid ? window.modUtils.getCookie('_hp2_id.' + window.heap.appid) : null,
+		var heapCookieData = modUtils.getHeapCookieData(),
 			attributionKeys = modUtils.getSupportedTrackingParams();
 
 		formData.primaryProjectClass = this.mapProjectValue(formData.primaryProjectClass);
 
-		if (heapCookie) {
-			var heapCookieData = JSON.parse(decodeURIComponent(heapCookie));
-
-			// Check heap cookie for tracking params and append to form
-			$.each(heapCookieData, function(name, value) {
-				if (attributionKeys.indexOf(name) > -1) {
-					formData[name] = value;
-				}
-			});
-		}
+		// Check heap cookie for tracking params and append to form
+		$.each(heapCookieData, function(name, value) {
+			if (attributionKeys.indexOf(name) > -1) {
+				formData[name] = value;
+			}
+		});
 
 		// Check Eloqua GUID cookie value and add it to formData
 		var elqGUID = this.elqGetGuidCookieValue();