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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
gRoussac
2013-11-25 17:39:59 +01:00
parent a0373eed7a 48be09d82d
commit 9e7a275d8d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperUploader.php
+2 -2
View File
@@ -251,8 +251,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('js/vendor/spin.js');
$this->getContext()->controller->addJs('js/vendor/ladda.js');
$this->getContext()->controller->addJs(__PS_BASE_URI__.'js/vendor/spin.js');
$this->getContext()->controller->addJs(__PS_BASE_URI__.'js/vendor/ladda.js');
}
if ($this->useAjax())