Merge pull request #923 from PrestaEdit/1.6.x-fancybox

//remove unnecessary addCSS (fancybox)
This commit is contained in:
Jérôme Nadaud
2013-11-06 00:31:57 -08:00
3 changed files with 0 additions and 3 deletions
-1
View File
@@ -748,7 +748,6 @@ class FrontControllerCore extends Controller
$this->addJqueryUI('ui.sortable');
$this->addjqueryPlugin('fancybox');
$this->addJS(_PS_JS_DIR_.'hookLiveEdit.js');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'all'); // @TODO
}
if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
@@ -506,7 +506,6 @@ class AdminImportControllerCore extends AdminController
$this->toolbar_btn = array();
// adds fancybox
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox'));
$entity_selected = 0;
-1
View File
@@ -46,7 +46,6 @@ class ProductControllerCore extends FrontController
if ($this->context->getMobileDevice() == false)
{
$this->addCSS(_THEME_CSS_DIR_.'product.css');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
$this->addJS(array(
_THEME_JS_DIR_.'tools.js',