Better handling of missing elements in cookie controls JS

Nicholas K. Dionysopoulos · Nicholas K. Dionysopoulos · commit 2a0d0d66271b · 2018-08-24T13:30:35.000+03:00
diff --git a/plugins/system/datacompliancecookie/media/js/datacompliancecookies.js b/plugins/system/datacompliancecookie/media/js/datacompliancecookies.js
@@ -133,20 +133,20 @@ var AkeebaDataComplianceCookies = function (options)
 				var elAcceptedControls = document.getElementById('akeeba-dccc-controls-accepted');
 				var elDeclinedControls = document.getElementById('akeeba-dccc-controls-declined');
 
-				if (typeof elAcceptedControls !== 'undefined')
+				if ((elAcceptedControls !== null) && (typeof elAcceptedControls !== 'undefined'))
 				{
 					elAcceptedControls.style.display = 'none';
 				}
 
-				if (typeof elDeclinedControls !== 'undefined')
+				if ((elDeclinedControls !== null) && (typeof elDeclinedControls !== 'undefined'))
 				{
 					elDeclinedControls.style.display = 'none';
 				}
 
 				// Show banner
 				var elBanner = document.getElementById('akeeba-dccc-banner-container');
 
-				if (typeof elBanner !== 'undefined')
+				if ((elBanner !== null) && (typeof elBanner !== 'undefined'))
 				{
 					elBanner.style.display = 'block';
 				}
