Merge remote-tracking branch 'origin/master'

Author: Christian

README.md

@@ -5,17 +5,12 @@
 A Google Material Design wrapper for GWT <br>
 <a href="www.gwt-material.appspot.com">http://www.gwt-material.appspot.com</a>
 
-<h3>Version 15.5</h3>
+<h3>Version 1.3</h3>
 <ul>
 <li>GWT Material Official Maven Release</li>
 <li>Switch bug fixed on setValue()</li>
 <li>Transition Added</li>
 <li>Embed stylesheets and javascripts inside the project (no more external files)</li>
-
-</ul>
-
-<h3>Version 15.4.15</h3>
-<ul>
 <li>GWT Material Showcase</li>
 	<ul>
 		<li>Parallax</li>
@@ -32,7 +27,7 @@ A Google Material Design wrapper for GWT <br>
 <img src="http://gwt-material.appspot.com/bin/weather.gif" />
 <img src="http://gwt-material.appspot.com/bin/parallax.gif" />
 
-<h3>Version 15.4</h3>
+<h3>Version 1.2</h3>
 <ul>
 <li>Integrate GWT Material to Phonegap</li>
 <li>Remove GWT Uploader on Build Path (Which cause a inheritance problem)</li>
@@ -47,7 +42,7 @@ A Google Material Design wrapper for GWT <br>
 <li>Adding Roboto Fonts by default</li>
 </ul>
 
-<h3>Version 15.3 </h3>
+<h3>Version 1.0 </h3>
 <ul>
 <li>Collabsible and Accordion</li>
 <li>Dropdown Menu</li>

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

