mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Tweak last commit

Browse Source
This commit is contained in:
CaMer0n
2012-07-18 21:55:27 +00:00
parent 3170512e13
commit 1cf02aa91a
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_handlers/js_manager.php
View File

@@ -223,7 +223,7 @@ class e_jsmanager
if(!$this->libDisabled($id,$vis)) if(!$this->libDisabled($id,$vis))
{ {
// echo "<h2>FRAMEWORK Loaded: ".$id." :: ".$vis."</h2>"; // echo "<h2>FRAMEWORK Loaded: ".$id." :: ".$vis."</h2>";
if(vartrue($this->_libraries[$id])) if(vartrue($this->_libraries[$id]))
{ {
foreach($this->_libraries[$id] as $path) foreach($this->_libraries[$id] as $path)
@@ -237,7 +237,12 @@ class e_jsmanager
} }
} }
$this->_dependence = null; $this->_dependence = null;
$this->coreLib($core);
if($vis != 'auto')
{
$this->coreLib($core);
}
// Load stored in preferences plugin lib paths ASAP // Load stored in preferences plugin lib paths ASAP
$plug_libs = e107::getPref('e_jslib_plugin'); $plug_libs = e107::getPref('e_jslib_plugin');
@@ -681,9 +686,10 @@ class e_jsmanager
// Possibly no longer needed. // 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. // 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) )
{ {
// print_a($file_path);
foreach ($file_path as $fp => $loc) foreach ($file_path as $fp => $loc)
{ {
if(is_numeric($fp)) if(is_numeric($fp))
@@ -691,11 +697,15 @@ class e_jsmanager
$fp = $loc; $fp = $loc;
$loc = $runtime_location; $loc = $runtime_location;
} }
// $this->addJs($type, $fp, $loc);
$type = (strpos($fp,".css")!==false && $type == 'core') ? "core_css" : $type;
$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 />";