" + $this.attr("data-hint") + "
"); } // Set as empty if is empty (damn I must improve this...) @@ -101,9 +103,9 @@ } // Support for file input - if ($this.parent().next().is("[type=file]")) { - $this.parent().addClass("fileinput"); - var $input = $this.parent().next().detach(); + if (formGroup.next().is("[type=file]")) { + formGroup.addClass("fileinput"); + var $input = formGroup.next().detach(); $this.after($input); } }); diff --git a/dist/js/material.min.js b/dist/js/material.min.js index 1c7be898..25e0a99a 100644 --- a/dist/js/material.min.js +++ b/dist/js/material.min.js @@ -1,2 +1,2 @@ -!function(a){function b(a){return"undefined"==typeof a.which?!0:"number"==typeof a.which&&a.which>0?!a.ctrlKey&&!a.metaKey&&!a.altKey&&8!=a.which&&9!=a.which:!1}a.expr[":"].notmdproc=function(b){return a(b).data("mdproc")?!1:!0},a.material={options:{input:!0,ripples:!0,checkbox:!0,togglebutton:!0,radio:!0,arrive:!0,autofill:!1,withRipples:[".btn:not(.btn-link)",".card-image",".navbar a:not(.withoutripple)",".dropdown-menu a",".nav-tabs a:not(.withoutripple)",".withripple",".pagination li:not(.active):not(.disabled) a:not(.withoutripple)"].join(","),inputElements:"input.form-control, textarea.form-control, select.form-control",checkboxElements:".checkbox > label > input[type=checkbox]",togglebuttonElements:".togglebutton > label > input[type=checkbox]",radioElements:".radio > label > input[type=radio]"},checkbox:function(b){a(b?b:this.options.checkboxElements).filter(":notmdproc").data("mdproc",!0).after("")},togglebutton:function(b){a(b?b:this.options.togglebuttonElements).filter(":notmdproc").data("mdproc",!0).after("")},radio:function(b){a(b?b:this.options.radioElements).filter(":notmdproc").data("mdproc",!0).after("")},input:function(b){a(b?b:this.options.inputElements).filter(":notmdproc").data("mdproc",!0).each(function(){var b=a(this),c=b.parent(".form-group");if(0===c.length&&console.error("Expected form-group for input",b),b.attr("data-hint")||b.hasClass("floating-label")){if(b.after(""),b.hasClass("floating-label")){var d=b.attr("placeholder");b.attr("placeholder",null).removeClass("floating-label"),b.after(""+b.attr("data-hint")+"
"),(null===b.val()||"undefined"==b.val()||""===b.val())&&b.addClass("empty"),c.next().is("[type=file]")){c.addClass("fileinput");var e=c.next().detach();b.after(e)}})},attachInputEventHandlers:function(){a(document).on("change",".checkbox input[type=checkbox]",function(){a(this).blur()}).on("keydown paste",".form-control",function(c){b(c)&&a(this).removeClass("empty")}).on("keyup change",".form-control",function(){var b=a(this);""!==b.val()||"undefined"!=typeof b[0].checkValidity&&!b[0].checkValidity()?b.removeClass("empty"):b.addClass("empty")}).on("focus",".form-group.fileinput",function(){a(this).find("input").addClass("focus")}).on("blur",".form-group.fileinput",function(){a(this).find("input").removeClass("focus")}).on("change",".form-group.fileinput [type=file]",function(){var b=a(this),c="";a.each(this.files,function(a,b){c+=b.name+", "}),c=c.substring(0,c.length-2),c?b.prev().removeClass("empty"):b.prev().addClass("empty"),b.prev().val(c)})},ripples:function(b){a(b?b:this.options.withRipples).ripples()},autofill:function(){var b=setInterval(function(){a("input[type!=checkbox]").each(function(){var b=a(this);b.val()&&b.val()!==b.attr("value")&&b.trigger("change")})},100);setTimeout(function(){clearInterval(b)},1e4)},attachAutofillEventHandlers:function(){var b;a(document).on("focus","input",function(){var c=a(this).parents("form").find("input").not("[type=file]");b=setInterval(function(){c.each(function(){var b=a(this);b.val()!==b.attr("value")&&b.trigger("change")})},100)}).on("blur","input",function(){clearInterval(b)})},init:function(){var b=a(document);a.fn.ripples&&this.options.ripples&&this.ripples(),this.options.input&&(this.input(),this.attachInputEventHandlers()),this.options.checkbox&&this.checkbox(),this.options.togglebutton&&this.togglebutton(),this.options.radio&&this.radio(),this.options.autofill&&(this.autofill(),this.attachAutofillEventHandlers()),document.arrive&&this.options.arrive&&(a.fn.ripples&&this.options.ripples&&b.arrive(this.options.withRipples,function(){a.material.ripples(a(this))}),this.options.input&&b.arrive(this.options.inputElements,function(){a.material.input(a(this))}),this.options.checkbox&&b.arrive(this.options.checkboxElements,function(){a.material.checkbox(a(this))}),this.options.radio&&b.arrive(this.options.radioElements,function(){a.material.radio(a(this))}),this.options.togglebutton&&b.arrive(this.options.togglebuttonElements,function(){a.material.togglebutton(a(this))}))}}}(jQuery); //# sourceMappingURL=material.min.js.map \ No newline at end of file diff --git a/dist/js/material.min.js.map b/dist/js/material.min.js.map index 1fab3a87..590eb424 100644 --- a/dist/js/material.min.js.map +++ b/dist/js/material.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["material.js"],"names":["$","_isChar","evt","which","ctrlKey","metaKey","altKey","expr","notmdproc","obj","data","material","options","input","ripples","checkbox","togglebutton","radio","arrive","autofill","withRipples","join","inputElements","checkboxElements","togglebuttonElements","radioElements","selector","this","filter","after","each","$this","formGroup","parent","length","console","error","attr","hasClass","placeholder","removeClass","val","addClass","next","is","$input","detach","attachInputEventHandlers","document","on","blur","e","checkValidity","find","value","files","i","file","name","substring","prev","loading","setInterval","trigger","setTimeout","clearInterval","attachAutofillEventHandlers","focused","$inputs","parents","not","init","$document","fn","jQuery"],"mappings":"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","file":"material.min.js"} \ No newline at end of file +{"version":3,"sources":["material.js"],"names":["$","_isChar","evt","which","ctrlKey","metaKey","altKey","expr","notmdproc","obj","data","material","options","input","ripples","checkbox","togglebutton","radio","arrive","autofill","withRipples","join","inputElements","checkboxElements","togglebuttonElements","radioElements","selector","this","filter","after","each","$this","formGroup","parent","length","console","error","hasClass","placeholder","attr","removeClass","val","addClass","next","is","$input","detach","attachInputEventHandlers","document","on","blur","e","checkValidity","find","value","files","i","file","name","substring","prev","loading","setInterval","trigger","setTimeout","clearInterval","attachAutofillEventHandlers","focused","$inputs","parents","not","init","$document","fn","jQuery"],"mappings":"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","file":"material.min.js"} \ No newline at end of file diff --git a/scripts/material.js b/scripts/material.js index e7455fe7..8795c30b 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -78,6 +78,7 @@ console.error("Expected form-group for input", $this); } + //if (!$this.attr("data-hint") && !$this.hasClass("floating-label")) { // return; //} @@ -91,7 +92,6 @@ $this.after("" + $this.attr("data-hint") + "
"); @@ -103,9 +103,9 @@ } // Support for file input - if ($this.parent().next().is("[type=file]")) { - $this.parent().addClass("fileinput"); - var $input = $this.parent().next().detach(); + if (formGroup.next().is("[type=file]")) { + formGroup.addClass("fileinput"); + var $input = formGroup.next().detach(); $this.after($input); } });