Changeset 738

Timestamp:

02/15/07 05:12:43 (6 years ago)

Author:

ray

Message:

FullScreen? update:

• Ticket #954 FullScreen?: deeper integration
  
• Ticket #321 FullScreen? : select elements show through in IE6
  
• Ticket #953 Statusbar has ugly white gap at the bottom when switching back from full screen in IE
  
• Ticket #952 FullScreen?: scrollbars don't disappear in IE in QuirksMode?
  

Location:

trunk

Files:

• Xinha.css (modified) (1 diff)
• XinhaCore.js (modified) (7 diffs)
• modules/FullScreen/full-screen.js (modified) (12 diffs)

trunk/Xinha.css

@@ -87 +87 @@
   color: ButtonText;
   font: 11px Tahoma,Verdana,sans-serif;
+  height:16px;
 }
 

trunk/XinhaCore.js

@@ -101 +101 @@
 // browser identification
 Xinha.agt       = navigator.userAgent.toLowerCase();
-Xinha.is_ie        = ((Xinha.agt.indexOf("msie") != -1) && (Xinha.agt.indexOf("opera") == -1));
+Xinha.is_ie    = ((Xinha.agt.indexOf("msie") != -1) && (Xinha.agt.indexOf("opera") == -1));
+Xinha.ie_version= parseFloat(Xinha.agt.substring(Xinha.agt.indexOf("msie")+5));
 Xinha.is_opera  = (Xinha.agt.indexOf("opera") != -1);
 Xinha.is_mac       = (Xinha.agt.indexOf("mac") != -1);
@@ -423 +424 @@
   this.colorPickerSaveColors = 20;
 
+  // start up the editor in fullscreen mode
+  this.fullScreen = false;
+  
+  // you can tell the fullscreen mode to leave certain margins on each side
+  // the value is an array with the values for [top,right,bottom,left] in that order
+  this.fullScreenMargins = [0,0,0,0];
+  
   /** CUSTOMIZING THE TOOLBAR
    * -------------------------
@@ -1518 +1526 @@
     return false;
   }
+  
+  if ( typeof FullScreen == "undefined" )
+  {
+    Xinha.loadPlugin("FullScreen", function() { editor.generate(); }, _editor_url + 'modules/FullScreen/full-screen.js' );
+    return false;
+  }
 
   var toolbar = editor.config.toolbar;
@@ -1527 +1541 @@
       {
         case "popupeditor":
-          if ( typeof FullScreen == "undefined" )
-          {
-            Xinha.loadPlugin("FullScreen", function() { editor.generate(); }, _editor_url + 'modules/FullScreen/full-screen.js' );
-            return false;
-          }
           editor.registerPlugin('FullScreen');
         break;
@@ -2372 +2381 @@
   doc.write(html);
   doc.close();
-
+  if ( this.config.fullScreen )
+  {
+    this._fullScreen();
+  }
   this.setEditorEvents();
 };
@@ -4327 +4339 @@
 };
 
-// FIXME!!! this should return false for IE < 5.5
 Xinha.checkSupportedBrowser = function()
 {
@@ -4342 +4353 @@
     }
   }
-  return Xinha.is_gecko || Xinha.is_ie;
+  return Xinha.is_gecko || Xinha.ie_version >= 5.5;
 };
 

trunk/modules/FullScreen/full-screen.js

@@ -12 +12 @@
       {
         e._fullScreen();
-        if(e._isFullScreen)
-        {
-          obj.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',9,0]);
-        }
-        else
-        {
-          obj.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0]);
-        }
       }
   );
@@ -40 +32 @@
 
 FullScreen.prototype._lc = function(string) {
-    return HTMLArea._lc(string, {url : _editor_url + 'modules/FullScreen/lang/',context:"FullScreen"});
+    return Xinha._lc(string, {url : _editor_url + 'modules/FullScreen/lang/',context:"FullScreen"});
 };
 
@@ -49 +41 @@
  */
 
