X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=html%2F_js%2Feditor.js;h=1bf5b8262f34576cb9a2b5bdea004053730f9069;hb=e336401181f56f19ec18175d47462e7a5d5f07e2;hp=7be9b42a09a929d9c6b39804cef1785d9cb053c7;hpb=e8681805bd6d55e250fd9f2a89591f3b974c29f8;p=cocanwiki.git

diff --git a/html/_js/editor.js b/html/_js/editor.js
index 7be9b42..1bf5b82 100644
--- a/html/_js/editor.js
+++ b/html/_js/editor.js
@@ -1,26 +1,30 @@
 /* Javascript for OCAMLWIKI.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: editor.js,v 1.2 2004/10/26 17:17:08 rich Exp $
+ * $Id: editor.js,v 1.6 2004/12/20 11:57:27 rich Exp $
  */
 
-var delay = 1000;		// Delay in milliseconds before updating.
+// Delay in milliseconds between updates.
+var delay = 1000;
 
-function update_preview (content_id, preview_id)
+// This function is called when the content has changed (eg. from a keypress).
+function content_changed (content_id, preview_id)
 {
-  // Updating is quite expensive, so only update after a period of apparent
-  // inactivity.
   var preview = document.getElementById (preview_id);
-  if (preview.timer) clearTimeout (preview.timer);
-  preview.timer =
-    setTimeout ("update_preview_now ('" + content_id + "', '" +
-		preview_id + "')", delay);
+
+  // Set a flag to indicate that the content has changed.
+  preview.updated = true;
+
+  // If there's not an asynchronous preview in progress at the moment,
+  // then start one.
+  start_update (content_id, preview_id, preview);
 }
 
-function update_preview_now (content_id, preview_id)
+function start_update (content_id, preview_id, preview)
 {
-  // Remove the timer.
-  var preview = document.getElementById (preview_id);
-  if (preview.timer) preview.timer = null;
+  if (!preview) preview = document.getElementById (preview_id);
+
+  // Do nothing if a preview is already in progress.
+  if (preview.in_progress) return;
 
   // Get the Wiki-markup content from the content textarea.
   var content = document.getElementById (content_id).value;
@@ -30,11 +34,26 @@ function update_preview_now (content_id, preview_id)
     new ActiveXObject ('Microsoft.XMLHTTP') : new XMLHttpRequest ();
   if (http)
     {
-      http.open ('POST', '/_bin/preview.cmo', false);
+      // Set a handler for state changes.
+      http.onreadystatechange = function () {
+	preview_state_change (content_id, preview_id, preview, http);
+      };
+      // 'true' argument means we want to do this asynchronously.
+      http.open ('POST', '/_bin/preview.cmo', true);
       http.setRequestHeader ('Content-Type',
 			     'application/x-www-form-urlencoded');
       http.send ('content=' + encodeURIComponent (content));
 
+      // A preview is "in progress".
+      preview.in_progress = true;
+      preview.updated = false;
+    }
+}
+
+function preview_state_change (content_id, preview_id, preview, http)
+{
+  if (http.readyState == 4) {	// If state is "loaded".
+    if (http.status == 200) {	// Request status is 200 OK.
       var xhtml = http.responseText;
 
       // Next line fails with my copy of IE if the text contains a
@@ -42,6 +61,39 @@ function update_preview_now (content_id, preview_id)
       // "Unknown runtime error"
       preview.innerHTML = xhtml;
     }
+
+    // A preview is not in progress now.
+    preview.in_progress = false;
+
+    // Have there been further updates since this preview started?  If so
+    // then we need to start another preview.
+    if (preview.updated) start_update (content_id, preview_id, preview);
+  }
+}
+
+// Update the preview field synchronously.
+function synch_update (content_id, preview_id)
+{
+  var preview = document.getElementById (preview_id);
+
+  // Get the Wiki-markup content from the content textarea.
+  var content = document.getElementById (content_id).value;
+
+  // Send the Wiki-markup to the server to be turned into XHTML.
+  var http = document.all ?
+    new ActiveXObject ('Microsoft.XMLHTTP') : new XMLHttpRequest ();
+  if (http)
+    {
+      http.open ('POST', '/_bin/preview.cmo', false);
+      http.setRequestHeader ('Content-Type',
+			     'application/x-www-form-urlencoded');
+      http.send ('content=' + encodeURIComponent (content));
+
+      if (http.readyState == 4 && http.status == 200) {
+	var xhtml = http.responseText;
+	preview.innerHTML = xhtml;
+      }
+    }
 }
 
 // Initialise the edit_buttons for a section.
@@ -52,21 +104,21 @@ function init_edit_buttons (div_id, content_id, preview_id)
   // HTML for the edit buttons.
   var args = "'" + content_id + "', '" + preview_id + "'";
   var edit_buttons_html =
-    "<a href=\"#\" onmousedown=\"link(" + args + "); return false;\" title=\"Select some text and click this to make a link\"><u>Link</u></a>" +
+    "<a onmousedown=\"link(" + args + "); return false;\" title=\"Select some text and click this to make a link\"><u>Link</u></a>" +
     "<span class=\"spacer\"></span>" +
