Changeset 5158

Timestamp:

Oct 23, 2009, 11:33:36 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1413: Make the directory icon clickable in the Files and directories view

Also included the fix for #1415 in the trunk. This was needed to be able to test the click function in IE.

Location:

trunk/www

Files:

• filemanager/directories/list_directories.jsp (modified) (1 diff)
• filemanager/files/list_files.jsp (modified) (5 diffs)
• include/scripts/ajax.js (modified) (1 diff)

trunk/www/filemanager/directories/list_directories.jsp

@@ -266 +266 @@
   }
   %>
+  function synchronizeTo(directoryId, parentId)
+  {
+    var item = JoustMenu.menuItems['D'+directoryId];
+    if (!item)
+    {
+      if (!parentId) parentId = parent.lastOpenDirectoryId;
+      if (parentId)
+      {
+        var parentDir = JoustMenu.menuItems['D'+parentId];
+        if (parentDir.lazyInit) 
+        {
+          JoustMenu.toggle(parentDir.index);
+          item = JoustMenu.menuItems['D'+directoryId];
+        }
+      }
+    }
+    if (item) JoustMenu.select(item.index);
+  }
   function refresh()
   {

trunk/www/filemanager/files/list_files.jsp

@@ -316 +316 @@
       frm.submit();
     }
+    function selectDirectory(subDirId)
+    {
+      parent.frames.directories.synchronizeTo(subDirId, <%=directoryId%>);
+    }
     </script>
   </base:head>
@@ -707 +711 @@
               boolean sharePermission = item.hasPermission(Permission.SET_PERMISSION);
               String name = HTML.encodeTags(item.getName());
-              String path = HTML.encodeTags(item.getPath().toString());
+              String path = item.getPath().toString();
+              String tagPath = HTML.encodeTags(path);
               String icon = item.getAutoCompress() ? "directory_compressed.gif" : "directory.gif";
               %>
@@ -715 +720 @@
                   ><base:icon 
                     image="<%=icon%>" 
-                    tooltip="<%=path%>"
+                    tooltip="<%=tagPath%>"
+                    onclick="<%="selectDirectory(" + itemId + ")"%>"
                   /></tbl:header>
                 <tbl:header 
@@ -796 +802 @@
               String name = HTML.encodeTags(item.getName());
               String path = item.getPath().toString();
-              String urlPath = HTML.urlEncode(path);
               String tagPath = HTML.encodeTags(path);
               String icon = item.isCompressed() ? "file_compressed.gif" : "file.gif";
@@ -827 +832 @@
                     name="item_id" 
                     value="<%=itemId%>" 
-                    title="<%=path%>" 
+                    title="<%=tagPath%>" 
                     <%=selectedItemId == itemId ? "checked" : ""%>
                     onclick="updateSelected(this)"

trunk/www/include/scripts/ajax.js

@@ -66 +66 @@
   this.parseResponse = function(responseText)
   {
-    var lines = responseText.split(/\n/);
+    var lines = responseText.split('\n');
     var elements = new Array();
     var status = null;