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

[*] Classes : addJqueryUI automaticaly add css

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9089 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2011-10-06 09:51:37 +00:00
parent 05de006711
commit 6c7d1a5ee7
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Controller.php
+4 -1
View File
@@ -242,12 +242,15 @@ abstract class ControllerCore
*/ */
public function addJqueryUI($component) public function addJqueryUI($component)
{ {
$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);
else else
$ui_path = Media::getJqueryUIPath($component); $ui_path = Media::getJqueryUIPath($component);
$this->addJS($ui_path);
$this->addCSS($ui_path['css']);
$this->addJS($ui_path['js']);
} }
/** /**
classes/Media.php
+28 -5
View File
@@ -196,7 +196,7 @@ class MediaCore
*/ */
public static function getJSPath($js_uri) public static function getJSPath($js_uri)
{ {
if (is_array($js_uri) OR is_null($js_uri)) if (is_array($js_uri) OR is_null($js_uri) OR empty($js_uri))
return false; return false;
$url_data = parse_url($js_uri); $url_data = parse_url($js_uri);
if (!array_key_exists('host', $url_data)) if (!array_key_exists('host', $url_data))
@@ -221,6 +221,8 @@ class MediaCore
*/ */
public static function getCSSPath($css_uri, $css_media_type = 'all') public static function getCSSPath($css_uri, $css_media_type = 'all')
{ {
if (empty($css_uri))
return false;
// remove PS_BASE_URI on _PS_ROOT_DIR_ for the following // remove PS_BASE_URI on _PS_ROOT_DIR_ for the following
$url_data = parse_url($css_uri); $url_data = parse_url($css_uri);
$file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']); $file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']);
@@ -266,7 +268,7 @@ class MediaCore
if ($addNoConflict) if ($addNoConflict)
return self::getJSPath(_PS_JS_DIR_.'jquery/jquery.noConflict.php?version='.$version); return self::getJSPath(_PS_JS_DIR_.'jquery/jquery.noConflict.php?version='.$version);
} }
/** /**
* return jqueryUI component path. * return jqueryUI component path.
* *
@@ -285,16 +287,37 @@ class MediaCore
foreach(self::$jquery_ui_dependencies[$component]['dependencies'] as $dependency) foreach(self::$jquery_ui_dependencies[$component]['dependencies'] as $dependency)
$ui_tmp[] = self::getJqueryUIPath($dependency, $theme, false); $ui_tmp[] = self::getJqueryUIPath($dependency, $theme, false);
if (self::$jquery_ui_dependencies[$component]['theme'] AND $check_dependencies)
{
$theme_css = self::getCSSPath($folder.'themes/'.$theme.'/jquery.ui.theme.css');
$comp_css = self::getCSSPath($folder.'themes/'.$theme.'/jquery.'.$component.'.css');
if (!empty($theme_css) OR $theme_css)
$ui_path['css'] = array_merge($ui_path['css'], $theme_css);
if (!empty($comp_css) OR $comp_css)
$ui_path['css'] = array_merge($ui_path['css'], $comp_css);
}
if (file_exists($file_uri)) if (file_exists($file_uri))
{ {
if (!empty($ui_tmp)) if (!empty($ui_tmp))
{ {
$ui_tmp[] = self::getJSPath($folder.$file); foreach($ui_tmp as $ui)
return $ui_tmp; {
$ui_path['js'][] = $ui['js'];
$ui_path['css'][] = $ui['css'];
}
$ui_path['js'][] = self::getJSPath($folder.$file);
} }
else else
return self::getJSPath($folder.$file); $ui_path['js'] = self::getJSPath($folder.$file);
} }
//add i18n file for datepicker
if ($component == 'ui.datepicker')
$ui_path['js'][] = self::getJSPath($folder.'i18n/jquery.ui.datepicker-'.Context::getContext()->language->iso_code.'.js');
return $ui_path;
} }
/** /**