Changeset 224 for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/htmlarea.js

    r223 r224  
    277277  // even neater, if you resize the window the toolbars will reflow.  Niiiice. 
    278278 
    279   this.flowToolbars = true; 
     279  this.flowToolbars = false; 
    280280 
    281281  /** CUSTOMIZING THE TOOLBAR 
     
    725725  // when we float toolbar sections, so we have to clear:both here as well 
    726726  // as at the end (which we do have to do). 
    727     if(editor.config.flowToolbars) 
    728     { 
    729727      var brk = document.createElement('div'); 
    730728      brk.style.height = 
     
    733731      brk.style.fontSize = '1px'; 
    734732      brk.style.clear = 'both'; 
    735       toolbar.appendChild(brk); 
    736     } 
     733      return brk; 
    737734  } 
    738735 
     
    740737  function newLine() { 
    741738    if(typeof tb_row != 'undefined' && tb_row.childNodes.length == 0) return; 
    742  
    743739    tb_row = document.createElement("div"); 
    744740    if(editor.config.flowToolbars) { 
     
    934930  }; 
    935931 
    936   clearBoth(); 
     932  toolbar.appendChild(clearBoth()); 
    937933  newLine(); // init first line 
    938934  for (var i = 0; i < this.config.toolbar.length; ++i) { 
     
    949945        var label = RegExp.$2; 
    950946        if (l7ed) { 
    951                 label = HTMLArea._lc(label); 
     947          label = HTMLArea._lc(label); 
    952948        } 
    953949        var tb_element = document.createElement("div"); 
     
    969965            break; 
    970966          case "linebreak": 
     967            if(typeof tb_row != 'undefined' && tb_row.childNodes.length >0) 
     968              tb_row.appendChild(clearBoth()); 
    971969            newLine(); 
    972970            break; 
     
    10021000          tb_row.appendChild(tb_element); 
    10031001        } 
    1004         else if (tb_element == null) { 
     1002          else if (tb_element == null) { 
    10051003          alert("FIXME: Unknown toolbar item: " + code); 
    10061004        } 
     
    10081006    } 
    10091007  } 
    1010   clearBoth(); 
     1008  if(typeof tb_row != 'undefined' && tb_row.childNodes.length >0) 
     1009    tb_row.appendChild(clearBoth()); 
     1010  toolbar.appendChild(clearBoth()); 
    10111011  return toolbar; 
    10121012}; 
Note: See TracChangeset for help on using the changeset viewer.