-    "<a href=\"#\" onmousedown=\"bold(" + args + "); return false;\" title=\"Select some text and click this to make it bold\"><strong>Bold</strong></a>" +
-    "<a href=\"#\" onmousedown=\"italic(" + args + "); return false;\" title=\"Select some text and click this to make it italic\"><em>Italic</em></a>" +
-    "<a href=\"#\" onmousedown=\"strikeout(" + args + "); return false;\" title=\"Select some text and click this to strike through it\"><s>Strike</s></a>" +
+    "<a onmousedown=\"bold(" + args + "); return false;\" title=\"Select some text and click this to make it bold\"><strong>Bold</strong></a>" +
+    "<a onmousedown=\"italic(" + args + "); return false;\" title=\"Select some text and click this to make it italic\"><em>Italic</em></a>" +
+    "<a onmousedown=\"strikeout(" + args + "); return false;\" title=\"Select some text and click this to strike through it\"><s>Strike</s></a>" +
     "<span class=\"spacer\"></span>" +
-    "<a href=\"#\" onmousedown=\"bullet(" + args + "); return false;\" title=\"Select lines of text and click this to make it a bullet list\"><big>&#x2219;&#8212;</big></a>" +
-    "<a href=\"#\" onmousedown=\"numbered(" + args + "); return false;\" title=\"Select lines of text and click this to make it a numbered list\">1&#8212;</a>" +
+    "<a onmousedown=\"bullet(" + args + "); return false;\" title=\"Select lines of text and click this to make it a bullet list\"><big>&#x2219;&#8212;</big></a>" +
+    "<a onmousedown=\"numbered(" + args + "); return false;\" title=\"Select lines of text and click this to make it a numbered list\">1&#8212;</a>" +
     "<br/>"
     ;
   var div = document.getElementById (div_id);
   div.innerHTML = edit_buttons_html;
 }
 
-function replace_selection (content_id, fn)
+function replace_selection (content_id, fn, warning)
 {
   var textarea = document.getElementById (content_id);
 
@@ -78,7 +130,8 @@ function replace_selection (content_id, fn)
       var replacement = fn (text);
       textarea.value = textarea.value.substring (0, start) +
 	replacement + textarea.value.substring (end);
-    }
+    } else
+      if (warning) alert (warning);
   } else if (document.selection) { // IE
     var range = document.selection.createRange ();
     if (range.parentElement () == textarea && range.text != "") {
@@ -97,15 +150,6 @@ function replace_selection (content_id, fn)
       // Replace \r\n with just \n.
       text = text.replace ("\r\n", "\n");
 
-      /*
-      var wtf;
-      for (i = 0; i < len; ++i) {
-	wtf += "," + text.charCodeAt (i);
-	if ((i % 32) == 0) wtf += "\n";
-      }
-      alert (wtf);
-      */
-
       // IE's selections often include a trailing space or carriage
       // return.  Ignore this whitespace when calling the replacement
       // function.
@@ -122,7 +166,8 @@ function replace_selection (content_id, fn)
       if (append) replacement += "\n";
 
       range.text = replacement;
-    }
+    } else
+	if (warning) alert (warning);
   }
 }
 
@@ -134,8 +179,9 @@ function link (content_id, preview_id)
     else
       return "[[" + text + "]]";
   };
-  replace_selection (content_id, fn);
-  update_preview_now (content_id, preview_id);
+  var warning = "Select an area of text first.";
+  replace_selection (content_id, fn, warning);
+  start_update (content_id, preview_id);
 }
 
 function bold (content_id, preview_id)
@@ -146,8 +192,9 @@ function bold (content_id, preview_id)
     else
       return "<b>" + text + "</b>";
   };
-  replace_selection (content_id, fn);
-  update_preview_now (content_id, preview_id);
+  var warning = "Select an area of text first.";
+  replace_selection (content_id, fn, warning);
+  start_update (content_id, preview_id);
 }
 
 function italic (content_id, preview_id)
@@ -158,8 +205,9 @@ function italic (content_id, preview_id)
     else
       return "<i>" + text + "</i>";
   };
-  replace_selection (content_id, fn);
-  update_preview_now (content_id, preview_id);
+  var warning = "Select an area of text first.";
+  replace_selection (content_id, fn, warning);
+  start_update (content_id, preview_id);
 }
 
 function strikeout (content_id, preview_id)
@@ -170,8 +218,9 @@ function strikeout (content_id, preview_id)
     else
       return "<s>" + text + "</s>";
   };
-  replace_selection (content_id, fn);
-  update_preview_now (content_id, preview_id);
+  var warning = "Select an area of text first.";
+  replace_selection (content_id, fn, warning);
+  start_update (content_id, preview_id);
 }
 
 function bullet (content_id, preview_id)
@@ -182,8 +231,9 @@ function bullet (content_id, preview_id)
     else
       return "* " + text.replace (/\n/g, "\n* ");
   };
-  replace_selection (content_id, fn);
-  update_preview_now (content_id, preview_id);
+  var warning = "Select some whole lines of text first.";
+  replace_selection (content_id, fn, warning);
+  start_update (content_id, preview_id);
 }
 
 function numbered (content_id, preview_id)
@@ -194,6 +244,7 @@ function numbered (content_id, preview_id)
     else
       return "# " + text.replace (/\n/g, "\n# ");
   };
-  replace_selection (content_id, fn);
-  update_preview_now (content_id, preview_id);
+  var warning = "Select some whole lines of text first.";
+  replace_selection (content_id, fn, warning);
+  start_update (content_id, preview_id);
 }