Merge pull request #14 from TecArt/issue#11

Issue#11

Author: ChristianaHoJo

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.1.8
+## 2/2023
+1. [](#improved)
+* make script text label required in blueprint
+* fix bug that removes active scripts with disable toggler
+
 # v0.1.7
 ## 3/2022
 1. [](#new)

assets/js/tecart-cookie-manager.js

@@ -37,7 +37,7 @@ class TecartCookieBanner{
         // Button settings
         let buttonSettings = '';
         if(this.getCookieBannerContent(this.cookieBannerData).buttonSettingsActive == 'activated'){
-           buttonSettings = '<a aria-label="settings" role="button" tabIndex="0" class="button cc-btn cc-setting tcb-settings-btn '+this.getCookieBannerContent(this.cookieBannerData).buttonSettingsLayout+'" id="tcb-settings">'+this.getCookieBannerContent(this.cookieBannerData).settings+'</a>';
+            buttonSettings = '<a aria-label="settings" role="button" tabIndex="0" class="button cc-btn cc-setting tcb-settings-btn '+this.getCookieBannerContent(this.cookieBannerData).buttonSettingsLayout+'" id="tcb-settings">'+this.getCookieBannerContent(this.cookieBannerData).settings+'</a>';
         }
 
         // Button deny
@@ -444,7 +444,7 @@ class TecartCookieBanner{
 
     /**
      * add script tags to DOM
-    */
+     */
     addScriptTagToDOM(codePos, codeItem) {
 
         //add script to head tag
@@ -470,7 +470,7 @@ class TecartCookieBanner{
 
     /**
      * remove tags with given data-title
-    */
+     */
     removeCodeTagByTitle(dataTitle) {
 
         if(dataTitle !== ''){
@@ -577,9 +577,9 @@ class TecartCookieBanner{
                 let cat_toggler = '';
                 if (json_data[i].category_cookies === 'activated') {
                     cat_toggler = '<label class="tcb-switch tcb-categories-switch">' +
-                                    '<input type="checkbox" '+activated+' id="cat_'+catTitleEncoded+'" value="'+catTitleEncoded+'"  name="tcbCookieCategories"  />' +
-                                    '<span class="tcb-slider tcb-round"></span>' +
-                                  '</label>';
+                        '<input type="checkbox" '+activated+' id="cat_'+catTitleEncoded+'" value="'+catTitleEncoded+'"  name="tcbCookieCategories"  />' +
+                        '<span class="tcb-slider tcb-round"></span>' +
+                        '</label>';
                 }
 
                 //set checked tab
@@ -702,7 +702,7 @@ class TecartCookieBanner{
         this.cookieConsentScriptsArray = new Map();
 
         //get selected scripts
-        selectedScripts = Array.from(document.querySelectorAll('input[name=tcbCookieScripts]'))
+        selectedScripts = Array.from(document.querySelectorAll('input[name=tcbCookieScripts], input[name=tcbDisabledCookieScripts]'))
             .filter((checkbox) => checkbox.checked)
             .map((checkbox) => checkbox.value);
 
@@ -712,6 +712,7 @@ class TecartCookieBanner{
                 this.cookieConsentScriptsArray.set(selectedScripts[i],{allowed:true});
             }
         }
+
         //get selected categories
         selectedCats = Array.from(document.querySelectorAll('input[name=tcbCookieCategories]'))
             .filter((checkbox) => checkbox.checked)
@@ -747,7 +748,7 @@ class TecartCookieBanner{
 
     /**
      * checkboxes selected
-    */
+     */
     onScrollIncludes() {
 
         if(this.cookieConsentScrolled !== 'scrolled'){

assets/js/tecart-cookie-manager.min.js

@@ -1,5 +1,5 @@
 name: TecArt Cookie Manager
-version: 0.1.7
+version: 0.1.8
 description: "TecArt cookie banner manager provides a cookie banner plugin with complete cookie management in admin and extended frontend views. The plugin is based on the popular **[CookieConsent](https://cookieconsent.osano.com/) JS-library** by Osano."
 icon: shield
 author:

blueprints.yaml

@@ -25,6 +25,7 @@ form:
           rows: 5
           label: PLUGIN_TECART_COOKIE_MANAGER.SCRIPT_TEXT
           validate:
+            required: true
             type: textarea
         .script_category:
           type: select