devhelp r1144 - in trunk: . data

[rhult svn gnome org]

Author: rhult
Date: Mon Oct  6 16:18:37 2008
New Revision: 1144
URL: http://svn.gnome.org/viewvc/devhelp?rev=1144&view=rev

Log:
2008-10-06  Richard Hult  <richard imendio com>

	* data/assistant.js: 
	* data/assistant.css: Improve the style and handle libxml's API
	docs a bit better.


Modified:
   trunk/ChangeLog
   trunk/data/assistant.css
   trunk/data/assistant.js

Modified: trunk/data/assistant.css
==============================================================================
--- trunk/data/assistant.css	(original)
+++ trunk/data/assistant.css	Mon Oct  6 16:18:37 2008
@@ -7,12 +7,21 @@
   font-size: 9pt;
 }
 
+a {
+  text-decoration: none;
+}
+
 .title {
   font-size: 11pt;
   margin: 6pt;
 
   color: #a52a2a;
 }
+.title a {
+  font-size: 11pt;
+
+  color: #a52a2a;
+}
 .subtitle {
   font-size: 9pt;
   margin: 6pt;
@@ -83,6 +92,10 @@
   font-size: 8pt;
 }
 
+div.variablelist {
+  margin-bottom: 6pt;
+}
+
 div.variablelist * {
   vertical-align: top;
   line-height: 1.3em;

Modified: trunk/data/assistant.js
==============================================================================
--- trunk/data/assistant.js	(original)
+++ trunk/data/assistant.js	Mon Oct  6 16:18:37 2008
@@ -1,19 +1,6 @@
 function strStrip(str)
 {
-    var length;
-    var i;
-
-    length = str.length;
-    i = 0;
-    while (i < length && (str[i] == " " || str[i] == "\t"))
-        i++;
-    str = str.substr(i);
-
-    i = str.length - 1;
-    while (i >= 0 && (str[i] == " " || str[i] == "\t"))
-        i--;
-
-    return str.substr(0, i + 1);
+    return str.replace(/^\s*(.*?)\s*$/, "$1");
 }
 
 function strCompactWhitespace(str)
@@ -23,11 +10,13 @@
     var ret;
     var whitespace_count = 0;
 
+    str = str.replace(/\t/, " ");
+
     ret = "";
     length = str.length;
     i = 0;
     while (i < length) {
-        if (str[i] == " " || str[i] == "\t") {
+        if (str[i] == " ") {
             whitespace_count++;
         } else {
             if (whitespace_count > 0) {
@@ -93,23 +82,30 @@
 
     listing = elements[0];
 
+    /* Fixup oddly formatted HTML, e.g libxml has <br> inside the pre
+     * element.
+     */
+    tmp = listing.innerHTML;
+    tmp = tmp.replace("<br>", "\n").replace("\t", " ");
+    listing.innerHTML = tmp;
+
     var input = listing.textContent;
     var lines = input.split("\n");
-    var output;
-
     var line;
-    var i = 0;
+    var i;
+
+    i = 0;
     while (line = lines[i]) {
         lines[i] = strCompactWhitespace(strStrip(line));
         i++;
     }
 
     var indexOfParen = getIndexOfParen(lines[1]);
-
-    i = 1;
     var lastWordIndices = Array(lines.length);
     var maxIndexOfLastWord = 0;
     var maxDiff = 0;
+
+    i = 1;
     while (line = lines[i]) {
         lastWordIndices[i] = getIndexOfLastWordIgnoreAsterisk(line);
         tmp = getIndexOfLastWord(line);
@@ -140,6 +136,7 @@
     }
 
     var formattedLastWordIndices = Array(formattedLines.length);
+
     i = 1;
     while (line = formattedLines[i]) {
         formattedLastWordIndices[i] = getIndexOfLastWord(line);
@@ -150,8 +147,8 @@
         i++;
     }
 
-    i = 2;
     padding = buildPadding(indexOfParen + 1);
+    i = 2;
     while (line = formattedLines[i]) {
         formattedLines[i] = padding + line;
         i++;
@@ -166,7 +163,7 @@
         i++;
     }
 
-    output = "";
+    var output = "";
     i = 0;
     while (line = formattedLines[i]) {
         output = output + line + "\n";