From 0e0ca2a473effd71c714c6fc567fec6f71be6e99 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.coom>
Date: Fri, 23 Nov 2012 16:35:57 +0100
Subject: [PATCH] [-] CORE : fixed some bad include of jquery plugin

---
 .../default/template/controllers/modules/js.tpl     |  6 ++----
 classes/Media.php                                   |  2 +-
 controllers/admin/AdminCartRulesController.php      | 13 ++++++-------
 controllers/admin/AdminModulesController.php        |  6 ++++++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl
index 73e463c13..e3d073c01 100644
--- a/admin-dev/themes/default/template/controllers/modules/js.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/js.tpl
@@ -18,15 +18,13 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA

+*  @copyright  2007-2012 PrestaShop SA
+
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<link href="{$smarty.const._PS_JS_DIR_}jquery/plugins/fancybox/jquery.fancybox.css" rel="stylesheet" type="text/css" media="screen" />
 <script type="text/javascript">{$autocompleteList}</script>
-<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/autocomplete/jquery.autocomplete.js"></script>
-<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/fancybox/jquery.fancybox.js"></script>
 <script type="text/javascript">
 	var token = '{$token}';
 	var currentIndex = '{$currentIndex}';
diff --git a/classes/Media.php b/classes/Media.php
index b91fb3b8f..c19ad1e26 100755
--- a/classes/Media.php
+++ b/classes/Media.php
@@ -381,7 +381,7 @@ class MediaCore
 	 * @param mixed $name
 	 * @return void
 	 */
-	public static function getJqueryPluginCSSPath($name, $folder)
+	public static function getJqueryPluginCSSPath($name, $folder = null)
 	{
 		if ($folder === null)
 			$folder = _PS_JS_DIR_.'jquery/plugins/'; //set default folder
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index 7e74fdf46..f2d79a266 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -48,6 +48,12 @@ class AdminCartRulesControllerCore extends AdminController
 		parent::__construct();
 	}
 
+	public function setMedia()
+	{
+		parent::setMedia();
+		$this->addJqueryPlugin(array('typewatch', 'fancybox', 'autocomplete'));
+	}
+
 	public function postProcess()
 	{
 		if (Tools::isSubmit('submitAddcart_rule') || Tools::isSubmit('submitAddcart_ruleAndStay'))
@@ -465,13 +471,6 @@ class AdminCartRulesControllerCore extends AdminController
 			'desc' => $this->l('Save and Stay')
 		);
 
-		// Todo: change for "Media" version
-		$this->addJs(_PS_JS_DIR_.'jquery/plugins/jquery.typewatch.js');
-		$this->addJs(_PS_JS_DIR_.'jquery/plugins/fancybox/jquery.fancybox.js');
-		$this->addJs(_PS_JS_DIR_.'jquery/plugins/autocomplete/jquery.autocomplete.js');
-		$this->addCss(_PS_JS_DIR_.'jquery/plugins/fancybox/jquery.fancybox.css');
-		$this->addCss(_PS_JS_DIR_.'jquery/plugins/autocomplete/jquery.autocomplete.css');
-
 		$current_object = $this->loadObject(true);
 
 		// All the filter are prefilled with the correct information
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index b3bc20d79..400c5176c 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -127,6 +127,12 @@ class AdminModulesControllerCore extends AdminController
 		if (isset($this->context->cookie->username_addons) && isset($this->context->cookie->password_addons) && !empty($this->context->cookie->username_addons) && !empty($this->context->cookie->password_addons))
 			$this->logged_on_addons = true;
 	}
+	
+	public function setMedia()
+	{
+		parent::setMedia();
+		$this->addJqueryPlugin(array('autocomplete', 'fancybox'));
+	}
 
 	public function ajaxProcessRefreshModuleList()
 	{