Changeset 22277 for gs3-extensions/atlas-src/trunk/src/org/greenstone/client/Menu.java

Timestamp:

2010-06-18T16:08:27+12:00 (14 years ago)

Author:

sjm84

Message:

Added several improvements to the code such as the ability to remove places if they from the text and map if they should not be places

File:

• gs3-extensions/atlas-src/trunk/src/org/greenstone/client/Menu.java (modified) (6 diffs)

gs3-extensions/atlas-src/trunk/src/org/greenstone/client/Menu.java

@@ -13 +13 @@
 public class Menu
 {
+    protected Element _parent = null;
     protected ArrayList<Menu> _childMenus = new ArrayList<Menu>();
     protected ArrayList<MenuItem> _menuItems = new ArrayList<MenuItem>();
@@ -21 +22 @@
     public Menu(Element parent, MouseOverHandler onMouseOver, MouseOutHandler onMouseOut)
     {
+        _parent = parent;
         parent.appendChild(_menuDiv.getElement());
         _menuDiv.getElement().getStyle().setProperty("background", "#FFFFFF");
@@ -32 +34 @@
     public void addMenuItems(ArrayList<MenuItem> menuItems)
     {
+        _menuItems = menuItems;
         int maxWidth = -1;
         for(int i = 0; i < menuItems.size(); i++)
         {
+            if(!menuItems.get(i).condition())
+            {
+                continue;
+            }
             Element item = menuItems.get(i).getMenuElement();
             item.getStyle().setProperty("background", "#FFFFFF");
@@ -69 +76 @@
         {
             public void run() 
-            {
-                //GS3MapLibrary.logToConsole("Menu height = " + _menuDiv.getOffsetHeight() + ", Div height = " + GS3MapLibrary.getElementById("GSContent").getOffsetHeight() + ", Top = " + GS3MapLibrary.getElementById("GSContent").getAbsoluteTop());
-                
+            {               
                 if (_menuDiv.getOffsetHeight() > GS3MapLibrary.getElementById("GSContent").getOffsetHeight())
                 {
@@ -80 +85 @@
                 else if(y + _menuDiv.getOffsetHeight() > GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop())
                 {
-                    //GS3MapLibrary.logToConsole("TRUE, " + (y + _menuDiv.getOffsetHeight()) + " is greater than " + GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop());
                     _menuDiv.getElement().getStyle().setProperty("top", (y - ( y + _menuDiv.getOffsetHeight() - GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop()) + "px"));
-                }
-                else
-                {
-                    //GS3MapLibrary.logToConsole("FALSE, " + (y + _menuDiv.getOffsetHeight()) + " is less than " + GS3MapLibrary.getElementById("GSFooter").getAbsoluteTop());
                 }
                 _menuDiv.setVisible(true);
@@ -111 +111 @@
     }
     
+    public void refreshMenu()
+    {
+        _parent.removeChild(_menuDiv.getElement());
+        _menuDiv = new HTML();
+        _parent.appendChild(_menuDiv.getElement());
+        _menuDiv.getElement().getStyle().setProperty("background", "#FFFFFF");
+        _menuDiv.getElement().getStyle().setProperty("padding", "2px");
+        _menuDiv.getElement().getStyle().setProperty("position", "absolute");
+        addMenuItems(_menuItems);
+    }
+    
     public void showMenu()
     {