fixes #2415, notifications now reacts all but key/mouse up events

svn changeset:6393/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/INotification.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/INotification.java
index a2bca9ceb5513309abdccc405fed2decb2796759..4cb14f1373e49e6ade3644f878f1765bc058b99d 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/INotification.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/INotification.java
@@ -15,6 +15,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Timer;\r
 import com.google.gwt.user.client.ui.HTML;\r
 import com.google.gwt.user.client.ui.Widget;\r
+import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;\r
 import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;\r
 \r
 public class INotification extends IToolkitOverlay {\r
@@ -70,6 +71,7 @@ public class INotification extends IToolkitOverlay {
         DOM.removeEventPreview(this);\r
         if (delayMsec > 0) {\r
             delay = new Timer() {\r
+                @Override\r
                 public void run() {\r
                     fade();\r
                 }\r
@@ -80,6 +82,7 @@ public class INotification extends IToolkitOverlay {
         }\r
     }\r
 \r
+    @Override\r
     public void show() {\r
         show(CENTERED);\r
     }\r
@@ -112,6 +115,7 @@ public class INotification extends IToolkitOverlay {
         setPosition(position);\r
     }\r
 \r
+    @Override\r
     public void hide() {\r
         DOM.removeEventPreview(this);\r
         cancelDelay();\r
@@ -132,6 +136,7 @@ public class INotification extends IToolkitOverlay {
             long timestamp = 0;\r
             int opacity = startOpacity;\r
 \r
+            @Override\r
             public void run() {\r
                 double adjust = (timestamp == 0 ? 1\r
                         : (new Date().getTime() - timestamp) / msec);\r
@@ -219,6 +224,7 @@ public class INotification extends IToolkitOverlay {
 \r
     }\r
 \r
+    @Override\r
     public void onBrowserEvent(Event event) {\r
         DOM.removeEventPreview(this);\r
         if (fader == null) {\r
@@ -226,6 +232,7 @@ public class INotification extends IToolkitOverlay {
         }\r
     }\r
 \r
+    @Override\r
     public boolean onEventPreview(Event event) {\r
         int type = DOM.eventGetType(event);\r
         // "modal"\r
@@ -254,12 +261,11 @@ public class INotification extends IToolkitOverlay {
                 startDelay();\r
             }\r
             break;\r
-        case Event.ONCLICK:\r
-        case Event.ONDBLCLICK:\r
-        case Event.KEYEVENTS:\r
-        case Event.ONSCROLL:\r
         default:\r
-            startDelay();\r
+            if (type != Event.ONMOUSEUP && type != Event.ONKEYUP) {\r
+                ApplicationConnection.getConsole().log(event.getType());\r
+                startDelay();\r
+            }\r
         }\r
         return true;\r
     }\r