Changeset 272

Timestamp:

07/19/05 02:14:04 (8 years ago)

Author:

gogo

Message:

Fix for #401 - inline dialogs show incorrectly, problem with showing/hiding panels.

Location:

trunk

Files:

• htmlarea.js (modified) (6 diffs)
• inline-dialog.js (modified) (2 diffs)
• plugins/Linker/linker.js (modified) (1 diff)

trunk/htmlarea.js

@@ -1253 +1253 @@
 
     'sb_row'    :document.createElement('tr'),
-    'sb_cell'   :document.createElement('td'),  // status bar
-
-    'left'      :document.createElement('col'),
-    'middle'      :document.createElement('col'),
-    'right'      :document.createElement('col')
+    'sb_cell'   :document.createElement('td')  // status bar
+
   }
 
@@ -1295 +1292 @@
   fw.tbody.appendChild(fw.bp_row);  // Bottom panel
   fw.tbody.appendChild(fw.sb_row);  // Statusbar
-
-  // cols in the table
-  fw.table.appendChild(fw.left);
-  fw.table.appendChild(fw.middle);
-  fw.table.appendChild(fw.right);
 
   // and body in the table
@@ -1466 +1458 @@
     this._iframe.style.height   = '100%';
     this._textArea.style.height = '100%';
-    this._iframe.style.width    = '100%';
-    this._textArea.style.width  = '100%';
-    this._framework.ed_cell.style.width = '';
+    this._iframe.style.width    = '';
+    this._textArea.style.width  = '';
 
     if(includingBars != null)     this._htmlArea.sizeIncludesToolbars = includingBars;
@@ -1535 +1526 @@
       if(panels[pan].on && panels[pan].panels.length && HTMLArea.hasDisplayedChildren(panels[pan].container))
       {
+        panels[pan].container.style.display = '';
         return true;
       }
@@ -1541 +1533 @@
       else
       {
-        HTMLArea.removeFromParent(panels[pan].container);
-        if(typeof editor._framework[pan] != 'undefined')
-        {
-          HTMLArea.removeFromParent(editor._framework[pan]);
-        }
+        panels[pan].container.style.display='none';
         return false;
       }
@@ -1552 +1540 @@
     if(panel_is_alive('left'))
     {
+      col_span += 1;      
+    }
+
+    if(panel_is_alive('top'))
+    {
+      // NOP
+    }
+
+    if(panel_is_alive('right'))
+    {
       col_span += 1;
-      if(!HTMLArea.hasParentNode(panels.left.container))
-      {
-        this._framework.ler_row.insertBefore(panels.left.container,this._framework.ed_cell);
-        this._framework.table.insertBefore(this._framework.left,this._framework.middle);
-        this._framework.left.style.width = this.config.panel_dimensions.left;
-      }
-    }
-
-    if(panel_is_alive('top'))
-    {
-      if(!HTMLArea.hasParentNode(panels.top.container))
-      {
-        this._framework.tp_row.appendChild(panels.top.container);
-      }
-    }
-
-    if(panel_is_alive('right'))
-    {
-      col_span += 1;
-      if(!HTMLArea.hasParentNode(panels.right.container))
-      {
-        this._framework.ler_row.insertBefore(panels.right.container, this._framework.ed_cell.nextSibling);
-        this._framework.table.insertBefore(this._framework.right,this._framework.middle.nextSibling);
-        this._framework.right.style.width = this.config.panel_dimensions.right;
-      }
     }
 
     if(panel_is_alive('bottom'))
     {
-      if(!HTMLArea.hasParentNode(panels.bottom.container))
-      {
-        this._framework.bp_row.appendChild(panels.bottom.container);
-      }
+      // NOP
     }
 

trunk/inline-dialog.js

@@ -12 +12 @@
   this.rootElem.style.display  = 'none';
   this.editor._framework.ed_cell.insertBefore(this.rootElem, this.editor._framework.ed_cell.firstChild);
-  this.rootElem.style.width  = this.width  =  this.editor._framework.ed_cell.offsetWidth;
-  this.rootElem.style.height = this.height =  this.editor._framework.ed_cell.offsetHeight;
+  this.rootElem.style.width  = this.width  =  this.editor._framework.ed_cell.offsetWidth + 'px';
+  this.rootElem.style.height = this.height =  this.editor._framework.ed_cell.offsetHeight + 'px';
 
   var dialog = this;
@@ -66 +66 @@
       function(e, args)
       {
-        dialog.rootElem.style.width  = dialog.width  =  dialog.editor._framework.ed_cell.offsetWidth;
-        dialog.rootElem.style.height = dialog.height =  dialog.editor._framework.ed_cell.offsetHeight;
+        dialog.rootElem.style.width  = dialog.width  =  dialog.editor._framework.ed_cell.offsetWidth + 'px';
+        dialog.rootElem.style.height = dialog.height =  dialog.editor._framework.ed_cell.offsetHeight + 'px';
         dialog.onresize();
       }

trunk/plugins/Linker/linker.js

@@ -371 +371 @@
     {
       options.style.height = ddTree.style.height = (parseInt(dialog.height) - dialog.getElementById('h1').offsetHeight) + 'px';
-      ddTree.style.width  = (dialog.width  - 322 ) + 'px';
+      ddTree.style.width  = (parseInt(dialog.width)  - 322 ) + 'px';
     }