@@ -978,7 +978,7 @@ AkeebaDataComplianceCookies.documentReady(function ()
 	// Hide the banner
 	var elBanner = document.getElementById('akeeba-dccc-banner-container');
 
-	if (typeof elBanner !== 'undefined')
+	if ((elBanner !== null) && (typeof elBanner !== 'undefined'))
 	{
 		elBanner.style.display = 'none';
 	}
@@ -987,27 +987,27 @@ AkeebaDataComplianceCookies.documentReady(function ()
 	var elAcceptedControls = document.getElementById('akeeba-dccc-controls-accepted');
 	var elDeclinedControls = document.getElementById('akeeba-dccc-controls-declined');
 
-	if (typeof elAcceptedControls !== 'undefined')
+	if ((elAcceptedControls !== null) && (typeof elAcceptedControls !== 'undefined'))
 	{
 		elAcceptedControls.style.display = 'none';
 	}
 
-	if (typeof elDeclinedControls !== 'undefined')
+	if ((elDeclinedControls !== null) && (typeof elDeclinedControls !== 'undefined'))
 	{
 		elDeclinedControls.style.display = 'none';
 	}
 
 	// Find the control holder (akeeba-dccc-controls). If it's not found, exit immediately.
 	var elHolder = document.getElementById('akeeba-dccc-controls');
 
-	if (typeof elHolder === 'undefined')
+	if ((elHolder === null) || (typeof elHolder === 'undefined'))
 	{
 		return;
 	}
 
 	if (window.AkeebaDataComplianceCookies.vars.accepted)
 	{
-		if (typeof elAcceptedControls !== 'undefined')
+		if ((elAcceptedControls !== null) && (typeof elAcceptedControls !== 'undefined'))
 		{
 			// Show akeeba-dccc-controls-accepted
 			elAcceptedControls.style.display = 'block';
@@ -1019,7 +1019,7 @@ AkeebaDataComplianceCookies.documentReady(function ()
 		return;
 	}
 
-	if (typeof elDeclinedControls !== 'undefined')
+	if ((elDeclinedControls !== null) && (typeof elDeclinedControls !== 'undefined'))
 	{
 		// Show akeeba-dccc-controls-declined
 		elDeclinedControls.style.display = 'block';

Original file line number	Diff line number	Diff line change
`@@ -133,20 +133,20 @@ var AkeebaDataComplianceCookies = function (options)`
`133`	`133`	`var elAcceptedControls = document.getElementById('akeeba-dccc-controls-accepted');`
`134`	`134`	`var elDeclinedControls = document.getElementById('akeeba-dccc-controls-declined');`
`135`	`135`
`136`		`- if (typeof elAcceptedControls !== 'undefined')`
	`136`	`+ if ((elAcceptedControls !== null) && (typeof elAcceptedControls !== 'undefined'))`
`137`	`137`	`{`
`138`	`138`	`elAcceptedControls.style.display = 'none';`
`139`	`139`	`}`
`140`	`140`
`141`		`- if (typeof elDeclinedControls !== 'undefined')`
	`141`	`+ if ((elDeclinedControls !== null) && (typeof elDeclinedControls !== 'undefined'))`
`142`	`142`	`{`
`143`	`143`	`elDeclinedControls.style.display = 'none';`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`// Show banner`
`147`	`147`	`var elBanner = document.getElementById('akeeba-dccc-banner-container');`
`148`	`148`
`149`		`- if (typeof elBanner !== 'undefined')`
	`149`	`+ if ((elBanner !== null) && (typeof elBanner !== 'undefined'))`
`150`	`150`	`{`
`151`	`151`	`elBanner.style.display = 'block';`
`152`	`152`	`}`
`@@ -978,7 +978,7 @@ AkeebaDataComplianceCookies.documentReady(function ()`
`978`	`978`	`// Hide the banner`
`979`	`979`	`var elBanner = document.getElementById('akeeba-dccc-banner-container');`
`980`	`980`
`981`		`- if (typeof elBanner !== 'undefined')`
	`981`	`+ if ((elBanner !== null) && (typeof elBanner !== 'undefined'))`
`982`	`982`	`{`
`983`	`983`	`elBanner.style.display = 'none';`
`984`	`984`	`}`
`@@ -987,27 +987,27 @@ AkeebaDataComplianceCookies.documentReady(function ()`
`987`	`987`	`var elAcceptedControls = document.getElementById('akeeba-dccc-controls-accepted');`
`988`	`988`	`var elDeclinedControls = document.getElementById('akeeba-dccc-controls-declined');`
`989`	`989`
`990`		`- if (typeof elAcceptedControls !== 'undefined')`
	`990`	`+ if ((elAcceptedControls !== null) && (typeof elAcceptedControls !== 'undefined'))`
`991`	`991`	`{`
`992`	`992`	`elAcceptedControls.style.display = 'none';`
`993`	`993`	`}`
`994`	`994`
`995`		`- if (typeof elDeclinedControls !== 'undefined')`
	`995`	`+ if ((elDeclinedControls !== null) && (typeof elDeclinedControls !== 'undefined'))`
`996`	`996`	`{`
`997`	`997`	`elDeclinedControls.style.display = 'none';`
`998`	`998`	`}`
`999`	`999`
`1000`	`1000`	`// Find the control holder (akeeba-dccc-controls). If it's not found, exit immediately.`
`1001`	`1001`	`var elHolder = document.getElementById('akeeba-dccc-controls');`
`1002`	`1002`
`1003`		`- if (typeof elHolder === 'undefined')`
	`1003`	`+ if ((elHolder === null) \|\| (typeof elHolder === 'undefined'))`
`1004`	`1004`	`{`
`1005`	`1005`	`return;`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`	`1008`	`if (window.AkeebaDataComplianceCookies.vars.accepted)`
`1009`	`1009`	`{`
`1010`		`- if (typeof elAcceptedControls !== 'undefined')`
	`1010`	`+ if ((elAcceptedControls !== null) && (typeof elAcceptedControls !== 'undefined'))`
`1011`	`1011`	`{`
`1012`	`1012`	`// Show akeeba-dccc-controls-accepted`
`1013`	`1013`	`elAcceptedControls.style.display = 'block';`
`@@ -1019,7 +1019,7 @@ AkeebaDataComplianceCookies.documentReady(function ()`
`1019`	`1019`	`return;`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`		`- if (typeof elDeclinedControls !== 'undefined')`
	`1022`	`+ if ((elDeclinedControls !== null) && (typeof elDeclinedControls !== 'undefined'))`
`1023`	`1023`	`{`
`1024`	`1024`	`// Show akeeba-dccc-controls-declined`
`1025`	`1025`	`elDeclinedControls.style.display = 'block';`