From 3170512e13ecb6182a952c2a65792923c4115da3 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Wed, 18 Jul 2012 08:43:30 +0000 Subject: [PATCH] Fix for the jquery-ui css error and gallery default slider settings. --- e107_handlers/js_manager.php | 12 ++++++++---- e107_plugins/gallery/plugin.xml | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php index 2a69a3483..a20003cb9 100644 --- a/e107_handlers/js_manager.php +++ b/e107_handlers/js_manager.php @@ -653,9 +653,10 @@ class e_jsmanager { 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', ''); } @@ -677,7 +678,10 @@ class e_jsmanager $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! + // Causes the css error on jquery-ui as a css file is loaded as a js. + /* if(is_array($file_path)) { foreach ($file_path as $fp => $loc) @@ -687,11 +691,11 @@ class e_jsmanager $fp = $loc; $loc = $runtime_location; } - $this->addJs($type, $fp, $loc); + // $this->addJs($type, $fp, $loc); } return $this; } - + */ if($this->libDisabled($type,$runtime_location)) { //echo $this->_dependence." :: DISABLED
"; diff --git a/e107_plugins/gallery/plugin.xml b/e107_plugins/gallery/plugin.xml index 61a1c77d1..b59712675 100644 --- a/e107_plugins/gallery/plugin.xml +++ b/e107_plugins/gallery/plugin.xml @@ -16,12 +16,12 @@ - 1024 - 768 + 800 + 800 1 - 1 + 1000 1 - 4 + 4000 scrollHorz