@@ -34,10 +34,11 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.HasText;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-public class MaterialButton extends MaterialWidget implements HasClickHandlers{
+public class MaterialButton extends MaterialWidget implements HasClickHandlers,HasText{
 
 	private static MaterialButtonUiBinder uiBinder = GWT.create(MaterialButtonUiBinder.class);
 

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

@@ -82,11 +82,12 @@ public void hide(){
 	public static native void showModal(String id)/*-{
 		$wnd.jQuery('#' + id).openModal();
 	}-*/;
-	
-	public static native void closeModal()/*-{
+
+	public static native void closeModal(String id)/*-{
 		$wnd.jQuery('#' + id).closeModal();
 	}-*/;
 
-	
-	
+	public static void closeModal() {
+		closeModal(panel.getElement().getId());
+	}
 }

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

@@ -21,20 +21,141 @@
  */
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.HasChangeHandlers;
+import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 
-public class MaterialRange extends Composite {
+/**
+ * Slider for numeric values
+ */
+public class MaterialRange extends Composite implements HasChangeHandlers{
 
-	private static MaterialRangeUiBinder uiBinder = GWT
-			.create(MaterialRangeUiBinder.class);
+	private static MaterialRangeUiBinder uiBinder = GWT.create(MaterialRangeUiBinder.class);
 
 	interface MaterialRangeUiBinder extends UiBinder<Widget, MaterialRange> {
 	}
 
+    private static String VALUE = "value";
+    private static String MAX = "max";
+    private static String MIN = "min";
+    private static String INPUT = "INPUT";
+	
+	// cache the embedded range input element
+	private Element rangeElement = null;
+
 	public MaterialRange() {
 		initWidget(uiBinder.createAndBindUi(this));
 	}
 
+	/**
+	 * Try to identify the embedded range elements input field (see ui xml)
+	 * @return The found element or null if none found.
+	 */
+	private Element getRangeElement() {
+		if (rangeElement == null) {
+			NodeList<Element> elements = this.getElement().getElementsByTagName(INPUT);
+			if (elements != null && elements.getLength() > 0) {
+				rangeElement = elements.getItem(0);
+			}
+		}
+		return rangeElement;
+	}
+
+	/**
+	 * Retrieve the Integer value from the given Attribute of the range element
+	 * @param attribute The name of the attribute on the range element
+	 * @return The Integer vaulue read from the given attribute or null
+	 */
+	private Integer getIntFromRangeElement(String attribute){
+		Element ele = getRangeElement();
+		if(ele!=null){
+          return ele.getPropertyInt(attribute);
+		}
+		return null;
+	}
+
+	/**
+	 * Set the given Integer value to the attribute of the range element
+	 * @param attribute
+	 * @param val
+	 */
+	private void setIntToRangeElement(String attribute,Integer val)
+	{
+		Element ele = getRangeElement();
+		if(ele!=null){
+          ele.setPropertyInt(attribute,val);
+		}
+	}
+	
+	/**
+	 * Read the current value
+	 * @return The Integer value or null
+	 */
+	public Integer getValue() {
+		return getIntFromRangeElement(VALUE);
+	}
+
+	/**
+	 * Write the current value
+	 * @param value value must be >= min and <= max 
+	 */
+	public void setValue(Integer value) {
+		if (value==null)return;
+		if (value<getMin())return;
+		if (value>getMax())return;
+        setIntToRangeElement(VALUE,value);
+	}
+
+	/**
+	 * Read the min value
+	 * @return The Integer or null
+	 */
+	public Integer getMin() {
+		return getIntFromRangeElement(MIN);
+	}
+
+	/**
+	 * Write the current min value
+	 * @param min value must be < max 
+	 */
+	public void setMin(Integer min) {
+		if (min==null)return;
+		if (min>=getMax())return;
+        setIntToRangeElement(MIN,min);
+	}
+
+	/**
+	 * Read the max value
+	 * @return The Integer or null
+	 */
+	public Integer getMax() {
+		return getIntFromRangeElement(MAX);
+	}
+
+	/**
+	 * Write the current max value
+	 * @param max value must be > min
+	 */
+	public void setMax(Integer max) {
+		if (max==null)return;
+		if (max<=getMin())return;
+        setIntToRangeElement(MAX,max);
+	}
+
+	/**
+	 * Register the ChangeHandler to become notified if the user changes the slider. 
+	 * The Handler is called when the user releases the mouse only at the end of the slide
+	 * operation.
+	 */
+	@Override
+	public HandlerRegistration addChangeHandler(ChangeHandler handler) {
+		return addDomHandler(handler, ChangeEvent.getType());
+	}
+	
 }

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

@@ -40,11 +40,12 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HasText;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextArea;
 import com.google.gwt.user.client.ui.Widget;
 
-public class MaterialTextArea extends Composite implements HasKeyPressHandlers,HasKeyDownHandlers,HasKeyUpHandlers,HasChangeHandlers {
+public class MaterialTextArea extends Composite implements HasText,HasKeyPressHandlers,HasKeyDownHandlers,HasKeyUpHandlers,HasChangeHandlers {
 
 	private static MaterialTextAreaUiBinder uiBinder = GWT
 			.create(MaterialTextAreaUiBinder.class);
@@ -96,7 +97,6 @@ public String getText() {
 	public void setText(String text) {
 		txtBox.setText(text);
 		customLabel.addStyleName("active");
-
 	}
 
 	@Override

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

@@ -34,11 +34,12 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HasText;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 
-public class MaterialTextBox extends Composite implements HasKeyUpHandlers{
+public class MaterialTextBox extends Composite implements HasText,HasKeyUpHandlers{
 
 	private static MaterialTextBoxUiBinder uiBinder = GWT.create(MaterialTextBoxUiBinder.class);
 

src/main/resources/gwt/material/design/client/ui/MaterialRange.ui.xml

@@ -26,7 +26,7 @@
 	<g:HTMLPanel>
 		<form action="#">
 		  <p class="range-field">
-		    <input type="range" id="test5" min="0" max="100" />
+		    <input type="range" min="0" max="100" />
 		  </p>
 		</form>
 	</g:HTMLPanel>