Merge pull request #791 from jepsar/master

Added mask to inputText

build.properties

@@ -24,7 +24,7 @@
 # rather than c:\dir1\dir2 to refer to paths -- Java thinks a single backslash
 # is an escape character followed by a control character.
 #########################################################################################################
-VERSION=1.1.1
+VERSION=1.1.2-SNAPSHOT
 # RELEASE-STATUS - SNAPSHOT , beta1, rc1 ...
 # or don't remove the property but just leave it blank for a Final RELEASE :
 # RELEASE-STATUS=

gradleResources/build.gradle

@@ -74,6 +74,7 @@
    	from 'staticResources/js/fullcalendar.min.js'
    	from 'staticResources/js/fullcalendar-lang-all.js'
    	from 'staticResources/js/jquery.blockUI.js'
+   	from 'staticResources/js/jquery.inputmask.bundle.min.js'
    	from 'staticResources/js/jquery.scrollUp.min.js'
    	from 'staticResources/js/jquery.minicolors.min.js'
    	from 'staticResources/js/moment.min.js'

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.bootsfaces</groupId>
 	<artifactId>bootsfaces</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<name>BootsFaces</name>
 	<description>TheCoder4EU</description>
 	<url>http://www.bootsfaces.net</url>
@@ -74,7 +74,7 @@
 
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
+				<!--This plugin's configuration is used to store Eclipse m2e settings
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>

src/main/java/net/bootsfaces/C.java

@@ -28,7 +28,7 @@ public final class C {
     /**
      * BootsFaces Library Constants
      */
-     public static final String BSFVERSION="1.1.1";
+     public static final String BSFVERSION="1.1.2-SNAPSHOT";
      public static final String BSFRELEASE_STATUS=""; //SNAPSHOT or empty String (for a final RELEASE)
      public static final String BSFCOMPONENT= "net.bootsfaces.component";
      public static final String BSFLAYOUT   = "net.bootsfaces.layout";

src/main/java/net/bootsfaces/component/inputText/InputText.java

@@ -21,10 +21,8 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
-
 import net.bootsfaces.C;
 import net.bootsfaces.beans.ELTools;
 import net.bootsfaces.component.ajax.IAJAXComponent;
@@ -42,6 +40,10 @@
 @FacesComponent(InputText.COMPONENT_TYPE)
 public class InputText extends InputTextCore implements IHasTooltip, IAJAXComponent, IResponsive, IResponsiveLabel {
 
+  protected enum PropertyKeys {
+		mask
+  }
+
 	private String renderLabel = null;
 
 	/**
@@ -154,4 +156,26 @@ public void setTypeaheadValues(Object _typeaheadValues) {
 		setTypeahead(true);
 		super.setTypeaheadValues(_typeaheadValues);
 	}
+
+  /**
+   * Returns input mask.
+   * 
+   * @return Input mask.
+   */
+	public String getMask() {
+		return (String) getStateHelper().eval(PropertyKeys.mask);
+	}
+
+  /**
+   * Sets input mask and triggers JavaScript to be loaded.
+   * 
+   * @param mask Input mask to set. 
+   */
+	public void setMask(String mask) {
+		if (mask != null && !mask.isEmpty()) {
+			AddResourcesListener.addResourceToHeadButAfterJQuery(C.BSF_LIBRARY, "js/jquery.inputmask.bundle.min.js");
+		}
+    getStateHelper().put(PropertyKeys.mask, mask);
+	}
+
 }

src/main/java/net/bootsfaces/component/inputText/InputTextRenderer.java

@@ -20,13 +20,11 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Logger;
-
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.FacesRenderer;
-
 import net.bootsfaces.C;
 import net.bootsfaces.component.ajax.AJAXRenderer;
 import net.bootsfaces.component.inputSecret.InputSecret;
@@ -285,7 +283,34 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
 			}
 			rw.endElement("script");
 		}
+    encodeMask(context, inputText, fieldId, rw);
 	}
+
+  /**
+   * Add script to enable the input mask.
+   * See https://github.com/RobinHerbots/Inputmask.
+   * 
+   * @param context
+   * @param inputText
+   * @param fieldId
+   * @param rw
+   * 
+   * @throws IOException
+   */
+  protected void encodeMask(FacesContext context,
+                            InputText inputText,
+                            String fieldId,
+                            ResponseWriter rw) throws IOException {
+    if (inputText.getMask() != null && !inputText.getMask().isEmpty()) {
+      rw.startElement("script", inputText);
+      rw.writeText("Inputmask(\"", null);
+      rw.writeText(inputText.getMask().replace("\"", "\\\""), null);
+      rw.writeText("\").mask(document.getElementById(\"", null);
+      rw.writeText(fieldId, null);
+      rw.writeText("\"));", null);
+      rw.endElement("script");
+    }
+  }
 
 	private String addOption(String options, String newOption) {
 		if (options.length() > 0) {