Changeset 224 for trunk

Timestamp:

06/07/05 14:38:17 (15 years ago)

Author:

gocher

Message:

Ticket #323

flowToolbars=false
IE wrap at new line
Mozilla wraps at end of line at any point

File:

• trunk/htmlarea.js (modified) (9 diffs)

trunk/htmlarea.js

@@ -277 +277 @@
   // even neater, if you resize the window the toolbars will reflow.  Niiiice.
 
-  this.flowToolbars = true;
+  this.flowToolbars = false;
 
   /** CUSTOMIZING THE TOOLBAR
@@ -725 +725 @@
   // when we float toolbar sections, so we have to clear:both here as well
   // as at the end (which we do have to do).
-    if(editor.config.flowToolbars)
-    {
       var brk = document.createElement('div');
       brk.style.height =
@@ -733 +731 @@
       brk.style.fontSize = '1px';
       brk.style.clear = 'both';
-      toolbar.appendChild(brk);
-    }
+      return brk;
   }
 
@@ -740 +737 @@
   function newLine() {
     if(typeof tb_row != 'undefined' && tb_row.childNodes.length == 0) return;
-
     tb_row = document.createElement("div");
     if(editor.config.flowToolbars) {
@@ -934 +930 @@
   };
 
-  clearBoth();
+  toolbar.appendChild(clearBoth());
   newLine(); // init first line
   for (var i = 0; i < this.config.toolbar.length; ++i) {
@@ -949 +945 @@
         var label = RegExp.$2;
         if (l7ed) {
-                label = HTMLArea._lc(label);
+          label = HTMLArea._lc(label);
         }
         var tb_element = document.createElement("div");
@@ -969 +965 @@
             break;
           case "linebreak":
+            if(typeof tb_row != 'undefined' && tb_row.childNodes.length >0)
+              tb_row.appendChild(clearBoth());
             newLine();
             break;
@@ -1002 +1000 @@
           tb_row.appendChild(tb_element);
         }
-        else if (tb_element == null) {
+          else if (tb_element == null) {
           alert("FIXME: Unknown toolbar item: " + code);
         }
@@ -1008 +1006 @@
     }
   }
-  clearBoth();
+  if(typeof tb_row != 'undefined' && tb_row.childNodes.length >0)
+    tb_row.appendChild(clearBoth());
+  toolbar.appendChild(clearBoth());
   return toolbar;
 };