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

// Move spin and ladda js to products controller

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-08 17:47:09 +01:00
parent 9065a73998
commit ef469d7782
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperUploader.php
+3 -5
View File
@@ -248,9 +248,7 @@ class HelperUploaderCore extends Uploader
$html .= '<script type="text/javascript" src="'.__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js"></script>';
$html .= '<script type="text/javascript" src="'.__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/jquery.fileupload-validate.js"></script>';
$html .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'/js/vendor/spin.js"></script>';
$html .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'/js/vendor/ladda.js"></script>';
.'/themes/'.$bo_theme.'/js/jquery.fileupload-validate.js"></script>';
}
else
{
@@ -265,8 +263,8 @@ class HelperUploaderCore extends Uploader
.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js');
$this->getContext()->controller->addJs(__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/jquery.fileupload-validate.js');
$this->getContext()->controller->addJs(__PS_BASE_URI__.'/js/vendor/spin.js');
$this->getContext()->controller->addJs(__PS_BASE_URI__.'/js/vendor/ladda.js');
$this->getContext()->controller->addJs('js/vendor/spin.js');
$this->getContext()->controller->addJs('js/vendor/ladda.js');
}
if ($this->useAjax())
controllers/admin/AdminProductsController.php
+3 -1
View File
@@ -1321,7 +1321,9 @@ class AdminProductsControllerCore extends AdminController
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js',
_PS_JS_DIR_.'admin-categories-tree.js',
_PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js',
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js',
_PS_JS_DIR_.'vendor/spin.js',
_PS_JS_DIR_.'vendor/ladda.js'
));
$this->addCSS(array(