@sapui5/sap.webanalytics.core 1.84.0 → 1.84.3

package/src/sap/webanalytics/core/library.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2020 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 /**
@@ -30,7 +30,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/core/library'],
 		controls: [],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.84.0"
+		version: "1.84.3"
 	});
 
 	return sap.webanalytics.core;

package/src/sap/webanalytics/core/tracker/js/track.js

@@ -211,8 +211,6 @@
       return;
     }
 
-    //Fetch the text
-    getDefaultTextForConsent();
     //Get the swa.consentStyle and swa.consentOnLoad, if consentStyle popup, show pop up on load is true, show banner and pop up if tracking status is off
     if (swa.loggingEnabled == "N" || swa.loggingEnabled == "A") {
       if (swa.consentStyle == "popup" && swa.consentOnLoad) {
@@ -426,7 +424,7 @@
       swa.privacyLinkText = i18nValues[6];
       swa.anonymousConsentText = i18nValues[7];
       swa.anonymousConsentOptOutText=i18nValues[8];
-      swa.anonymizeButtonText = defaultConsentValues[9];
+      swa.anonymizeButtonText = i18nValues[9];
       swa.customConsentOptionText = i18nValues[10];
       swa.trackOnStatus = i18nValues[11];
       swa.trackOffStatus = i18nValues[12];
@@ -2464,8 +2462,8 @@ banner_save(event);
     var isUI5 = false;
     var i18nurl = "";
     if (
-      (typeof swa.consentOptInText !== "undefined" ||
-        typeof swa.consentOptOutText !== "undefined") &&
+      (swa.consentOptInText !== undefined ||
+        swa.consentOptOutText !== undefined ||swa.anonymousConsentText!== undefined || swa.anonymousConsentOptOutText !== undefined) &&
       count < 1
     ) {
       consentTextPresent = true;
@@ -2550,22 +2548,22 @@ banner_save(event);
         : oBundle.TRACKING_STATUS_TEXT;
     }
 
-    if (typeof swa.consentOptInText === "undefined")
+    if ( swa.consentOptInText === undefined)
       swa.consentOptInText = isUI5
         ? oBundle.getText("CONSENT_OPT_IN_TEXT")
         : oBundle.CONSENT_OPT_IN_TEXT;
 
-    if (typeof swa.consentOptOutText === "undefined")
+    if ( swa.consentOptOutText === undefined)
       swa.consentOptOutText = isUI5
         ? oBundle.getText("CONSENT_OPT_OUT_TEXT")
         : oBundle.CONSENT_OPT_OUT_TEXT;
 
-    if (typeof swa.anonymousConsentText === "undefined")
+    if (swa.anonymousConsentText === undefined)
       swa.anonymousConsentText = isUI5
       ? oBundle.getText('ANONYMOUS_CONSENT_OPT_IN_TEXT')
       : oBundle.ANONYMOUS_CONSENT_OPT_IN_TEXT;
 
-    if (typeof swa.anonymousConsentOptOutText === "undefined")
+    if (swa.anonymousConsentOptOutText === undefined)
       swa.anonymousConsentOptOutText = isUI5
       ? oBundle.getText('ANONYMOUS_CONSENT_OPT_OUT_TEXT')
       : oBundle.ANONYMOUS_CONSENT_OPT_OUT_TEXT;
@@ -2643,35 +2641,21 @@ banner_save(event);
   }
 
   function getDefaultTextForConsent() {
-    if (typeof swa.consentOptInText === "undefined"  || swa.consentOptOutText === "undefined" || swa.anonymousConsentOptOutText === "undefined" || swa.anonymousConsentText === "undefined") {
-      swa.consentOptInText = defaultConsentValues[0];
-      swa.consentOptOutText = defaultConsentValues[1];
-      swa.consentAllowButton = defaultConsentValues[2];
-      swa.consentDenyButton = defaultConsentValues[3];
-      swa.consentStopButton = defaultConsentValues[4];
-      swa.consentCloseButton = defaultConsentValues[5];
-      swa.privacyLinkText = defaultConsentValues[6];
-      swa.anonymousConsentText = defaultConsentValues[7];
-      swa.anonymousConsentOptOutText = defaultConsentValues[8];
-      swa.anonymizeButtonText = defaultConsentValues[9];
-      swa.customConsentOptionText = defaultConsentValues[10];
-      swa.trackOnStatus = defaultConsentValues[11];
-      swa.trackOffStatus = defaultConsentValues[12];
-      swa.trackAnonymousStatus = defaultConsentValues[13];
-      swa.trackingStatusText = defaultConsentValues[14];
-    }
-
-    if (
-      swa.consentAllowButton === undefined ||
-      swa.consentDenyButton === undefined ||
-      swa.consentStopButton === undefined ||swa.anonymizeButtonText === undefined
-    ) {
-      swa.consentAllowButton = defaultConsentValues[2];
-      swa.consentDenyButton = defaultConsentValues[3];
-      swa.consentStopButton = defaultConsentValues[4];
-      swa.consentCloseButton = defaultConsentValues[5];
-      swa.anonymizeButtonText = defaultConsentValues[9];
-    }
+    swa.consentOptInText = (swa.consentOptInText === undefined)?(i18nValues[0] == undefined ?defaultConsentValues[0]:i18nValues[0]):swa.consentOptInText;
+      swa.consentOptOutText = (swa.consentOptOutText === undefined)?(i18nValues[1] == undefined ?defaultConsentValues[1]:i18nValues[1]):swa.consentOptOutText;
+      swa.anonymousConsentText = (swa.anonymousConsentText === undefined)?(i18nValues[7] == undefined ?defaultConsentValues[7]:i18nValues[7]):swa.anonymousConsentText;
+      swa.anonymousConsentOptOutText = (swa.anonymousConsentOptOutText === undefined)?(i18nValues[8] == undefined ?defaultConsentValues[8]:i18nValues[8]):swa.anonymousConsentOptOutText;     
+      swa.consentAllowButton =(swa.consentAllowButton === undefined)? (i18nValues[2] == undefined ?defaultConsentValues[2]:i18nValues[2]):swa.consentAllowButton;
+      swa.consentDenyButton = (swa.consentDenyButton === undefined)? (i18nValues[3] == undefined ?defaultConsentValues[3]:i18nValues[3]):swa.consentDenyButton;
+      swa.consentStopButton = (swa.consentStopButton === undefined)? (i18nValues[4] == undefined ?defaultConsentValues[4]:i18nValues[4]):swa.consentStopButton;
+      swa.consentCloseButton = (swa.consentCloseButton === undefined)? (i18nValues[5] == undefined ?defaultConsentValues[5]:i18nValues[5]):swa.consentCloseButton;
+      swa.privacyLinkText = (swa.privacyLinkText === undefined)? (i18nValues[6] == undefined ?defaultConsentValues[6]:i18nValues[6]):swa.privacyLinkText;
+      swa.anonymizeButtonText = (swa.anonymizeButtonText === undefined)? (i18nValues[9] == undefined ?defaultConsentValues[9]:i18nValues[9]):swa.anonymizeButtonText;
+      swa.customConsentOptionText = (swa.customConsentOptionText === undefined)? (i18nValues[10] == undefined ?defaultConsentValues[10]:i18nValues[10]):swa.customConsentOptionText;
+      swa.trackOnStatus = (swa.trackOnStatus === undefined)? (i18nValues[11] == undefined ?defaultConsentValues[11]:i18nValues[11]):swa.trackOnStatus;
+      swa.trackOffStatus = (swa.trackOffStatus === undefined)? (i18nValues[12] == undefined ?defaultConsentValues[12]:i18nValues[12]):swa.trackOffStatus;
+      swa.trackAnonymousStatus = (swa.trackAnonymousStatus === undefined)? (i18nValues[13] == undefined ?defaultConsentValues[13]:i18nValues[13]):swa.trackAnonymousStatus;
+      swa.trackingStatusText = (swa.trackingStatusText === undefined)? (i18nValues[14] == undefined ?defaultConsentValues[14]:i18nValues[14]): swa.trackingStatusText;
 
     //Add the privacy link to the "consentOptInText", if any. Handling cases where optIn banner has a link but when opting out, link is added again
     if(swa.privacyLink !== null && swa.consentOptInText !== undefined && swa.consentOptOutText !== undefined && swa.anonymousConsentText !== undefined && swa.anonymousConsentOptOutText !== undefined && swa.consentOptInText.indexOf("href") === -1 && swa.consentOptOutText.indexOf("href") === -1 && swa.anonymousConsentText.indexOf("href") === -1 && swa.anonymousConsentOptOutText.indexOf("href") === -1){