Ticket #1249

inc/classes/BxDolModuleTemplate.php

@@ -43,11 +43,21 @@ class BxDolModuleTemplate extends BxDolTemplate
         $this->_oTemplateFunctions = BxTemplFunctions::getInstance($this);
     }
 
+    function addCssSystem($mixedFiles, $bDynamic = false)
+    {
+        return $this->_addFiles(BxDolTemplate::getInstance(), 'addCssSystem', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true);
+    }
+
     function addCss($mixedFiles, $bDynamic = false)
     {
         return $this->_addFiles(BxDolTemplate::getInstance(), 'addCss', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true);
     }
 
+    function addJsSystem($mixedFiles, $bDynamic = false)
+    {
+        return $this->_addFiles(BxDolTemplate::getInstance(), 'addJsSystem', 'isLocationJs', 'addLocationJs', 'removeLocationJs', 'js/', $mixedFiles, $bDynamic, true);
+    }
+
     function addJs($mixedFiles, $bDynamic = false)
     {
         return $this->_addFiles(BxDolTemplate::getInstance(), 'addJs', 'isLocationJs', 'addLocationJs', 'removeLocationJs', 'js/', $mixedFiles, $bDynamic, true);

inc/classes/BxDolPreloader.php

@@ -61,9 +61,8 @@ class BxDolPreloader extends BxDolFactory implements iBxDolSingleton
 		return $GLOBALS['bxDolClasses'][__CLASS__];
     }
 
-    public function perform()
+    public function perform($oTemplateSystem)
     {
-        $oTemplate = BxDolTemplate::getInstance();
         $aTypesAvail = array_keys($this->_aTypes);
 
         $aLoader = array();
@@ -86,32 +85,14 @@ class BxDolPreloader extends BxDolFactory implements iBxDolSingleton
             if($bModule && !$oModule)
                 continue;
 
-            if($bModule) {
-                $sLocKey = $oModule->_oConfig->getName();
-                $sHomePath = $oModule->_oConfig->getHomePath();
-                $sHomeUrl = $oModule->_oConfig->getHomeUrl();
-
-                if(!$oTemplate->isLocation($sLocKey)) {
-                    $sLocKey = $oTemplate->addLocation($sLocKey, $sHomePath, $sHomeUrl);
-                    $bLocRemove = true;
-                }
-
-                if(!$oTemplate->isLocationJs($sLocKey)) {
-                    $sLocKey = $oTemplate->addLocationJs($sLocKey, $sHomePath . 'js/', $sHomeUrl . 'js/');
-                    $bLocRemoveJs = true;
-                }
-            }
+            $oTemplate = null;
+            if($bModule)
+                $oTemplate = &$oModule->_oTemplate;
+            else 
+                $oTemplate = &$oTemplateSystem;
 
             foreach($aTypes as $sType => $aEntries)
                  $oTemplate->{$this->_aTypes[$sType]}($aEntries);
-
-            if($bModule && $sLocKey != '') {
-                if($bLocRemove)
-                    $oTemplate->removeLocation($sLocKey);
-                
-                if($bLocRemoveJs)
-                    $oTemplate->removeLocationJs($sLocKey);
-            }
         }
     }
 }

inc/classes/BxDolTemplate.php

@@ -437,7 +437,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         );
 
         //--- Load default CSS, JS, etc ---//
-        BxDolPreloader::getInstance()->perform();
+        BxDolPreloader::getInstance()->perform($this);
 
         //--- Load injection's cache ---//
         if (getParam('sys_db_cache_enable')) {

studio/classes/BxDolStudioTemplate.php

@@ -67,15 +67,6 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
         	'menu.css',
         ));
 
-        //--- Add default JS in output
-        $this->addJsSystem(array(
-            'jquery/jquery.min.js',
-            'jquery/jquery-migrate.min.js',
-            'jquery-ui/jquery.ui.position.min.js',
-            'spin.min.js',
-            'jquery.dolPopup.js',
-        ));
-
         bx_import('BxTemplStudioConfig');
         $this->_oTemplateConfig = BxTemplStudioConfig::getInstance();