[TWiki-Dev] [SVN] r7815 - in twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin: data/TWiki pub/TWiki/WysiwygPlugin templates

[<Cra...@nt...>]

Author: CrawfordCurrie
Date: 2005-12-08 09:33:43 -0800 (Thu, 08 Dec 2005)
New Revision: 7815

Modified:
   twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/data/TWiki/WysiwygPluginTopicLister.txt
   twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/pub/TWiki/WysiwygPlugin/twikitools.js
   twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/templates/view.kupuxml.tmpl
Log:
Item1158: works for Cairo now as well

Modified: twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/data/TWiki/WysiwygPluginTopicLister.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/data/TWiki/WysiwygPluginTopicLister.txt	2005-12-08 17:01:48 UTC (rev 7814)
+++ twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/data/TWiki/WysiwygPluginTopicLister.txt	2005-12-08 17:33:43 UTC (rev 7815)
@@ -1 +1 @@
-%TOPICLIST{format="<option>$name</option>" web="%URLPARAM{web}%"}%
+%TOPICLIST{format="<nop>$name" web="%URLPARAM{web}%"}%

Modified: twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/pub/TWiki/WysiwygPlugin/twikitools.js
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/pub/TWiki/WysiwygPlugin/twikitools.js	2005-12-08 17:01:48 UTC (rev 7814)
+++ twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/pub/TWiki/WysiwygPlugin/twikitools.js	2005-12-08 17:33:43 UTC (rev 7815)
@@ -309,21 +309,52 @@
   this.loadWeb = function(web) {
     var url = this.editor.config.view_url +
       '/TWiki/WysiwygPluginTopicLister?web='+web+
-      ';skin=kupuxml;contenttype=text/xml';
-    var list = Sarissa.getDomDocument();
-    list.async = false;
-    list.load(url);
-    var topics = new Array();
-    var select = list.firstChild;
-    for (i = 0; i < select.childNodes.length; i++) {
-      var option = select.childNodes[i].textContent;
-      if (option != "\n") {
-        var noption = document.createElement('option');
-        noption.value = option;
-        noption.appendChild(document.createTextNode(option));
-        topics.push(noption);
+      ';skin=kupuxml;contenttype=text/plain';
+
+    var req;
+    if(window.XMLHttpRequest) {
+      try {
+        req = new XMLHttpRequest();
+      } catch(e) {
+        req = false;
       }
+    } else if(window.ActiveXObject) {
+      try {
+        req = new ActiveXObject("Msxml2.XMLHTTP");
+      } catch(e) {
+        try {
+          req = new ActiveXObject("Microsoft.XMLHTTP");
+        } catch(e) {
+          req = false;
+        }
+      }
     }
+    if (!req)
+      return;
+    
+    req.open("GET", url, false);
+    req.send("");
+    
+    var topics = req.responseText.split("\n");
+    
+    /* Hack fixes for Cairo stupidity */
+    if (topics.length && !topics[0].match(/\S/)) {
+      topics.shift();
+    }
+    if (topics.length) {
+      var e = topics[topics.length-1].indexOf('"}%');
+      if (e >= 0) {
+        topics[topics.length-1] = topics[topics.length-1].substr(0, e);
+      }
+    }
+    
+    for (i = 0; i < topics.length; i++) {
+      var option = topics[i];
+      var noption = document.createElement('option');
+      noption.value = option;
+      noption.appendChild(document.createTextNode(option));
+      topics[i] = noption;
+    }
     return topics;
   }
 

Modified: twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/templates/view.kupuxml.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/templates/view.kupuxml.tmpl	2005-12-08 17:01:48 UTC (rev 7814)
+++ twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/templates/view.kupuxml.tmpl	2005-12-08 17:33:43 UTC (rev 7815)
@@ -1,4 +1,2 @@
-<?xml version='1.0' ?>
-<select>
 %TEXT%
-</select>
+