Changeset 5552

Timestamp:

09/30/08 07:27:57 (3 months ago)

Author:

matti.tahvonen@…

Message:

fixes #1235. setting subwindow subwindow readonly now disables client side closing

Location:

trunk/src/com/itmill/toolkit

Files:

• terminal/gwt/client/ui/IWindow.java (modified) (3 diffs)
• ui/Window.java (modified) (1 diff)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java

@@ -104 +104 @@
     private Element headerText;
 
+    private boolean readonly;
+
     public IWindow() {
         super();
@@ -211 +213 @@
         if (uidl.getBooleanAttribute("resizable") != resizable) {
             setResizable(!resizable);
+        }
+
+        if (isReadOnly() != uidl.getBooleanAttribute("readonly")) {
+            setReadOnly(!isReadOnly());
         }
 
@@ -382 +388 @@
     }
 
+    private void setReadOnly(boolean readonly) {
+        this.readonly = readonly;
+        if (readonly) {
+            DOM.setStyleAttribute(closeBox, "display", "none");
+        } else {
+            DOM.setStyleAttribute(closeBox, "display", "");
+        }
+    }
+
+    private boolean isReadOnly() {
+        return readonly;
+    }
+
     @Override
     public void show() {

trunk/src/com/itmill/toolkit/ui/Window.java

@@ -834 +834 @@
         }
 
-        // Closing
-        final Boolean close = (Boolean) variables.get("close");
-        if (close != null && close.booleanValue()) {
-            close();
+        if (!isReadOnly()) {
+            // Closing
+            final Boolean close = (Boolean) variables.get("close");
+            if (close != null && close.booleanValue()) {
+                close();
+            }
         }
     }