Explorar o código

Ticket #4480 - Add service worker.

AntonLV %!s(int64=3) %!d(string=hai) anos
pai
achega
b8f55a5ff6

+ 1 - 11
modules/boonex/artificer/classes/BxArtificerTemplate.php

@@ -26,13 +26,6 @@ class BxArtificerTemplate extends BxBaseModGeneralTemplate
 
         switch($sType) {
             case 'head':
-                $this->addCssSystem([
-                    'main.css'
-                ]);
-
-                $this->addJsSystem([
-                    'utils.js'
-                ]);
                 $sResult .= $this->_oModule->_oTemplate->getJsCode('utils', [
                     'sColorScheme' => $this->_oConfig->getColorScheme()
                 ]);
@@ -40,14 +33,11 @@ class BxArtificerTemplate extends BxBaseModGeneralTemplate
                 $sCss = trim(getParam($this->_oConfig->getName() . '_styles_custom'));
                 if(!empty($sCss))
                     $sCss = $this->_wrapInTagCssCode($sCss);
-                
+
                 $sResult .= $sCss;
                 break;
 
             case 'footer':
-                $this->addJsSystem([
-                    'sidebar.js'
-                ]);
                 break;
         }
 

+ 4 - 0
modules/boonex/artificer/install/sql/disable.sql

@@ -18,5 +18,9 @@ DELETE FROM `sys_alerts` WHERE `handler_id` = @iHandler;
 DELETE FROM `sys_alerts_handlers` WHERE `id` = @iHandler;
 
 
+-- PRELOADER
+DELETE FROM `sys_preloader` WHERE `module` = @sName;
+
+
 -- INJECTIONS
 DELETE FROM `sys_injections` WHERE `name` LIKE 'bx_artificer_%';

+ 7 - 0
modules/boonex/artificer/install/sql/enable.sql

@@ -30,6 +30,13 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 ('profile', 'unit', @iHandler);
 
 
+-- PRELOADER
+INSERT INTO `sys_preloader` (`module`, `type`, `content`, `active`) VALUES
+('bx_artificer', 'css_system', 'modules/boonex/artificer/template/css/|main.css', 1),
+('bx_artificer', 'js_system', 'modules/boonex/artificer/js/|utils.js', 1),
+('bx_artificer', 'js_system', 'modules/boonex/artificer/js/|sidebar.js', 1);
+
+
 -- INJECTIONS
 INSERT INTO `sys_injections` (`name`, `page_index`, `key`, `type`, `data`, `replace`, `active`) VALUES
 ('bx_artificer_head', 0, 'injection_head', 'service', 'a:3:{s:6:"module";s:12:"bx_artificer";s:6:"method";s:14:"include_css_js";s:6:"params";a:1:{i:0;s:4:"head";}}', 0, 1),

+ 1 - 1
studio/classes/BxDolStudioDesigner.php

@@ -264,7 +264,7 @@ class BxDolStudioDesigner extends BxTemplStudioWidget
             if($bValue)
                 $iId = (int)bx_get($sIcon);
             else if($bFile) {
-                $iId = $oStorage->storeFileFromForm($_FILES[$sIcon], true, $iProfileId);
+                $iId = $oStorage->storeFileFromForm($_FILES[$sIcon], false, $iProfileId);
                 if($iId === false)
                     continue;
             }

+ 1 - 1
sw.js.php

@@ -32,7 +32,7 @@ if(($sCache = getParam('sys_pwa_sw_cache')) != '') {
             if(strpos($sItem, BX_DOL_URL_ROOT) === false)
                 $sItem = BX_DOL_URL_ROOT . $sItem;
 
-            $aAssets[] = $oTemplate->addRevision($sItem);
+            $aAssets[] = $sItem;
         }
 }