Merge pull request #251 from PrestaSafe/3.1.1

3.1.1

Author: PrestaSafe

_dev/src/components/Block.vue

@@ -53,7 +53,6 @@ const AddOnZOne = async (code) => {
     ajax_token: security_app.ajax_token,
   };
   let url = ajax_urls.block_action_urls;
-  console.log(url, params)
 let data = await HttpClient.get(url, params);
 
   prettyBlocksContext.emit("toggleModal");  

_dev/src/components/LeftPanel.vue

@@ -196,7 +196,7 @@ const deleteAllBlocks = async () => {
 
           if (response.success) {
             toaster.show(response.message)
-            prettyBlocksContext.reloadIframe()
+            window.location.reload()
           }
     })
     .catch(error => console.error(error));

_dev/src/components/Modal.vue

@@ -54,7 +54,12 @@ onBeforeUnmount(() => {
 })
 
 
-
+/**
+ * reload blocks after save settings
+ */
+prettyBlocksContext.on('afterSaveSettings', () => {
+  getBlocksAvailable()
+})
 
 const getBlocksAvailable = () => {
   HttpClient.get(ajax_urls.blocks_available)

_dev/src/components/PanelThemeSettings.vue

@@ -77,6 +77,7 @@ HttpClient.post(ajax_urls.state, params)
     if (data.message) {
      prettyBlocksContext.displayMessage(data.message)
       prettyBlocksContext.reloadIframe()
+      prettyBlocksContext.emit('afterSaveSettings')
     }
   })
   .catch(error => console.error(error));

_dev/src/scripts/eventHandler.js

@@ -33,10 +33,9 @@ export const eventHandler = async (event) => {
                         current_url: custom_url
                     }
                 });
+                prettyBlocksContext.changeUrl(custom_url)
                 if(force_reload) {
                     window.location.reload()
-                }else{
-                    prettyBlocksContext.changeUrl(custom_url)
                 }
             }
 

_dev/src/store/pinia.js

@@ -196,6 +196,11 @@ export const usePrettyBlocksContext = defineStore('prettyBlocksContext', {
     },  
     pushUrl(url) {
       const currentUrl = new URL(window.location.href);
+      
+      // Remove 'id' and 'endpoint' parameters if they exist
+      currentUrl.searchParams.delete('id');
+      currentUrl.searchParams.delete('endpoint');
+      
       currentUrl.searchParams.set('startup_url', this.updateFilteredURL(url));
       window.history.replaceState({}, '', currentUrl.toString());
     },
@@ -208,6 +213,7 @@ export const usePrettyBlocksContext = defineStore('prettyBlocksContext', {
       } else if (!url.includes('prettyblocks')) {
           url += '&prettyblocks=1';
       }
+      
       return url;
     },
     reloadIframe(currentSrc = false) {

prettyblocks.php

@@ -72,7 +72,7 @@ public function __construct()
     {
         $this->name = 'prettyblocks';
         $this->tab = 'administration';
-        $this->version = '3.1.0';
+        $this->version = '3.1.1';
         $this->author = 'PrestaSafe';
         $this->need_instance = 1;
         $this->js_path = $this->_path . 'views/js/';
@@ -283,7 +283,6 @@ public function hookdisplayBackOfficeHeader($params)
             $this->context->controller->addJS($this->_path . 'views/js/back.js');
         }
         $this->context->controller->addCSS($this->_path . 'views/css/back.css');
-
     }
 
     public function install()
@@ -443,7 +442,8 @@ public function hookdisplayHeader($params)
             // todo register css and js on iframe only from Hook
         }
         // load default blocks styles
-        if (!TplSettings::getSettings('remove_default_blocks')) {
+
+        if (!TplSettings::getSettings('remove_default_blocks', false)) {
             $this->context->controller->registerStylesheet(
                 'tiny-slider-css',
                 'https://cdnjs.cloudflare.com/ajax/libs/tiny-slider/2.9.4/tiny-slider.css',
@@ -677,7 +677,6 @@ public function hookActionRegisterThemeSettings()
                 'description' => $this->l('Remove default blocks (if you using yours custom blocks)'), // description to display
                 'tab' => 'Settings',
                 'default' => false, // default value (Boolean)
-                'private' => true,
             ],
         ];
     }
@@ -694,8 +693,7 @@ public function hookActionRegisterBlock($params)
             new PrettyBlocksCmsContentBlock($this),
             new PrettyBlocksCategoryDescriptionBlock($this),
         ];
-
-        if (!TplSettings::getSettings('remove_default_blocks')) {
+        if (!TplSettings::getSettings('remove_default_blocks', false)) {
             $defaultsBlocks[] = new PrettyBlocksTinySlider($this);
             $defaultsBlocks[] = new PrettyBlocksCustomImage($this);
             $defaultsBlocks[] = new PrettyBlocksFAQ($this);

views/css/_dev/main.css

@@ -168,4 +168,4 @@
     left: 50%;                
     right: 50%;               
     transform: translateX(-50%); 
-}
+}

views/css/dist/main.css

@@ -1652,4 +1652,4 @@
       paint-order: markers;
     }
   }
-}
+}

views/css/iframe.css

@@ -106,6 +106,7 @@
   border-radius: 4px;
 }
 
+
 /* [data-prettyblocks-zone].ondrag{
 background-color: #646cff;
 border: 1px solid #646cff;