Changeset 6503

Timestamp:

Aug 6, 2014, 9:04:46 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1825: Remember positions of popup windows

The positions are remembered as long as the main BASE site is open.

Also added a configuration settings that allows a user to disable this feature.

Location:

branches/3.3-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/taglib/Body.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/taglib/Head.java (modified) (1 diff)
• www/include/scripts/main-2.js (modified) (7 diffs)
• www/include/scripts/popup.js (added)
• www/my_base/user/preferences.jsp (modified) (2 diffs)
• www/my_base/user/submit_user.jsp (modified) (1 diff)

branches/3.3-stable/src/clients/web/net/sf/basedb/clients/web/taglib/Body.java

@@ -217 +217 @@
           sb.append(" data-project-id=\"").append(sc.getActiveProjectId()).append("\"");
         }
+        sb.append(" data-remember-dialog-positions=\"").append(Values.getString(sc.getUserClientSetting("dialogs.remember-positions"), "1")).append("\"");
         if (message == null)
         {

branches/3.3-stable/src/clients/web/net/sf/basedb/clients/web/taglib/Head.java

@@ -183 +183 @@
       allScripts.add("menu.js");
     }
+    if (pageType == Page.PAGE_TYPE_POPUP) allScripts.add("popup.js");
     if (getScripts() != null) 
     {

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

@@ -52 +52 @@
   app.getLoggedInUserId = function()
   {
-    return Data.get(document.body, 'user-id');
+    return Data.int(document.body, 'user-id');
   }
 
@@ -60 +60 @@
   app.getActiveProjectId = function()
   {
-    return Data.get(document.body, 'project-id');
+    return Data.int(document.body, 'project-id');
   }
 
@@ -69 +69 @@
   app.getScale = function()
   {
-    return Data.get(document.body, 'gui-scale');
+    return Data.int(document.body, 'gui-scale');
   }
   
@@ -79 +79 @@
   app.getMaxUrlLength = function()
   {
-    return Data.get(document.body, 'max-url-length', 0);
+    return Data.int(document.body, 'max-url-length', 0);
+  }
+  
+  /**
+    Check if popup dialog positions should be remembered or not.
+   */
+  app.rememberDialogPositions = function()
+  {
+    return Data.int(document.body, 'remember-dialog-positions', 1);
   }
   
@@ -1197 +1205 @@
   dialogs.openPopup = function(url, name, width, height)
   {
-    
-    // Rescale according to user settings
-    var scale = App.getScale();
-    width = width * scale;
-    height = height * scale;
-
-    /*
-      We will try to position the popup window in the center of
-      the parent window.
-    */
-    var pos = App.getWindowPosition(window.top);
-    var top = Math.ceil(pos.top+(pos.height-height) / 2);
-    var left = Math.ceil(pos.left+(pos.width-width) / 2);
-    if (top < 0 && pos.top >= 0) top = 0;
-    if (left < 0 && pos.left >= 0) left = 0;
+    // Get last position of the window
+    var position = null;
+    if (App.rememberDialogPositions())
+    {
+      position = Data.getPageValue("last-position", name);
+    }
+
+    if (!position)
+    {
+      // If no last position is know, use the specified settings
+      position = {};
+      // Rescale according to user settings
+      var scale = App.getScale();
+      position.width = width * scale;
+      position.height = height * scale;
+      
+      //  Try to position the popup window in the center of the parent window.
+      var pos = App.getWindowPosition(window.top);
+      var top = Math.ceil(pos.top+(pos.height-height) / 2);
+      var left = Math.ceil(pos.left+(pos.width-width) / 2);
+      position.top = (top < 0 && pos.top >= 0) ? 0 : top;
+      position.left = (left < 0 && pos.left >= 0) ? 0 : left;
+    }
 
     var options = "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes";
-    options += ",top="+top+",left="+left+",width="+width+",height="+height;
-
     // Check if another window with the same name already exists
-    var oldWin = window.open('', name, options);
+    var oldWin = window.open('', name, options+",top="+position.top+",left="+position.left+",width="+position.width+",height="+position.height);
     try
     {
@@ -1229 +1243 @@
           return;
         }
+        position = App.getWindowPosition(oldWin);
         oldWin.close();
         url += '&warnIfOpen=0';
@@ -1236 +1251 @@
     {}
     
+    options += ",top="+position.top+",left="+position.left+",width="+position.width+",height="+position.height;
     var newWin;
     if (App.isTooLongUrl(url))

branches/3.3-stable/www/my_base/user/preferences.jsp

@@ -75 +75 @@
   final String maxColor = Values.getString(sc.getUserClientSetting("ratiocolor.max"), "FFFF00");
   
+  final boolean rememberDialogPositions = Values.getBoolean(sc.getUserClientSetting("dialogs.remember-positions"), true);
+  
   ItemContext cc = sc.getCurrentContext(Item.USERCLIENTSETTING);
   List<String> recentColors = cc.getRecent("colors");
@@ -295 +297 @@
           </td>
         </tr>
+        <tr>
+          <th>Dialogs</th>
+          <td>
+            <label><input type="checkbox" name="remember_positions" value="1" 
+              <%=rememberDialogPositions ? "checked" : "" %>
+              >Remember positions</label>
+          </td>
+        </tr>   
         <tr class="dynamic">
           <th></th>

branches/3.3-stable/www/my_base/user/submit_user.jsp

@@ -152 +152 @@
     FormatterSettings.setNumDecimals(sc, numDecimals);
     
+    sc.setUserClientSetting("dialogs.remember-positions", Values.getBoolean(request.getParameter("remember_positions")) ? "1" : "0");
+    
     // Plugins tab
     sc.setUserClientSetting("plugins.sendmessage", Values.getString(request.getParameter("sendmessage"), "0"));