Changeset 149

Timestamp:

05/11/05 08:19:21 (8 years ago)

Author:

niko

Message:

• tweaked Statusbar
  
  • generate textmode-message in createStatusBar and hide it (_statusBarTextMode)
    
  • when switching into textmode don't clear the StatusBar?, instead hide the _statusBarTree and show _statusBarTextMode
    
  • added onMode in CharCount?-Plugin to hide the charCounter there too (fixes bug there)
    
• when displaying inline-dialogs don't clear the statusBar, instead make the dialog higher
  
  • changed calculation of height (the -2 is necessary for IE)
    
  • dialog-div now positioned absolute instaed of relative (IE would move the statusBar down else)
    
• fixed bug in inline-dialog getValues
  

Location:

trunk

Files:

• htmlarea.js (modified) (3 diffs)
• inline-dialog.js (modified) (6 diffs)
• plugins/CharCounter/char-counter.js (modified) (1 diff)

trunk/htmlarea.js

@@ -1025 +1025 @@
   this._statusBarTree = div;
   this._statusBar.appendChild(div);
+
+  div = document.createElement("span");
+  div.innerHTML = HTMLArea._lc("You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.");
+  div.style.display = "none";
+  this._statusBarTextMode = div;
+  this._statusBar.appendChild(div);
+
   if (!this.config.statusBar) {
     // disable it...
@@ -1675 +1682 @@
       if (this.config.statusBar)
       {
-        this._statusBar.innerHTML = HTMLArea._lc("You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.");
+        this._statusBarTree.style.display = "none";
+        this._statusBarTextMode.style.display = "";
       }
 
@@ -1699 +1707 @@
       if (this.config.statusBar)
       {
-        this._statusBar.innerHTML = '';
-        this._statusBar.appendChild(this._statusBarTree);
+        this._statusBarTree.style.display = "";
+        this._statusBarTextMode.style.display = "none";
       }
 

trunk/inline-dialog.js

@@ -9 +9 @@
   this.rootElem = document.createElement('div');
   this.rootElem.className = 'dialog';
-  this.rootElem.style.position = 'relative';
+  this.rootElem.style.position = 'absolute';
   this.rootElem.style.display  = 'none';
 
   this.width  = parseInt(this.rootElem.style.width  = this.editor._iframe.style.width);
-  this.height = parseInt(this.rootElem.style.height = this.editor._iframe.style.height);
-
+  this.height = this.rootElem.style.height = (parseInt(this.editor._iframe.style.height)+this.editor._statusBar.offsetHeight-2)+'px';
+  
   var dialog = this;
   if(typeof localizer == 'function')
@@ -67 +67 @@
       {
         dialog.width  = parseInt(dialog.rootElem.style.width  = args.editorWidth  + 'px');
-        dialog.height = parseInt(dialog.rootElem.style.height = args.editorHeight + 'px');
+        dialog.height = dialog.rootElem.style.height = (args.editorHeight+dialog.editor._statusBar.offsetHeight-2)+'px';
         dialog.onresize();
       }
@@ -94 +94 @@
   this.editor._textArea.style.display = 'none';
   this.editor._iframe.style.visibility   = 'hidden';
-  if (this.editor.config.statusBar)
-  {
-    this.editor._statusBar.innerHTML = ' ';
-  }
   this.rootElem.style.display   = '';
 }
@@ -107 +103 @@
   this.editor._iframe.style.visibility   = this._restoreTo[1];
   this.editor.showPanels(this._restoreTo[2]);
-  if (this.editor.config.statusBar)
-  {
-    this.editor._statusBar.innerHTML = '';
-    this.editor._statusBar.appendChild(this.editor._statusBarTree);
-  }
+  
   // Restore the selection
   if(HTMLArea.is_ie)
@@ -117 +109 @@
     this._lastRange.select();
   }
+  this.editor.updateToolbar();
   return this.getValues();
 }
@@ -296 +289 @@
             if(i.checked)
             {
-              if(v.push)
+              if(v && v.push)
               {
                 v.push(i.value);

trunk/plugins/CharCounter/char-counter.js

@@ -35 +35 @@
 }
 
+CharCounter.prototype.onMode = function (mode)
+{
+  //Hide Chars in statusbar when switching into textmode
+  switch (mode)
+  {
+    case "textmode":
+      this.charCount.style.display = "none";
+      break;
+    case "wysiwyg":
+      this.charCount.style.display = "";
+      break;
+    default:
+      alert("Mode <" + mode + "> not defined!");
+      return false;
+  }
+}
+
 CharCounter.prototype.onKeyPress = function(ev) {
     var cnt = this.updateCharCount();