mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 16:17:14 +02:00
Code Issues Releases Wiki Activity

Fix for the jquery-ui css error and gallery default slider settings.

Browse Source
This commit is contained in:
CaMer0n
2012-07-18 08:43:30 +00:00
parent c7c4da179b
commit 3170512e13
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/js_manager.php
View File

@@ -653,9 +653,10 @@ class e_jsmanager
{ {
foreach($this->_libraries[$this->_dependence] as $inc) foreach($this->_libraries[$this->_dependence] as $inc)
{ {
if(strpos($inc,".css"))
if(strpos($inc,".css")!==false)
{ {
if(strpos($inc,"://")) // cdn if(strpos($inc,"://")!==false) // cdn
{ {
$this->addJs('other_css', $inc, 'all', '<!-- AutoLoad -->'); $this->addJs('other_css', $inc, 'all', '<!-- AutoLoad -->');
} }
@@ -677,7 +678,10 @@ class e_jsmanager
$runtime_location = 1; $runtime_location = 1;
} }
// Possibly no longer needed.
// FIXME - this could break something after CSS support was added, move it to separate method(s), recursion by type! // FIXME - this could break something after CSS support was added, move it to separate method(s), recursion by type!
// Causes the css error on jquery-ui as a css file is loaded as a js.
/*
if(is_array($file_path)) if(is_array($file_path))
{ {
foreach ($file_path as $fp => $loc) foreach ($file_path as $fp => $loc)
@@ -687,11 +691,11 @@ class e_jsmanager
$fp = $loc; $fp = $loc;
$loc = $runtime_location; $loc = $runtime_location;
} }
$this->addJs($type, $fp, $loc); // $this->addJs($type, $fp, $loc);
} }
return $this; return $this;
} }
*/
if($this->libDisabled($type,$runtime_location)) if($this->libDisabled($type,$runtime_location))
{ {
//echo $this->_dependence." :: DISABLED<br />"; //echo $this->_dependence." :: DISABLED<br />";

8
e107_plugins/gallery/plugin.xml
View File

@@ -16,12 +16,12 @@
<mainPrefs> <mainPrefs>
</mainPrefs> </mainPrefs>
<pluginPrefs> <pluginPrefs>
<pref name="popup_w">1024</pref> <pref name="popup_w">800</pref>
<pref name="popup_h">768</pref> <pref name="popup_h">800</pref>
<pref name="slideshow_category">1</pref> <pref name="slideshow_category">1</pref>
<pref name="slideshow_duration">1</pref> <pref name="slideshow_duration">1000</pref>
<pref name="slideshow_auto">1</pref> <pref name="slideshow_auto">1</pref>
<pref name="slideshow_freq">4</pref> <pref name="slideshow_freq">4000</pref>
<pref name="slideshow_effect">scrollHorz</pref> <pref name="slideshow_effect">scrollHorz</pref>
</pluginPrefs> </pluginPrefs>
</e107Plugin> </e107Plugin>