Skip to content

Commit 3e6eb91

Browse files
committed
Fix event handling using DomEvent
1 parent 6402e97 commit 3e6eb91

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

template/Widget.template

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,6 @@ public class <%= className() %> extends <%= base ? base : 'PolymerWidget' %> {
2828
*/
2929
public <%= className() %>(String html) {
3030
super(<%= elementClassName() %>.TAG, <%= elementClassName() %>.SRC, html);
31-
<% if (hasEvents()) _.forEach(events, function(event){ %>
32-
getPolymerElement().addEventListener(
33-
<%= event.ns %>.event.<%= camelCase(event.name) %>Event.NAME,
34-
new EventListener() {
35-
36-
@Override
37-
public void handleEvent(Event event) {
38-
fireEvent(new <%= camelCase(event.name) %>Event((<%= event.ns %>.event.<%= camelCase(event.name) %>Event)event));
39-
}
40-
});
41-
<% }); %>
4231
}
4332

4433
/**
@@ -111,7 +100,7 @@ public class <%= className() %> extends <%= base ? base : 'PolymerWidget' %> {
111100
* @event <%= event.name %>
112101
*/
113102
public HandlerRegistration add<%= camelCase(event.name) %>Handler(<%= camelCase(event.name) %>EventHandler handler) {
114-
return addHandler(handler, <%= camelCase(event.name) %>Event.TYPE);
103+
return addDomHandler(handler, <%= camelCase(event.name) %>Event.TYPE);
115104
}
116105
<% }); %>
117106
}

template/WidgetEvent.template

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<%= disclaimer() %>
22
package <%= ns %>.widget.event;
33

4-
import com.google.gwt.event.shared.GwtEvent;
5-
import com.google.gwt.core.client.JavaScriptObject;
4+
import com.google.gwt.event.dom.client.DomEvent;
65

76
/**
87
* <%= getDescription(' ') %>
98
*/
10-
public class <%= camelCase(name) %>Event extends GwtEvent<<%= camelCase(name) %>EventHandler> {
9+
public class <%= camelCase(name) %>Event extends DomEvent<<%= camelCase(name) %>EventHandler> {
1110

12-
public static Type<<%= camelCase(name) %>EventHandler> TYPE = new Type<<%= camelCase(name) %>EventHandler>();
11+
<%= event.ns %>.event.<%= camelCase(event.name) %>Event.NAME,
1312

14-
private <%= ns %>.event.<%= camelCase(name) %>Event nativeEvent;
13+
public static Type<<%= camelCase(name) %>EventHandler> TYPE = new Type<<%= camelCase(name) %>EventHandler>(
14+
<%= ns %>.event.<%= camelCase(event.name) %>Event.NAME, new <%= camelCase(name) %>Event());
1515

16-
public <%= camelCase(name) %>Event(<%= ns %>.event.<%= camelCase(name) %>Event nativeEvent) {
17-
this.nativeEvent = nativeEvent;
16+
17+
public <%= camelCase(name) %>Event() {
1818
}
1919

2020
public Type<<%= camelCase(name) %>EventHandler> getAssociatedType() {
@@ -25,9 +25,6 @@ public class <%= camelCase(name) %>Event extends GwtEvent<<%= camelCase(name) %>
2525
handler.on<%= camelCase(name) %>(this);
2626
}
2727

28-
public <%= ns %>.event.<%= camelCase(name) %>Event getNativeEvent() {
29-
return nativeEvent;
30-
}
3128
<% if (hasParams()) _.forEach(params, function(param){ %>
3229
/**
3330
* <%= getDescription(' ', param) %>

0 commit comments

Comments
 (0)