Revision: 8727
Author: [email protected]
Date: Tue Sep 7 14:01:53 2010
Log: rollback r8722 due to test failure on Chrome
http://code.google.com/p/google-web-toolkit/source/detail?r=8727
Modified:
/trunk/user/src/com/google/gwt/user/client/ui/FocusWidget.java
/trunk/user/src/com/google/gwt/user/client/ui/HTMLTable.java
/trunk/user/src/com/google/gwt/user/client/ui/Hyperlink.java
/trunk/user/src/com/google/gwt/user/client/ui/Image.java
/trunk/user/src/com/google/gwt/user/client/ui/Label.java
/trunk/user/test/com/google/gwt/user/UISuite.java
=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/FocusWidget.java Tue Sep
7 06:57:03 2010
+++ /trunk/user/src/com/google/gwt/user/client/ui/FocusWidget.java Tue Sep
7 14:01:53 2010
@@ -104,7 +104,7 @@
}
public HandlerRegistration addDoubleClickHandler(DoubleClickHandler
handler) {
- return addDomHandler(handler, DoubleClickEvent.getType());
+ return addHandler(handler, DoubleClickEvent.getType());
}
public HandlerRegistration addFocusHandler(FocusHandler handler) {
=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/HTMLTable.java Tue Sep 7
06:57:03 2010
+++ /trunk/user/src/com/google/gwt/user/client/ui/HTMLTable.java Tue Sep 7
14:01:53 2010
@@ -725,7 +725,7 @@
}
public HandlerRegistration addDoubleClickHandler(DoubleClickHandler
handler) {
- return addDomHandler(handler, DoubleClickEvent.getType());
+ return addHandler(handler, DoubleClickEvent.getType());
}
/**
=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/Hyperlink.java Tue Sep 7
06:57:03 2010
+++ /trunk/user/src/com/google/gwt/user/client/ui/Hyperlink.java Tue Sep 7
14:01:53 2010
@@ -18,7 +18,10 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.DoubleClickEvent;
+import com.google.gwt.event.dom.client.DoubleClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
+import com.google.gwt.event.dom.client.HasDoubleClickHandlers;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
@@ -60,7 +63,7 @@
*/
@SuppressWarnings("deprecation")
public class Hyperlink extends Widget implements HasHTML,
SourcesClickEvents,
- HasClickHandlers {
+ HasClickHandlers, HasDoubleClickHandlers {
private static HyperlinkImpl impl = GWT.create(HyperlinkImpl.class);
@@ -137,6 +140,10 @@
public void addClickListener(ClickListener listener) {
ListenerWrapper.WrappedClickListener.add(this, listener);
}
+
+ public HandlerRegistration addDoubleClickHandler(DoubleClickHandler
handler) {
+ return addHandler(handler, DoubleClickEvent.getType());
+ }
public String getHTML() {
return DOM.getInnerHTML(anchorElem);
=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/Image.java Tue Sep 7
06:57:03 2010
+++ /trunk/user/src/com/google/gwt/user/client/ui/Image.java Tue Sep 7
14:01:53 2010
@@ -125,7 +125,7 @@
image.replaceElement(impl.createStructure(url, left, top, width,
height));
// Todo(ecc) This is wrong, we should not be sinking these here on
such a
// common widget.After the branch is stable, this should be fixed.
- image.sinkEvents(Event.ONCLICK | Event.ONDBLCLICK |
Event.MOUSEEVENTS | Event.ONMOUSEWHEEL
+ image.sinkEvents(Event.ONCLICK | Event.MOUSEEVENTS |
Event.ONMOUSEWHEEL
| Event.ONLOAD);
}
@@ -282,7 +282,7 @@
UnclippedState(Element element) {
// This case is relatively unusual, in that we swapped a clipped
image
// out, so does not need to be efficient.
- Event.sinkEvents(element, Event.ONCLICK | Event.ONDBLCLICK |
Event.MOUSEEVENTS
+ Event.sinkEvents(element, Event.ONCLICK | Event.MOUSEEVENTS
| Event.ONLOAD | Event.ONERROR | Event.ONMOUSEWHEEL);
}
@@ -294,7 +294,7 @@
Event.sinkEvents(image.getElement(), Event.ONLOAD);
// Todo(ecc) this could be more efficient overall.
- image.sinkEvents(Event.ONCLICK | Event.ONDBLCLICK |
Event.MOUSEEVENTS | Event.ONLOAD
+ image.sinkEvents(Event.ONCLICK | Event.MOUSEEVENTS | Event.ONLOAD
| Event.ONERROR | Event.ONMOUSEWHEEL);
}
=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/Label.java Tue Sep 7
06:57:03 2010
+++ /trunk/user/src/com/google/gwt/user/client/ui/Label.java Tue Sep 7
14:01:53 2010
@@ -216,7 +216,7 @@
}
public HandlerRegistration addDoubleClickHandler(DoubleClickHandler
handler) {
- return addDomHandler(handler, DoubleClickEvent.getType());
+ return addHandler(handler, DoubleClickEvent.getType());
}
public HandlerRegistration addMouseDownHandler(MouseDownHandler handler)
{
=======================================
--- /trunk/user/test/com/google/gwt/user/UISuite.java Tue Sep 7 06:57:03
2010
+++ /trunk/user/test/com/google/gwt/user/UISuite.java Tue Sep 7 14:01:53
2010
@@ -20,7 +20,6 @@
import com.google.gwt.user.client.AsyncProxyTest;
import com.google.gwt.user.client.CommandExecutorTest;
import com.google.gwt.user.client.CookieTest;
-import com.google.gwt.user.client.DoubleClickEventSinkTest;
import com.google.gwt.user.client.EventTest;
import com.google.gwt.user.client.HistoryDisabledTest;
import com.google.gwt.user.client.WindowTest;
@@ -142,7 +141,6 @@
suite.addTestSuite(DockLayoutPanelRtlTest.class);
suite.addTestSuite(DockLayoutPanelTest.class);
suite.addTestSuite(DockPanelTest.class);
- suite.addTestSuite(DoubleClickEventSinkTest.class);
suite.addTestSuite(DOMTest.class);
suite.addTestSuite(DOMRtlTest.class);
suite.addTestSuite(ElementWrappingTest.class);
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors