From ca78b5ab33d4d30b03eca26a2cce27764254b28c Mon Sep 17 00:00:00 2001
From: Ken Hawkins <khawkins98@gmail.com>
Date: Mon, 21 May 2018 11:07:45 +0100
Subject: [PATCH] Properly invoke DP panner #137
---
.../script/5_ebiFrameworkNotificationBanner.js | 9 ++++++---
.../script/6_ebiFrameworkInvokeScripts.js | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js b/js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js
index 8f238365..447a310b 100644
--- a/js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js
+++ b/js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js
@@ -75,9 +75,12 @@ var dataProtectionSettings = new Object();
* @param {string} [targetedFrameworkVersion=generic] targeted Framework version; options: 1.1, 1.2, 1.3, compliance
*/
function ebiFrameworkRunDataProtectionBanner(targetedFrameworkVersion) {
- targetedFrameworkVersion = targetedFrameworkVersion || newDataProtectionNotificationBanner.src.split('legacyRequest=')[1] || 'generic';
try {
+ if (typeof newDataProtectionNotificationBanner !== "undefined") {
+ targetedFrameworkVersion = targetedFrameworkVersion || newDataProtectionNotificationBanner.src.split('legacyRequest=')[1] || 'generic';
+ }
+
// remove any old style cookie banner
switch (targetedFrameworkVersion) {
case '1.1':
@@ -94,7 +97,7 @@ function ebiFrameworkRunDataProtectionBanner(targetedFrameworkVersion) {
document.body.style.paddingTop = 0;
break;
default:
- console.warn('You should specify the targetedFrameworkVersion');
+ console.warn('You should specify the targeted FrameworkVersion');
}
@@ -139,4 +142,4 @@ function ebiFrameworkCookieBanner() {
}
// execute
-ebiFrameworkRunDataProtectionBanner('1.3');
+// ebiFrameworkRunDataProtectionBanner('1.3');
diff --git a/js/ebi-global-includes/script/6_ebiFrameworkInvokeScripts.js b/js/ebi-global-includes/script/6_ebiFrameworkInvokeScripts.js
index 13746e5e..1e508c08 100644
--- a/js/ebi-global-includes/script/6_ebiFrameworkInvokeScripts.js
+++ b/js/ebi-global-includes/script/6_ebiFrameworkInvokeScripts.js
@@ -16,7 +16,7 @@ function ebiFrameworkInvokeScripts() {
ebiFrameworkUpdateFoot();
ebiFrameworkUpdateFooterMeta();
ebiFrameworkIncludeAnnouncements();
- ebiFrameworkRunDataProtectionBanner();
+ ebiFrameworkRunDataProtectionBanner('1.3');
}
document.addEventListener("DOMContentLoaded", function(event) {
--
GitLab