svn commit: [jahia] r17457 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: conf/java/ webapp/jsp/jahia/engines/filemanager/ webapp/jsp/jahia/javascript/zimbra/ajaxTK/dwt/widgets/ webapp/jsp/jahia/javascript/zimbra/complexTree/

sshyrkov Tue, 05 Jun 2007 06:10:29 -0700

Author: sshyrkov
Date: Tue Jun  5 15:10:13 2007
New Revision: 17457

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17457&repname=
=3Djahia
Log:
JAHIA-1974: Sp2 FCK-DAV integration: Display of the current filtering optio=
n + problem with the "work in progress" in AJAX directory menu.
1) Filter input box changed to a combo box with predefined resource types (=
all, images, files, flash)
2) Problem with the 'Loading...' ("work in progress") text resolved


Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/AjaxFileManager.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/ajaxTK/dwt/widgets/DwtTreeItem.js
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D17457&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Tue Jun  5 15:10:13 2007
@@ -700,6 +700,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D A=
 file with that name already exists !
 org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Overw=
rite
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filters
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Images
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F=
iles
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto=
matically rename
 org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Do no=
thing
 org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Creat=
e New Directory

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D17457&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties Tue Jun  5 15:10:13 2007
@@ -683,6 +683,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D E=
ine Datei mit diesem Namen existiert bereits.
 org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D \u00D=
Cberschreiben
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filter
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Bilder
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D D=
ateien
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto=
matisch umbenennen
 org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Nicht=
s unternehmen
 org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Neuen=
 Ordner erstellen

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D17457&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Tue Jun  5 15:10:13 2007
@@ -700,6 +700,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D A=
 file with that name already exists !
 org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Overw=
rite
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filters
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Images
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F=
iles
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto=
matically rename
 org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Do no=
thing
 org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Creat=
e New Directory

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_es.properties&rev=3D17457&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties Tue Jun  5 15:10:13 2007
@@ -683,6 +683,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D Y=
a existe un archivo con ese nombre
 org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Sobre=
scribir
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtros
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Images
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D A=
rchivos
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Camb=
iar nombre autom\u00E1ticamente
 org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D No ha=
cer nada
 org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Crear=
 directorio nuevo

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D17457&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Tue Jun  5 15:10:13 2007
@@ -301,6 +301,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.filemanagerError.label =
=3D Gestionnaire de fichiers - Une erreur est survenue lors de l'op=C3=A9ra=
tion
 org.jahia.engines.filemanager.Filemanager_Engine.fileview.label =3D Vue du=
 fichier
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtres
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Images
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F=
ichiers
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label =3D Vous =
pouvez donner les acc=C3=A8s en lecture sur ce fichier aux utilisateurs/gro=
upes suivants
 org.jahia.engines.filemanager.Filemanager_Engine.for.label =3D pour
 org.jahia.engines.filemanager.Filemanager_Engine.forceUnlock.label =3D N=
=C3=A9anmoins, vous pouvez d=C3=A9verrouiller le fichier en cochant la case=
 suivante

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_it.properties&rev=3D17457&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties Tue Jun  5 15:10:13 2007
@@ -682,6 +682,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D \=
u00C8 gi\u00E0 presente un file con lo stesso nome!
 org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Sovra=
scrivi
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtri
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Images
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F=
iles
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Rino=
mina automaticamente
 org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Nessu=
na operazione
 org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Crear=
e nuova cartella

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_pt.properties&rev=3D17457&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties Tue Jun  5 15:10:13 2007
@@ -682,6 +682,10 @@
 org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D J=
\u00E1 existe um arquivo com este nome!
 org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Subst=
ituir
 org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtros
+org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.*
+org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D =
Images
+org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D A=
rquivos
+org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F=
lash
 org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Reno=
mear automaticamente
 org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D N\u00=
E3o fazer nada
 org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Criar=
 Novo Diret\u00F3rio

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/AjaxFileManager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp&r=
ev=3D17457&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/AjaxFileManager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/AjaxFileManager.jsp Tue Jun  5 15:10:13 2007
@@ -42,6 +42,9 @@
         path =3D mountPoint;
     }
     request.getSession().setAttribute("TreeFileManager", "true");
