Skip to content

Commit

Permalink
Merge pull request #152 from GwtMaterialDesign/release_2.0
Browse files Browse the repository at this point in the history
Release 2.0 RC-2
  • Loading branch information
kevzlou7979 authored Nov 12, 2016
2 parents b4f32a3 + 5b43969 commit fdbb659
Show file tree
Hide file tree
Showing 26 changed files with 3,843 additions and 1,079 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
<parent>
<artifactId>gwt-material-parent</artifactId>
<groupId>com.github.gwtmaterialdesign</groupId>
<version>2.0-rc1</version>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>gwt-material-addins</artifactId>

<name>Gwt Material Addins</name>
<version>2.0-rc1</version>
<version>2.0-SNAPSHOT</version>
<description>Extra Components of GWT Material Framework</description>

<properties>
<gwt-material.version>2.0-rc1</gwt-material.version>
<gwt-material.version>2.0-SNAPSHOT</gwt-material.version>
</properties>

<scm>
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
<tag>v2.0-rc1</tag>
<tag>v2.0-SNAPSHOT</tag>
</scm>

<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ protected boolean addItem(final Suggestion suggestion) {
if (getType() == AutocompleteType.TEXT) {
suggestionMap.clear();
itemBox.setText(suggestion.getDisplayString());
displayItem.add(itemBox);
} else {
final MaterialChip chip = chipProvider.getChip(suggestion);
if (chip == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class MaterialAvatar extends MaterialWidget {
static {
if (MaterialAddins.isDebug()) {
MaterialDesignBase.injectDebugJs(MaterialAvatarDebugClientBundle.INSTANCE.jdenticonDebugJs());
MaterialDesignBase.injectDebugJs(MaterialAvatarDebugClientBundle.INSTANCE.jdenticonDebugJs());
MaterialDesignBase.injectDebugJs(MaterialAvatarDebugClientBundle.INSTANCE.md5DebugJs());
} else {
MaterialDesignBase.injectJs(MaterialAvatarClientBundle.INSTANCE.jdenticonJs());
MaterialDesignBase.injectJs(MaterialAvatarClientBundle.INSTANCE.md5Js());
Expand Down Expand Up @@ -126,4 +126,4 @@ public void initialize() {
protected void update() {
JsAvatar.jdenticon();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public class MaterialComboBox<T> extends AbstractValueWidget<T> implements HasPl
private HandlerRegistration valueChangeHandler;

private final ErrorMixin<AbstractValueWidget, MaterialLabel> errorMixin = new ErrorMixin<>(
this, lblError, this.asWidget());
this, lblError, this.asWidget());
private ReadOnlyMixin<MaterialComboBox, MaterialWidget> readOnlyMixin;

// By default the key is generated using toString
Expand Down
Loading

0 comments on commit fdbb659

Please sign in to comment.