Skip to content

Commit 7d2050e

Browse files
committed
Removed the swipe events for later used
1 parent c2f1dc2 commit 7d2050e

File tree

3 files changed

+58
-89
lines changed

3 files changed

+58
-89
lines changed

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollectionItem.java

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public class MaterialCollectionItem extends MaterialWidget implements HasClickHa
5050
private final ToggleStyleMixin<MaterialCollectionItem> dismissableMixin = new ToggleStyleMixin<>(this, "dismissable");
5151

5252
private HandlerRegistration handlerReg;
53-
private Runnable swipeLeftCallback;
54-
private Runnable swipeRightCallback;
5553

5654
public MaterialCollectionItem() {
5755
super(Document.get().createLIElement());
@@ -62,52 +60,52 @@ public MaterialCollectionItem() {
6260
@Override
6361
protected void onLoad() {
6462
super.onLoad();
65-
initDismissableCollection(getSwipeLeftCallback(), getSwipeRightCallback());
63+
initDismissableCollection();
6664
}
6765

68-
private native void initDismissableCollection(Runnable swipeLeftCallback, Runnable swipeRightCallback) /*-{
69-
$wnd.initDismissableCollection(swipeLeftCallback, swipeRightCallback);
66+
private native void initDismissableCollection() /*-{
67+
$wnd.initDismissableCollection();
7068
}-*/;
7169

7270
public void setType(CollectionType type) {
7371
switch (type) {
74-
case AVATAR:
75-
addStyleName(type.getCssName());
76-
break;
77-
case CHECKBOX:
78-
if(getWidgetCount() > 0) {
79-
getWidget(0).getElement().getStyle().setProperty("display" , "inline");
80-
}
81-
if(handlerReg != null) {
82-
handlerReg.removeHandler();
83-
}
84-
handlerReg = addClickHandler(new ClickHandler() {
85-
@Override
86-
public void onClick(ClickEvent event) {
87-
for(Widget w : MaterialCollectionItem.this) {
88-
if(w instanceof MaterialCollectionSecondary) {
89-
for(Widget a : (MaterialCollectionSecondary)w) {
90-
if(a instanceof HasValue) {
91-
try {
92-
@SuppressWarnings("unchecked")
93-
HasValue<Boolean> cb = (HasValue<Boolean>) a;
94-
if (cb.getValue()) {
95-
cb.setValue(false);
96-
} else {
97-
cb.setValue(true);
72+
case AVATAR:
73+
addStyleName(type.getCssName());
74+
break;
75+
case CHECKBOX:
76+
if(getWidgetCount() > 0) {
77+
getWidget(0).getElement().getStyle().setProperty("display" , "inline");
78+
}
79+
if(handlerReg != null) {
80+
handlerReg.removeHandler();
81+
}
82+
handlerReg = addClickHandler(new ClickHandler() {
83+
@Override
84+
public void onClick(ClickEvent event) {
85+
for(Widget w : MaterialCollectionItem.this) {
86+
if(w instanceof MaterialCollectionSecondary) {
87+
for(Widget a : (MaterialCollectionSecondary)w) {
88+
if(a instanceof HasValue) {
89+
try {
90+
@SuppressWarnings("unchecked")
91+
HasValue<Boolean> cb = (HasValue<Boolean>) a;
92+
if (cb.getValue()) {
93+
cb.setValue(false);
94+
} else {
95+
cb.setValue(true);
96+
}
97+
} catch (ClassCastException ex) {
98+
// Ignore non-boolean has value handlers.
9899
}
99-
} catch (ClassCastException ex) {
100-
// Ignore non-boolean has value handlers.
101100
}
102101
}
103102
}
104103
}
105104
}
106-
}
107-
});
108-
break;
109-
default:
110-
break;
105+
});
106+
break;
107+
default:
108+
break;
111109
}
112110
}
113111

@@ -135,20 +133,4 @@ public boolean isAvatar() {
135133
public HandlerRegistration addClickHandler(ClickHandler handler) {
136134
return addDomHandler(handler, ClickEvent.getType());
137135
}
138-
139-
public Runnable getSwipeLeftCallback() {
140-
return swipeLeftCallback;
141-
}
142-
143-
public void setSwipeLeftCallback(Runnable swipeLeftCallback) {
144-
this.swipeLeftCallback = swipeLeftCallback;
145-
}
146-
147-
public Runnable getSwipeRightCallback() {
148-
return swipeRightCallback;
149-
}
150-
151-
public void setSwipeRightCallback(Runnable swipeRightCallback) {
152-
this.swipeRightCallback = swipeRightCallback;
153-
}
154136
}

gwt-material/src/main/resources/gwt/material/design/client/resources/js/animation.js

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
function showGrid(id, duration){
22
var speed = 900;
3-
var container = $(id);
4-
container.each(function() {
3+
var container = $(id);
4+
container.each(function() {
55
var elements = $(this).children();
6-
elements.each(function() {
7-
var elementOffset = $(this).offset();
6+
elements.each(function() {
7+
var elementOffset = $(this).offset();
88
var offset = elementOffset.left*0.5 + elementOffset.top;
99
var delay = parseFloat(offset/speed).toFixed(2);
1010
$(this)
11-
.css("-webkit-transition-delay", delay+'s')
12-
.css("-o-transition-delay", delay+'s')
13-
.css("transition-delay", delay+'s')
14-
.removeClass('closed')
15-
.addClass('animated');
11+
.css("-webkit-transition-delay", delay+'s')
12+
.css("-o-transition-delay", delay+'s')
13+
.css("transition-delay", delay+'s')
14+
.removeClass('closed')
15+
.addClass('animated');
1616
});
1717
});
1818
}
@@ -21,35 +21,27 @@ function closeGrid(id, duration){
2121
var speed = 900;
2222
var container = $(id);
2323
container.each(function() {
24-
var elements = $(this).children();
25-
elements.each(function() {
26-
var elementOffset = $(this).offset();
27-
var offset = elementOffset.left*0.5 + elementOffset.top;
28-
var delay = parseFloat(offset/speed).toFixed(2);
29-
$(this)
30-
.css("-webkit-transition-delay", delay+'s')
31-
.css("-o-transition-delay", delay+'s')
32-
.css("transition-delay", delay+'s')
33-
.removeClass('animated')
34-
.addClass('closed');
35-
});
24+
var elements = $(this).children();
25+
elements.each(function() {
26+
var elementOffset = $(this).offset();
27+
var offset = elementOffset.left*0.5 + elementOffset.top;
28+
var delay = parseFloat(offset/speed).toFixed(2);
29+
$(this)
30+
.css("-webkit-transition-delay", delay+'s')
31+
.css("-o-transition-delay", delay+'s')
32+
.css("transition-delay", delay+'s')
33+
.removeClass('animated')
34+
.addClass('closed');
35+
});
3636
});
3737
}
3838

3939
var swipeLeft = false;
4040
var swipeRight = false;
4141

4242
/* Hook the Dismissable Collection to includke the swipe left and swipe right
43-
callback */
44-
function initDismissableCollection(swipeLeftCallback, swipeRightCallback) {
45-
// Right On Remove callback
46-
var rightCallbacks = $.Callbacks();
47-
rightCallbacks.add(swipeRightCallback);
48-
49-
// Left on Remove callback
50-
var leftCallbacks = $.Callbacks();
51-
leftCallbacks.add(swipeLeftCallback);
52-
43+
callback */
44+
function initDismissableCollection() {
5345
// Dismissible Collections
5446
$('.dismissable').each(function() {
5547
$(this).hammer({
@@ -95,11 +87,6 @@ function initDismissableCollection(swipeLeftCallback, swipeRightCallback) {
9587
$this.velocity({ height: 0, padding: 0,
9688
}, {duration: 200, queue: false, easing: 'easeOutQuad', complete:
9789
function() {
98-
if(swipeRight){
99-
rightCallbacks.fire();
100-
}else{
101-
leftCallbacks.fire();
102-
}
10390
$this.remove();
10491
}
10592
});

gwt-material/src/main/resources/gwt/material/design/client/resources/js/animation.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)