Issue 2144 add to r10896 Context class fix.

and FrontEndFileHandler fix again.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10897 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2012-07-14 18:39:33 +00:00
parent f71fcc8b31
commit 508c32963d
2 changed files with 4 additions and 4 deletions

View file

@ -1200,7 +1200,7 @@ class Context {
**/
function unloadAllJsFiles() {
is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
$self->oFrontEndFileHandler->unloadAllJsFiles();
$self->oFrontEndFileHandler->unloadAllFiles('js');
}
/**
@ -1259,7 +1259,7 @@ class Context {
**/
function unloadAllCSSFiles() {
is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
$self->oFrontEndFileHandler->unloadAllCssFiles();
$self->oFrontEndFileHandler->unloadAllFiles('css');
}
/**

View file

@ -141,9 +141,9 @@
$key = $file->filePath . $file->fileName . "\t" . $file->targetIe;
}
if (!isset($map[$key]) || $mapIndex[$key] != $file->index)
(is_null($file->index))?$file->index=0:$file->index=$file->index;
if (!isset($map[$file->index][$key]) || $mapIndex[$key] != $file->index)
{
(is_null($file->index))?$file->index=0:$file->index=$file->index;
$this->unloadFile($args[0], $args[2], $args[1]);
$map[$file->index][$key] = $file;
$mapIndex[$key] = $file->index;