Changeset 5085

Timestamp:

Aug 28, 2009, 2:11:19 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1363: IE8 problems

Fixes a problem with detecting and handling an already opened window.

File:

• branches/2.13-stable/www/include/scripts/main.js (modified) (2 diffs)

branches/2.13-stable/www/include/scripts/main.js

@@ -72 +72 @@
     if (options == null) options = "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes";
     options = "top="+top+",left="+left+",width="+width+",height="+height+"," + options;
-    var newWin = window.open('', name, options);
-    if (newWin.isOld)
+
+    var newWin = this.getPageValue('open.windows', name);
+    if (newWin && !newWin.closed)
     {
       var msg = 'This window has already been opened. ';
@@ -84 +85 @@
       url += '&warnIfOpen=0';
     }
-    newWin.isOld = true;
-    window.newWindow = newWin;
+    var newWin = window.open('', name, options);
+    this.setPageValue('open.windows', name, newWin);
     Main.safeSetLocation(url, newWin, true);
-    setTimeout("window.newWindow.focus()", 100);
-  }
-
+    setTimeout("Main.focusWindow('" + name + "')", 100);
+  }
+
+  /**
+    Brings a named window to focus.
+  */
+  this.focusWindow = function(windowName)
+  {
+    var win = this.getPageValue('open.windows', windowName);
+    if (win) win.focus();
+  }
+  
   /*
     Opens a popupwindow with a larger textarea field. The text is taken from