From 6419f6a7ad7863902c248d9ee752c34467ea48b7 Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 6 Dec 2013 15:47:29 +0000 Subject: [PATCH] // fixed bug with ordering of JS files in AdminImport --- controllers/admin/AdminImportController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index f3c5adacc..cb8fc7bc7 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -517,6 +517,9 @@ class AdminImportControllerCore extends AdminController .'template')) $bo_theme = 'default'; + // We need to set parent media first, so that jQuery is loaded before the dependant plugins + parent::setMedia(); + $this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/vendor/jquery.ui.widget.js'); $this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); @@ -524,8 +527,6 @@ class AdminImportControllerCore extends AdminController $this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-validate.js'); $this->addJs(__PS_BASE_URI__.'js/vendor/spin.js'); $this->addJs(__PS_BASE_URI__.'js/vendor/ladda.js'); - - return parent::setMedia(); } public function renderForm()