From ef469d778253a948360b84405b1a930933917e46 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 8 Nov 2013 17:47:09 +0100 Subject: [PATCH] // Move spin and ladda js to products controller --- classes/helper/HelperUploader.php | 8 +++----- controllers/admin/AdminProductsController.php | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/helper/HelperUploader.php b/classes/helper/HelperUploader.php index 576d155a5..9c99025c2 100644 --- a/classes/helper/HelperUploader.php +++ b/classes/helper/HelperUploader.php @@ -248,9 +248,7 @@ class HelperUploaderCore extends Uploader $html .= ''; $html .= ''; - $html .= ''; - $html .= ''; + .'/themes/'.$bo_theme.'/js/jquery.fileupload-validate.js">'; } 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()) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2b299146a..b8deeb6ba 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -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(