TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert last asset modification

Browse Source
This commit is contained in:
Manuel Raynaud
2014-02-19 14:30:01 +01:00
parent 9e406b3c57
commit e2187b5bbe
2 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Template\Smarty\Assets; namespace Thelia\Core\Template\Smarty\Assets;
use Thelia\Core\Template\Smarty\SmartyParser;
use Thelia\Log\Tlog; use Thelia\Log\Tlog;
use Thelia\Tools\URL; use Thelia\Tools\URL;
use Thelia\Core\Template\Assets\AssetManagerInterface; use Thelia\Core\Template\Assets\AssetManagerInterface;
@@ -87,28 +86,12 @@ class SmartyAssetsManager
} }
} }
/**
* Retrieve asset URL
*
* @param string $assetType js|css|image
* @param array $params Parameters
* - file File path in the default template
* - source module asset
* - filters filter to apply
* - debug
* - template if you want to load asset from another template
* @param \Smarty_Internal_Template $template Smarty Template
*
* @return string
* @throws \Exception
*/
public function computeAssetUrl($assetType, $params, \Smarty_Internal_Template $template) public function computeAssetUrl($assetType, $params, \Smarty_Internal_Template $template)
{ {
$file = $params['file']; $file = $params['file'];
$assetOrigin = isset($params['source']) ? $params['source'] : "0"; $assetOrigin = isset($params['source']) ? $params['source'] : "0";
$filters = isset($params['filters']) ? $params['filters'] : ''; $filters = isset($params['filters']) ? $params['filters'] : '';
$debug = isset($params['debug']) ? trim(strtolower($params['debug'])) == 'true' : false; $debug = isset($params['debug']) ? trim(strtolower($params['debug'])) == 'true' : false;
$webAssetTemplate = isset($params['template']) ? $params['template'] : false;
/* we trick here relative thinking for file attribute */ /* we trick here relative thinking for file attribute */
$file = ltrim($file, '/'); $file = ltrim($file, '/');
@@ -117,8 +100,7 @@ class SmartyAssetsManager
} }
$smartyParser = $template->smarty; $smartyParser = $template->smarty;
/** @var SmartyParser $templateDefinition */ $templateDefinition = $smartyParser->getTemplateDefinition();
$templateDefinition = $smartyParser->getTemplateDefinition($webAssetTemplate);
$templateDirectories = $smartyParser->getTemplateDirectories($templateDefinition->getType()); $templateDirectories = $smartyParser->getTemplateDirectories($templateDefinition->getType());

19
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
View File

@@ -178,24 +178,9 @@ class SmartyParser extends Smarty implements ParserInterface
} }
} }
/** public function getTemplateDefinition()
* Get template definition
*
* @param bool $webAssetTemplate Allow to load asset from another template
* If the name of the template if provided
*
* @return TemplateDefinition
*/
public function getTemplateDefinition($webAssetTemplate = false)
{ {
$ret = $this->templateDefinition; return $this->templateDefinition;
if ($webAssetTemplate) {
$customPath = str_replace($ret->getName(), $webAssetTemplate, $ret->getPath());
$ret->setName($webAssetTemplate);
$ret->setPath($customPath);
}
return $ret;
} }
public function getTemplate() public function getTemplate()