Changeset 57

Timestamp:

04/04/05 12:23:56 (8 years ago)

Author:

niko

Message:

ticket #67:
- label for files using the syntax suggested by gogo
- updated scan.php to use the new syntax

ticket #99:
- if scan.php returns invalid code the parse-error will be shown in the tree

(no alert-box, see http://xinha.gogo.co.nz/punbb/viewtopic.php?id=130)

Location:

trunk/plugins/Linker

Files:

• linker.js (modified) (3 diffs)
• scan.php (modified) (3 diffs)

trunk/plugins/Linker/linker.js

@@ -68 +68 @@
 {
   if(!a && this.editor._selectionEmpty(this.editor._getSelection()))
-  {
+  {       
     alert(this._lc("You must select some text before making a new link."));
     return false;
@@ -316 +316 @@
         //get files from backend
         HTMLArea._getback(linker.lConfig.backend,
-                          function(txt) { lDialog.files = eval(txt); lDialog._prepareDialog(); });
+                          function(txt) {
+                            try {
+                                eval('lDialog.files = '+txt);
+                            } catch(Error) {
+                                lDialog.files = [ {url:'',title:Error.toString()} ];
+                            }
+                            lDialog._prepareDialog(); });
     }
     else if(linker.lConfig.files != null)
@@ -384 +390 @@
                      files[i]);
     }
-    else
+    else if(files[i].length)
     {
       var id = this.Dialog_nxtid++;
       this.dTree.add(id, parent, files[i][0].replace(/^.*\//, ''), null, files[i][0]);
       this.makeNodes(files[i][1], id);
+    }
+    else if(typeof files[i] == 'object')
+    {
+      if(files[i].children) {
+        var id = this.Dialog_nxtid++;
+      } else {
+        var id = Linker.nxtid++;
+      }
+
+      if(files[i].title) var title = files[i].title;
+      else if(files[i].url) var title = files[i].url.replace(/^.*\//, '');
+      else var title = "no title defined";
+      if(files[i].url) var link = 'javascript:document.getElementsByName(\'' + this.dialog.id.href + '\')[0].value=decodeURIComponent(\'' + encodeURIComponent(files[i].url) + '\');document.getElementsByName(\'' + this.dialog.id.type + '\')[0].click();document.getElementsByName(\'' + this.dialog.id.href + '\')[0].focus();void(0);';
+      else var link = '';
+      
+      this.dTree.add(id, parent, title, link, title);
+      if(files[i].children) {
+        this.makeNodes(files[i].children, id);
+      }
     }
   }

trunk/plugins/Linker/scan.php

@@ -62 +62 @@
             if($subdir = scan($path, $url))
             {
-              $files[] = array($url, $subdir);
+              $files[] = array('url'=>$url, 'children'=>$subdir);
             }
           }
@@ -68 +68 @@
           {
             if(($include && !preg_match($include, $url)) || ($exclude && preg_match($exclude, $url))) continue;
-            $files[] = $url;
+            $files[] = array('url'=>$url);
           }
 
@@ -104 +104 @@
       if(is_array($var))
       {
+        $useObject = false;
+        foreach(array_keys($var) as $k) {
+            if(!is_numeric($k)) $useObject = true;
+        }
         $js = array();
         foreach($var as $k => $v)
         {
-          $js[] = to_js($v, $tabs + 1);
+          $i = "";
+          if($useObject) {
+            if(preg_match('#[a-zA-Z]+[a-zA-Z0-9]*#', $k)) {
+              $i .= "$k: ";
+            } else {
+              $i .= "'$k': ";
+            }
+          }
+          $i .= to_js($v, $tabs + 1);
+          $js[] = $i;
         }
-        return "[\n" . tabify(implode(",\n", $js), $tabs) . "\n]";
+        if($useObject) {
+            $ret = "{\n" . tabify(implode(",\n", $js), $tabs) . "\n}";
+        } else {
+            $ret = "[\n" . tabify(implode(",\n", $js), $tabs) . "\n]";
+        }
+        return $ret;
       }