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

//small fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9105 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur committed 2011-10-06 14:51:47 +00:00
1 parent 4d7bf6f76a
commit 7a75fe3c57
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
classes/Controller.php
+5 -5
View File
@@ -241,14 +241,14 @@ abstract class ControllerCore
* @param mixed $js_uri * @param mixed $js_uri
* @return void * @return void
*/ */
public function addJqueryUI($component) public function addJqueryUI($component, $theme = 'base', $check_dependencies = true)
{ {
$ui_path = array(); $ui_path = array();
if (is_array($component)) if (is_array($component))
foreach($component as $ui) foreach($component as $ui)
$ui_path = Media::getJqueryUIPath($ui); $ui_path = Media::getJqueryUIPath($ui, $theme, $check_dependencies);
else else
$ui_path = Media::getJqueryUIPath($component); $ui_path = Media::getJqueryUIPath($component, $theme, $check_dependencies);
$this->addCSS($ui_path['css']); $this->addCSS($ui_path['css']);
$this->addJS($ui_path['js']); $this->addJS($ui_path['js']);
@@ -260,14 +260,14 @@ abstract class ControllerCore
* @param mixed $js_uri * @param mixed $js_uri
* @return void * @return void
*/ */
public function addJqueryPlugin($name) public function addJqueryPlugin($name, $folder = null)
{ {
$plugin_path = array(); $plugin_path = array();
if (is_array($name)) if (is_array($name))
{ {
foreach($name as $plugin) foreach($name as $plugin)
{ {
$plugin_path = Media::getJqueryPluginPath($plugin); $plugin_path = Media::getJqueryPluginPath($plugin, $folder);
$this->addJS($plugin_path['js']); $this->addJS($plugin_path['js']);
$this->addCSS($plugin_path['css']); $this->addCSS($plugin_path['css']);
} }