/
ToggleAction.patch
30 lines (28 loc) · 1.42 KB
/
ToggleAction.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Index: core/src/main/java/de/betterform/xml/xforms/action/ToggleAction.java
===================================================================
--- core/src/main/java/de/betterform/xml/xforms/action/ToggleAction.java (revision 3547)
+++ core/src/main/java/de/betterform/xml/xforms/action/ToggleAction.java (working copy)
@@ -175,6 +175,12 @@
toSelect.select();
}
+ // dispatch internal betterform event
+ HashMap map = new HashMap();
+ map.put("selected", toSelect.getId());
+ map.put("deselected", isSelected.getId());
+ this.container.dispatch(switchElement.getTarget(), BetterFormEventNames.SWITCH_TOGGLED, map);
+
// dispatch xforms-deselect and xforms-select events
if(!toSelect.getId().equals(isSelected.getId())){
this.container.dispatch(isSelected.getTarget(), XFormsEventNames.DESELECT, null);
@@ -183,12 +189,6 @@
this.container.dispatch(toSelect.getTarget(), XFormsEventNames.SELECT, null);
}
- // dispatch internal betterform event
- HashMap map = new HashMap();
- map.put("selected", toSelect.getId());
- map.put("deselected", isSelected.getId());
- this.container.dispatch(switchElement.getTarget(), BetterFormEventNames.SWITCH_TOGGLED, map);
-
//as we did an optimization to only update selected 'case' elements we need to refresh after a toggle
doRefresh(true);
}