Changeset 1219 for trunk

Timestamp:

11/09/09 22:59:41 (3 years ago)

Author:

gogo

Message:

Ticket #1262

Alternative method for restoring from fullscreen mode.

Location:

trunk

Files:

• XinhaCore.js (modified) (1 diff)
• modules/FullScreen/full-screen.js (modified) (3 diffs)

trunk/XinhaCore.js

@@ -900 +900 @@
    */
   this.fullScreenMargins = [0,0,0,0];
+  
+  
+  /** Specify the method that is being used to calculate the editor's size<br/>
+    * when we return from fullscreen mode.
+    *  There are two choices:
+    * 
+    * <table border="1">
+    *   <tr>
+    *       <td><em>initSize</em></td>
+    *       <td>Use the internal Xinha.initSize() method to calculate the editor's 
+    *       dimensions. This is suitable for most usecases.</td>
+    *   </tr>
+    *   <tr>
+    *       <td><em>restore</em></td>
+    *       <td>The editor's dimensions will be stored before going into fullscreen
+    *       mode and restored when we return to normal mode, taking a possible
+    *       window resize during fullscreen in account.</td>
+    *     </tr>
+    * </table>
+    *
+    * Default: <code>"initSize"</code>
+    * @type String
+    */
+  this.fullScreenSizeDownMethod = 'initSize';
   
   /** This array orders all buttons except plugin buttons in the toolbar. Plugin buttons typically look for one 

trunk/modules/FullScreen/full-screen.js

@@ -2 +2 @@
 {
   this.editor = editor;
+  this.originalSizes = null;
   editor._superclean_on = false;
   var cfg = editor.config;
@@ -54 +55 @@
     // Width & Height of window
     var dim = Xinha.viewportSize();
+    if(e.config.fullScreenSizeDownMethod == 'restore') 
+    {
+      e.originalSizes = {
+        x:   parseInt(e._htmlArea.style.width),
+        y:   parseInt(e._htmlArea.style.height),
+        dim: dim
+      };
+    }
 
     var h = dim.y - e.config.fullScreenMargins[0] -  e.config.fullScreenMargins[2];
@@ -67 +76 @@
     if(e._isFullScreen || e._sizing) return false;
     e._sizing = true;
-    e.initSize();
+
+    if(e.originalSizes != null) 
+    {
+        var os = e.originalSizes;
+        var nDim = Xinha.viewportSize();
+        var nW = os.x + (nDim.x - os.dim.x);
+        var nH = os.y + (nDim.y - os.dim.y);
+        e.sizeEditor( nW + 'px', nH + 'px', e.config.sizeIncludesBars, e.config.sizeIncludesPanels);
+        e.originalSizes = null;
+    }
+    else e.initSize();
+
     e._sizing = false;
     if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage(cfg.iconList.fullscreen);