Ticket #1240

inc/classes/BxDolModuleTemplate.php

@@ -45,12 +45,12 @@ class BxDolModuleTemplate extends BxDolTemplate
 
     function addCss($mixedFiles, $bDynamic = false)
     {
-        return $this->_addFiles(BxDolTemplate::getInstance(), 'addCss', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true);
+        return $this->_addFiles(BxDolTemplate::getInstance(), 'addCss', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true);
     }
 
     function addJs($mixedFiles, $bDynamic = false)
     {
-        return $this->_addFiles(BxDolTemplate::getInstance(), 'addJs', 'addLocationJs', 'removeLocationJs', 'js/', $mixedFiles, $bDynamic, true);
+        return $this->_addFiles(BxDolTemplate::getInstance(), 'addJs', 'isLocationJs', 'addLocationJs', 'removeLocationJs', 'js/', $mixedFiles, $bDynamic, true);
     }
 
     function addJsTranslation($mixedKey)
@@ -60,12 +60,12 @@ class BxDolModuleTemplate extends BxDolTemplate
 
     function addStudioCss($mixedFiles, $bDynamic = false, $bSearchInModule = true)
     {
-        return $this->_addFiles(BxDolStudioTemplate::getInstance(), 'addCss', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, $bSearchInModule);
+        return $this->_addFiles(BxDolStudioTemplate::getInstance(), 'addCss', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, $bSearchInModule);
     }
 
     function addStudioJs($mixedFiles, $bDynamic = false, $bSearchInModule = true)
     {
-        return $this->_addFiles(BxDolStudioTemplate::getInstance(), 'addJs', 'addLocationJs', 'removeLocationJs', 'js/', $mixedFiles, $bDynamic, $bSearchInModule);
+        return $this->_addFiles(BxDolStudioTemplate::getInstance(), 'addJs', 'isLocationJs', 'addLocationJs', 'removeLocationJs', 'js/', $mixedFiles, $bDynamic, $bSearchInModule);
     }
 
     function addStudioJsTranslation($mixedKey)
@@ -73,7 +73,7 @@ class BxDolModuleTemplate extends BxDolTemplate
         BxDolStudioTemplate::getInstance()->addJsTranslation($mixedKey);
     }
 
-    function _addFiles($oTemplate, $sFuncAddFiles, $sFuncAddLocation, $sFuncRemoveLocation, $sPath, $mixedFiles, $bDynamic = false, $bSearchInModule = true)
+    function _addFiles($oTemplate, $sFuncAddFiles, $sFuncIsLocation, $sFuncAddLocation, $sFuncRemoveLocation, $sPath, $mixedFiles, $bDynamic = false, $bSearchInModule = true)
     {
         $sLocationKey = '';
         $bLocationRemove = false;
@@ -81,7 +81,7 @@ class BxDolModuleTemplate extends BxDolTemplate
         if($bSearchInModule) {
             if(strpos($sFuncAddLocation, 'Dynamic') === false) {
                 $sLocationKey = $this->_oConfig->getName();
-                if(!$oTemplate->isLocation($sLocationKey)) {
+                if(!$oTemplate->$sFuncIsLocation($sLocationKey)) {
                     $sLocationKey = $oTemplate->$sFuncAddLocation($sLocationKey, $this->_oConfig->getHomePath() . $sPath, $this->_oConfig->getHomeUrl() . $sPath);
                     $bLocationRemove = true;
                 }

inc/classes/BxDolTemplate.php

@@ -722,6 +722,14 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
     {
         if(isset($this->_aLocations[$sKey]))
            unset($this->_aLocations[$sKey]);
+    }
+	/**
+     * Check whether JS location exists or not.
+     * @param string $sKey - JS location's unique key.
+     */
+    function isLocationJs($sKey)
+    {
+        return isset($this->_aLocationsJs[$sKey]);
     }
     /**
      * Add JS location in array of JS locations.