Merge pull request #101 from GwtMaterialDesign/release_1.5.2

Release 1.5.2

Author: kevzlou7979

.travis.yml

@@ -7,7 +7,7 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material library before we build the demo
-- git clone -b release_1.5.1 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.1" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.2" ]; then
   echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
   mvn deploy --settings ~/settings.xml
 fi

README.md

@@ -7,7 +7,7 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
 </dependency>
 ```
 

pom.xml

@@ -3,25 +3,25 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gwt-material-addins</artifactId>
 
     <name>Gwt Material Addins</name>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <description>Extra Components of GWT Material Framework</description>
 
     <properties>
-        <gwt-material.version>1.5.1</gwt-material.version>
+        <gwt-material.version>1.5.2</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>v1.5.1</tag>
+        <tag>v1.5.2</tag>
     </scm>
 
     <licenses>
@@ -44,6 +44,19 @@
         </repository>
     </distributionManagement>
 
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
     <dependencies>
         <!-- GwtMaterial -->
         <dependency>

src/main/java/gwt/material/design/addins/client/fileuploader/MaterialFileUploader.java

@@ -225,8 +225,8 @@ private native void initDropzone(Element e, Element template, String previews, E
                 that.@gwt.material.design.addins.client.fileuploader.MaterialFileUploader::fireSendingEvent(*)(file.name , file.lastModifiedDate , file.size , file.type, file.xhr.status, file.xhr.statusText);
             });
 
-            zdrop.on('success', function (file) {
-                that.@gwt.material.design.addins.client.fileuploader.MaterialFileUploader::fireSuccessEvent(*)(file.name , file.lastModifiedDate , file.size , file.type, file.xhr.status, file.xhr.statusText);
+            zdrop.on('success', function (file, response) {
+                that.@gwt.material.design.addins.client.fileuploader.MaterialFileUploader::fireSuccessEvent(*)(file.name , file.lastModifiedDate , file.size , file.type, file.xhr.status, response);
             });
 
             zdrop.on('complete', function (file) {

src/main/java/gwt/material/design/addins/client/fileuploader/MaterialUploadCollection.java

@@ -63,6 +63,8 @@ public MaterialUploadCollection() {
 
         // Upload Information - Upload Name info
         nameWrapper.add(name);
+        name.setTruncate(true);
+        name.setWidth("200px");
         name.setDataAttribute("data-dz-name", "");
         nameWrapper.add(size);
         size.setDataAttribute("data-dz-size", "");
@@ -89,10 +91,8 @@ public MaterialUploadCollection() {
         btnClear.setId("dz-remove");
         btnClear.setBackgroundColor("transparent");
         btnClear.setShadow(0);
-        btnClear.setWaves(WavesType.DEFAULT);
         btnClear.setCircle(true);
         btnClear.setTextColor("white");
-        btnClear.setWaves(WavesType.DEFAULT);
         btnClear.addStyleName("ph");
         btnClear.setIconType(IconType.CLEAR);
         btnClear.setDataAttribute("data-dz-remove", "");

src/main/resources/gwt/material/design/addins/client/fileuploader/resources/css/dropzone.css

@@ -82,7 +82,8 @@
 .preview-container .previews .zdrop-info{
   width: 220px;
   margin-right: 2%;
-  margin-left: 40px;
+  margin-left: 20px;
+  padding-left: 24px;
 }
 .preview-container .previews .zdrop-info .preview-icon{
   background: #EFEFEF;
@@ -117,14 +118,15 @@
   line-height: 1;
   color: #C3C3C3;
   line-height: 1;
+  margin-top: -16px;
 }
 .preview-container .previews .dz-error-message{
   font-size: 0.8em;
   color: #F44336;
 }
 .preview-container .previews .zdrop-info span:nth-child(2){
   color: #B5B5B5;
-  margin-left: 16px;
+  font-size: 0.8em;
 }
 .preview-container .previews .progress {
   margin-top: 4px;