Changeset 6507

Timestamp:

Aug 7, 2014, 10:04:34 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1825: Remember positions of popup windows

More fixes since browsers doesn't make the window the exact size as requested. Thus, when saving the previous position and then re-opening the window with those values it will shift slightly in size each time.

• Firefox: -1 pixel in height
• IE: +4 pixels in width/height

Location:

branches/3.3-stable/www/include/scripts

Files:

• main-2.js (modified) (2 diffs)
• popup.js (modified) (2 diffs)

branches/3.3-stable/www/include/scripts/main-2.js

@@ -1251 +1251 @@
     {}
     
+    if (App.rememberDialogPositions())
+    {
+      Data.setPageValue('requested-position', JSON.stringify(position), name);
+    }
     options += ",top="+position.top+",left="+position.left+",width="+position.width+",height="+position.height;
     var newWin;
@@ -1263 +1267 @@
       newWin = window.open(url, name, options);
     }
+    
     newWin.focus();
     return newWin;

branches/3.3-stable/www/include/scripts/popup.js

@@ -26 +26 @@
   var popup = {};
   var internal = {};
+  var dx = 0;
+  var dy = 0;
   
   // If the popup dialog is read-only BASE will not
@@ -34 +36 @@
   }
   
+  // Need short delay to ensure that window is properly initialized
+  internal.delayInitPosition = function()
+  {
+    setTimeout(internal.initPosition, 20);
+  }
+  
+  // Correct size of the window if the actual size is different from the requested
+  // Firefox has -1 pixel height and IE has +4 pixels width and height
+  internal.initPosition = function()
+  {
+    if (window.top.name && App.rememberDialogPositions())
+    {
+      var rpos = JSON.parse(Data.getPageValue("requested-position", window.top.name));
+      var cpos = App.getWindowPosition(window.top);
+      dx = rpos.width-cpos.width;
+      dy = rpos.height-cpos.height;
+    }
+  }
+  
   internal.savePosition = function()
   {
     if (window.top.name && App.rememberDialogPositions())
     {
-      var pos = JSON.stringify(App.getWindowPosition(window.top));
-      Data.setPageValue("last-position", pos, window.top.name);
+      var pos = App.getWindowPosition(window.top);
+      pos.width += dx;
+      pos.height += dy;
+      Data.setPageValue("last-position", JSON.stringify(pos), window.top.name);
     }
   }
   
+  document.addEventListener('DOMContentLoaded', internal.delayInitPosition, false);
   window.addEventListener('beforeunload', internal.savePosition, false);