+
+    boolean fckEditorTarget =3D "fckeditor".equals(request.getParameter("t=
arget"));
+    final String resourceTypes =3D request.getParameter("resourceTypes") !=
=3D null ? request.getParameter("resourceTypes") : "";
 %>
 =

 <script type=3D"text/javascript">
@@ -242,6 +245,26 @@
         delete xmlDoc;
     }
 =

+    function doReload() {
+      var bar =3D document.getElementById("addressBarDisp");
+      var encodedString =3D escape(bar.value);
+
+      var jahiaCommand =3D new AsynchCommand();
+      GlobalCallback[GlobalCallbackCount] =3D new AjxCallback(null, getThe=
Folder);
+      jahiaCommand.addInvokeListener(GlobalCallback[GlobalCallbackCount]);
+      GlobalCallbackCount++;
+
+      var xmlDoc =3D AjxXmlDoc.createRoot("GetQuotedPrintable");
+      xmlDoc.set("value", encodedString);
+      jahiaCommand.invoke(xmlDoc, "<jahia:serverHttpPath/>/ajaxaction/GetQ=
uotedPrintable?value=3D" + encodedString);
+
+      delete bar;
+      delete xmlDoc;
+      delete encodedString;
+      delete jahiaCommand;
+      return false;
+    }
+    =

     function keyDown(e) {
         var code;
         if (window.event)
@@ -252,23 +275,7 @@
             code =3D null;
 =

         if (code =3D=3D 13) {
-            var bar =3D document.getElementById("addressBarDisp");
-            var encodedString =3D escape(bar.value);
-
-            var jahiaCommand =3D new AsynchCommand();
-            GlobalCallback[GlobalCallbackCount] =3D new AjxCallback(null, =
getTheFolder);
-            jahiaCommand.addInvokeListener(GlobalCallback[GlobalCallbackCo=
unt]);
-            GlobalCallbackCount++;
-
-            var xmlDoc =3D AjxXmlDoc.createRoot("GetQuotedPrintable");
-            xmlDoc.set("value", encodedString);
-            jahiaCommand.invoke(xmlDoc, "<jahia:serverHttpPath/>/ajaxactio=
n/GetQuotedPrintable?value=3D" + encodedString);
-
-            delete bar;
-            delete xmlDoc;
-            delete encodedString;
-            delete jahiaCommand;
-            return false;
+            return doReload();
         }
         delete code;
         return true;
@@ -581,7 +588,12 @@
         <td>
             &nbsp;<jahia:engineResourceBundle
                     resourceName=3D"org.jahia.engines.filemanager.Filemana=
ger_Engine.filters.label" />:
-            <input id=3D"filters" type=3D"text" name=3D"filters" value=3D"=
" onkeypress=3D"return keyDown(event)" />
+            <select id=3D"filters" name=3D"filters" onchange=3D"doReload()=
">
+               <option value=3D"*"><jahia:engineResourceBundle resourceName=
=3D"org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label" /><=
/option>
+               <option value=3D"images_Only" <% if ("images_Only".equals(res=
ourceTypes)) {%>selected=3D"selected"<%}%>><jahia:engineResourceBundle reso=
urceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.filters.images=
.label" /></option>
+               <option value=3D"files_Only" <% if ("files_Only".equals(resou=
rceTypes)) {%>selected=3D"selected"<%}%>><jahia:engineResourceBundle resour=
ceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.filters.files.la=
bel" /></option>
+               <option value=3D"*.swf" <% if ("*.swf".equals(resourceTypes))=
 {%>selected=3D"selected"<%}%>><jahia:engineResourceBundle resourceName=3D"=
org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label" /></o=
ption>
+            </select>
         </td>
     </tr>
 </table>
@@ -602,10 +614,6 @@
     } else if (view.equals("2")) {
         display +=3D DAVAbstractAction.THUMBNAIL_VIEW;
     }
-       String resourceTypes =3D request.getParameter("resourceTypes");
-       if (resourceTypes =3D=3D null)
-               resourceTypes =3D "";
-       display +=3D resourceTypes;
                =

     final String expandTo =3D ("/".equals(path) ? null : path);
 %>
@@ -621,7 +629,7 @@
 <script type=3D"text/javascript">
     ComplexTreeProperties.webdavPath =3D "<%=3Dnew StringBuffer().append(r=
equest.getScheme()).append("://").append(request.getServerName()).append(re=
quest.getServerPort()!=3D80?":" + request.getServerPort():"").append(reques=
t.getContextPath()).append("/webdav/site/").append(jParams.getSiteKey()).to=
String()%>";
        ComplexTreeProperties.RELOAD_ON_COLLAPSE =3D true;
-<% if ("fckeditor".equals(request.getParameter("target"))) {%>
+<% if (fckEditorTarget) {%>
 function doSelectResource() {
        for (var i =3D 0; i < ComplexTreeProperties.COUNTER; i++) {
                var elem =3D document.getElementById("checkbox_" + i);
@@ -639,7 +647,7 @@
 =

 <div id=3D"buttons">
     <div class=3D"button">
-       <% if ("fckeditor".equals(request.getParameter("target"))) {%>
+       <% if (fckEditorTarget) {%>
         <a href=3D"javascript:doSelectResource();"
            title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
ok.button"/>">
             <jahia:engineResourceBundle resourceName=3D"org.jahia.ok.butto=
n"/>

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/zimbra/ajaxTK/dwt/widgets/DwtTreeItem.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/ajaxTK/dwt/widgets/DwtT=
reeItem.js&rev=3D17457&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/ajaxTK/dwt/widgets/DwtTreeItem.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/ajaxTK/dwt/widgets/DwtTreeItem.js Tue Jun  5 15:10:13 2007
@@ -294,6 +294,7 @@
 =

 DwtTreeItem.prototype.removeChild =3D
 function(child) {
+       if (!child) return;
     if (child._initialized) {
         this._tree._deselect(child);
         this._childDiv.removeChild(child.getHtmlElement());

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/zimbra/complexTree/ComplexTree.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree=
.js&rev=3D17457&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js Tue Jun  5 15:10:13 2007
@@ -926,7 +926,10 @@
         treeItem.setExpanded(true);
         // Build the tree
         this._getChildrenCallback(args);
-    }
+    } else if (treeItem.getItemCount() =3D=3D 1 && treeItem.getItems()[0].=
getText() =3D=3D this._loadingText) {
+               // delete the 'Loading...' node
+               treeItem.removeChild(treeItem.getItems()[0]);
+    } =

 =

     if (this.updateBar) updateMenuBarAfterSelect(treeItem._key);
     this.updateBar =3D null;

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

svn commit: [jahia] r17457 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: conf/java/ webapp/jsp/jahia/engines/filemanager/ webapp/jsp/jahia/javascript/zimbra/ajaxTK/dwt/widgets/ webapp/jsp/jahia/javascript/zimbra/complexTree/

Reply via email to