Skip to content

Commit 7b84171

Browse files
kevzlou7979kevzlou7979
authored andcommitted
Fixed Slider Issue
1 parent 26223c5 commit 7b84171

File tree

6 files changed

+55
-12
lines changed

6 files changed

+55
-12
lines changed

src/main/java/gwt/material/design/client/custom/ButtonBase.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,13 @@ public void setHref(String href) {
149149
public void setTooltip(String tooltip) {
150150
addStyleName("tooltipped");
151151
getElement().setAttribute("data-tooltip", tooltip);
152-
initTooltip();
153152
}
154153

155154
@Override
156155
public void setTooltipLocation(String tooltipLocation) {
157156
getElement().setAttribute("data-position", tooltipLocation);
158157
}
159158

160-
@Override
161-
public native void initTooltip() /*-{
162-
163-
}-*/;
164-
165159
@Override
166160
public boolean isDisabled() {
167161
return disabled;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package gwt.material.design.client.custom;
2+
3+
public interface HasAlign {
4+
5+
/**
6+
* Set the alignment of material component<br>
7+
* - left <br>
8+
* - right <br>
9+
* - center
10+
* @param align
11+
*/
12+
public void setAlign(String align);
13+
14+
}

src/main/java/gwt/material/design/client/custom/HasTooltip.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ public interface HasTooltip {
3636
* @param tooltip
3737
*/
3838
public void setTooltipLocation(String tooltipLocation);
39-
40-
/**
41-
* Initilize the tooltip component
42-
*/
43-
public void initTooltip();
39+
4440

4541
}

src/main/java/gwt/material/design/client/resources/ResourcesLoader.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ private void injectMaterializeJs(MaterialResources resources) {
4949
ScriptInjector.fromString(resources.materializeJs().getText())
5050
.setWindow(ScriptInjector.TOP_WINDOW)
5151
.inject();
52+
initTooltip();
5253
}
5354

5455
private void injectPickTimeJs(MaterialResources resources) {
@@ -65,4 +66,10 @@ private void injectPickTimeJs(MaterialResources resources) {
6566
private native boolean isjQueryLoaded() /*-{
6667
return (typeof $wnd['jQuery'] !== 'undefined');
6768
}-*/;
69+
70+
public native void initTooltip()/*-{
71+
$wnd.jQuery(document).ready(function(){
72+
$wnd.jQuery('.tooltipped').tooltip({delay: 50});
73+
});
74+
}-*/;
6875
}

src/main/java/gwt/material/design/client/ui/MaterialSlide.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.google.gwt.dom.client.Document;
66
import com.google.gwt.user.client.DOM;
7+
import com.google.gwt.user.client.ui.Widget;
78

89
public class MaterialSlide extends ComplexWidget{
910

@@ -13,12 +14,23 @@ public MaterialSlide(){
1314
setElement(Document.get().createDivElement());
1415
setStyleName("slider");
1516
ul.setStyleName("slides");
16-
add(ul);
17+
super.add(ul);
1718
String className = DOM.createUniqueId();
1819
addStyleName(className);
1920
initializeSlider(className);
2021
}
2122

23+
24+
25+
26+
@Override
27+
public void add(Widget child) {
28+
ul.add(child);
29+
}
30+
31+
32+
33+
2234
/**
2335
* Initialize the slider when the widget is attached
2436
* @param className CSS class name
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package gwt.material.design.client.ui;
2+
3+
import gwt.material.design.client.custom.ComplexWidget;
4+
import gwt.material.design.client.custom.HasAlign;
5+
6+
import com.google.gwt.dom.client.Document;
7+
8+
public class MaterialSlideCaption extends ComplexWidget implements HasAlign{
9+
10+
public MaterialSlideCaption() {
11+
setElement(Document.get().createDivElement());
12+
setStyleName("caption");
13+
}
14+
15+
@Override
16+
public void setAlign(String align) {
17+
addStyleName(align + "-align");
18+
}
19+
20+
}

0 commit comments

Comments
 (0)