Changeset 5410

Timestamp:

Sep 17, 2010, 9:33:48 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1511: Get rid of script that hide form elements when selecting a menu item in IE

Location:

trunk/www

Files:

• common/plugin/test_with_file.jsp (modified) (1 diff)
• include/scripts/menu.js (modified) (5 diffs)

trunk/www/common/plugin/test_with_file.jsp

@@ -129 +129 @@
     function showPredefined(event, menu)
     {
-      Menu.toggleTopMenu(document.getElementById(menu), event.clientX, event.clientY, true); 
+      Menu.toggleTopMenu(document.getElementById(menu), event.clientX, event.clientY); 
       event.cancelBubble = true;
     }

trunk/www/include/scripts/menu.js

@@ -40 +40 @@
   this.zIndex = 999;
 
-  this.showTopMenu = function(menu, x, y, keepForms)
+  this.showTopMenu = function(menu, x, y)
   {
     this.hideAll();
@@ -48 +48 @@
     menu.style.zIndex = this.zIndex++;
     menu.canHide = true;
-    this.registerVisible(menu, keepForms);
+    this.registerVisible(menu);
   }
   
-  this.toggleTopMenu = function(menu, x, y, keepForms)
+  this.toggleTopMenu = function(menu, x, y)
   {
     if (menu.style.display == 'none')
     {
-      this.showTopMenu(menu, x, y, keepForms);
+      this.showTopMenu(menu, x, y);
     }
     else
@@ -151 +151 @@
   
   
-  this.registerVisible = function(menu, keepForms)
+  this.registerVisible = function(menu)
   {
     this.numVisible++;
-    if (keepForms == undefined)
-    {
-      keepForms = !Browser.hideFormElementsForMenu;
-    }
-    if (this.numVisible == 1 && !keepForms) this.hideForms();
     this.allVisible[this.allVisible.length] = menu;
   }
@@ -165 +160 @@
   {
     this.numVisible--;
-    if (this.numVisible == 0) this.showForms();
     for (var i = this.allVisible.length-1; i >= 0; i--)
     {
@@ -186 +180 @@
   }
   
-  this.hideForms = function(win)
-  {
-    if (!win) win = window;
-    var doc = win.document;
-    for (var i = 0; i < doc.forms.length; i++)
-    {
-      var frm = doc.forms[i];
-      for (var j = 0; j < frm.elements.length; j++)
-      {
-        frm.elements[j].style.visibility = 'hidden';
-      }
-    }
-    if (win.frames && win.frames.length > 0)
-    {
-      for (var i = 0; i < win.frames.length; i++)
-      {
-        this.hideForms(win.frames[i]);
-      }
-    }
-  }
-
-  this.showForms = function(win)
-  {
-    if (!win) win = window;
-    var doc = win.document;
-    for (i = 0; i < doc.forms.length; i++)
-    {
-      var frm = doc.forms[i];
-      for (var j = 0; j < frm.elements.length; j++)
-      {
-        frm.elements[j].style.visibility = 'inherit';
-      }
-    }
-    if (win.frames && win.frames.length > 0)
-    {
-      for (var i = 0; i < win.frames.length; i++)
-      {
-        this.showForms(win.frames[i]);
-      }
-    }
-  }
   
   this.openUrl = function(url, target)