-HTMLArea.prototype._fullScreen = function()
+Xinha.prototype._fullScreen = function()
 {
   var e = this;
@@ -57 +49 @@
     e._sizing = true;
     // Width & Height of window
-    var dim = HTMLArea.viewportSize();
-
-    e.sizeEditor(dim.x + 'px',dim.y + 'px',true,true);
+    var dim = Xinha.viewportSize();
+
+    var h = dim.y - e.config.fullScreenMargins[0] -  e.config.fullScreenMargins[2];
+    var w = dim.x - e.config.fullScreenMargins[1] -  e.config.fullScreenMargins[3];
+
+    e.sizeEditor(w + 'px', h + 'px',true,true);
     e._sizing = false;
+    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',9,0]); 
   }
 
@@ -69 +65 @@
     e.initSize();
     e._sizing = false;
+    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0]); 
   }
 
@@ -88 +85 @@
     if(e.target != e._iframe)
     {
-      HTMLArea._addEvent(window, 'resize', sizeItUp);
+      Xinha._addEvent(window, 'resize', sizeItUp);
     }
   }
@@ -94 +91 @@
   // Gecko has a bug where if you change position/display on a
   // designMode iframe that designMode dies.
-  if(HTMLArea.is_gecko)
+  if(Xinha.is_gecko)
   {
     this.deactivateEditor();
@@ -103 +100 @@
     // Unmaximize
     this._htmlArea.style.position = '';
-    this._htmlArea.style.border   = '';
+    if (!Xinha.is_ie ) this._htmlArea.style.border   = '';
+
     try
     {
-      if(HTMLArea.is_ie)
+      if(Xinha.is_ie && document.compatMode == 'CSS1Compat')
       {
         var bod = document.getElementsByTagName('html');
@@ -130 +128 @@
       ancestor._xinha_fullScreenOldPosition = null;
     }
-
+    
+    if ( Xinha.ie_version < 7 )
+    {
+      var selects = document.getElementsByTagName("select");
+      for ( var i=0;i<selects.length;++i )
+      {
+        selects[i].style.visibility = 'visible';
+      }
+    }
     window.scroll(this._unScroll.x, this._unScroll.y);
   }
@@ -151 +157 @@
       ancestor.style.position = 'static';
     }
-
+    // very ugly bug in IE < 7 shows select boxes through elements that are positioned over them
+    if ( Xinha.ie_version < 7 )
+    {
+      var selects = document.getElementsByTagName("select");
+      var s, currentEditor;
+      for ( var i=0;i<selects.length;++i )
+      {
+        s = selects[i];
+        currentEditor = false;
+        while ( s = s.parentNode )
+        {
+          if ( s == this._htmlArea )
+          {
+            currentEditor = true;
+            break;
+          }
+        }
+        if ( !currentEditor && selects[i].style.visibility != 'hidden')
+        {
+          selects[i].style.visibility = 'hidden';
+        }
+      }
+    }
     // Maximize
     window.scroll(0,0);
     this._htmlArea.style.position = 'absolute';
     this._htmlArea.style.zIndex   = 999;
-    this._htmlArea.style.left     = 0;
-    this._htmlArea.style.top      = 0;
-    this._htmlArea.style.border   = 'none';
+    this._htmlArea.style.left     = e.config.fullScreenMargins[3] + 'px';
+    this._htmlArea.style.top      = e.config.fullScreenMargins[0] + 'px';
+    if ( !Xinha.is_ie ) this._htmlArea.style.border   = 'none';
     this._isFullScreen = true;
     resetScroll();
@@ -164 +192 @@
     try
     {
-      if(HTMLArea.is_ie)
+      if(Xinha.is_ie && document.compatMode == 'CSS1Compat')
       {
         var bod = document.getElementsByTagName('html');
@@ -182 +210 @@
   }
 
-  if(HTMLArea.is_gecko)
+  if(Xinha.is_gecko)
   {
     this.activateEditor();