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

Merge pull request #1107 from djfm/import

Browse Source 
// fixed bug with ordering of JS files in AdminImport
This commit is contained in:
Jérôme Nadaud
2013-12-06 07:54:27 -08:00
parent 97937a8aa1 6419f6a7ad
commit aecbc18779
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+3 -2
View File
@@ -517,6 +517,9 @@ class AdminImportControllerCore extends AdminController
.'template')) .'template'))
$bo_theme = 'default'; $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/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.iframe-transport.js');
$this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.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__.$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/spin.js');
$this->addJs(__PS_BASE_URI__.'js/vendor/ladda.js'); $this->addJs(__PS_BASE_URI__.'js/vendor/ladda.js');
return parent::setMedia();
} }
public function renderForm() public function renderForm()