dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : mobile theme : fix #PSCFV-4275 : delete calls to css and js not used

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17498 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-09-24 12:47:49 +00:00
parent f1156969c0
commit 8b210e65d4
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CategoryController.php
+12 -8
View File
@@ -36,15 +36,19 @@ class CategoryControllerCore extends FrontController
public function setMedia()
{
parent::setMedia();
//TODO : check why cluetip css is include without js file
$this->addCSS(array(
_THEME_CSS_DIR_.'scenes.css' => 'all',
_THEME_CSS_DIR_.'category.css' => 'all',
_THEME_CSS_DIR_.'product_list.css' => 'all',
));
if (Configuration::get('PS_COMPARATOR_MAX_ITEM') > 0)
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
if ($this->context->getMobileDevice() == false)
{
//TODO : check why cluetip css is include without js file
$this->addCSS(array(
_THEME_CSS_DIR_.'scenes.css' => 'all',
_THEME_CSS_DIR_.'category.css' => 'all',
_THEME_CSS_DIR_.'product_list.css' => 'all',
));
if (Configuration::get('PS_COMPARATOR_MAX_ITEM') > 0)
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
}
}
public function canonicalRedirection($canonicalURL = '')
controllers/front/ParentOrderController.php
+13 -10
View File
@@ -135,17 +135,20 @@ class ParentOrderControllerCore extends FrontController
{
parent::setMedia();
// Adding CSS style sheet
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
// Adding JS files
$this->addJS(_THEME_JS_DIR_.'tools.js');
if ((Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Tools::getValue('step') == 1) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
$this->addJS(_THEME_JS_DIR_.'order-address.js');
$this->addJqueryPlugin('fancybox');
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
if ($this->context->getMobileDevice() == false)
{
$this->addJS(_THEME_JS_DIR_.'cart-summary.js');
$this->addJqueryPlugin('typewatch');
// Adding CSS style sheet
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
// Adding JS files
$this->addJS(_THEME_JS_DIR_.'tools.js');
if ((Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Tools::getValue('step') == 1) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
$this->addJS(_THEME_JS_DIR_.'order-address.js');
$this->addJqueryPlugin('fancybox');
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
{
$this->addJS(_THEME_JS_DIR_.'cart-summary.js');
$this->addJqueryPlugin('typewatch');
}
}
}
modules/blockreinsurance/blockreinsurance.php
+4 -1
View File
@@ -315,11 +315,14 @@ class Blockreinsurance extends Module
$helper->token = Tools::getAdminTokenLite('AdminModules');
$helper->currentIndex = AdminController::$currentIndex.'&configure='.$this->name;
return $helper;
}
public function hookFooter($params)
{
// Check if not a mobile theme
if ($this->context->getMobileDevice() != false)
return false;
$this->context->controller->addCSS($this->_path.'style.css', 'all');
$infos = $this->getListContent($this->context->language->id);
$this->context->smarty->assign(array('infos' => $infos, 'nbblocks' => count($infos)));
modules/homeslider/homeslider.php
+4
View File
@@ -648,6 +648,10 @@ class HomeSlider extends Module
if(!$this->_prepareHook())
return;
// Check if not a mobile theme
if ($this->context->getMobileDevice() != false)
return false;
$this->context->controller->addJS($this->_path.'js/jquery.bxSlider.min.js');
$this->context->controller->addCSS($this->_path.'bx_styles.css');
$this->context->controller->addJS($this->_path.'js/homeslider.js');