From 75e432ebef310c9adea97befbc38e90a8910278f Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Wed, 9 Dec 2015 12:57:24 -0600 Subject: [PATCH 1/9] Resolves #774 is-focused is not checking disabled on inputs --- Gruntfile.js | 8 ++++---- less/_form.less | 5 +++++ scripts/material.js | 42 ++++++++++++++++++++---------------------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 32ab0d05..7b0c3b02 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -500,10 +500,10 @@ module.exports = function (grunt) { files: ["index.html", "bootstrap-elements.html", "testcase.html"], tasks: ["htmllint", "bootlint"] }, - //src: { - // files: '<%= jshint.core.src %>', - // tasks: ['jshint:core', 'dist-js'] // add tests when working again - //}, + src: { + files: '<%= jshint.core.src %>', + tasks: ['jshint:core', 'dist-js'] // add tests when working again + }, test: { files: ["test/**/*.js"], tasks: ["jshint:test", "jasmine"] diff --git a/less/_form.less b/less/_form.less index 1aa7fe8c..76431012 100644 --- a/less/_form.less +++ b/less/_form.less @@ -8,6 +8,11 @@ &:focus { color: @mdb-label-color-toggle-focus; } + + // correct the above focus color for disabled items + fieldset[disabled] & { + color: @mdb-label-color; + } } } diff --git a/scripts/material.js b/scripts/material.js index 6dd2682c..5dc91ded 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -20,7 +20,21 @@ } function _addFormGroupFocus(element){ - $(element).closest(".form-group").addClass("is-focused"); + var $element = $(element); + if (!$element.prop('disabled')) { // this is showing as undefined on chrome but works fine on firefox?? + $element.closest(".form-group").addClass("is-focused"); + } + } + + function _toggleTypeFocus($input){ + $input.closest('label').hover(function() { + var $i = $(this).find('input'); + if (!$i.prop('disabled')) { // hack because the _addFormGroupFocus() wasn't identifying the property on chrome + _addFormGroupFocus($i); // need to find the input so we can check disablement + } + }, function() { + _removeFormGroupFocus($(this).find('input')); + }); } function _removeFormGroupFocus(element){ @@ -55,10 +69,12 @@ }, "checkbox": function(selector) { // Add fake-checkbox to material checkboxes - $((selector) ? selector : this.options.checkboxElements) + var $input = $((selector) ? selector : this.options.checkboxElements) .filter(":notmdproc") .data("mdproc", true) .after(""); + + _toggleTypeFocus($input); }, "togglebutton": function(selector) { // Add fake-checkbox to material checkboxes @@ -67,12 +83,7 @@ .data("mdproc", true) .after(""); - var $formGroup = $input.closest(".form-group"); // note that form-group may be grandparent in the case of an input-group - $formGroup.find('label').hover(function() { - _addFormGroupFocus(this); - }, function() { - _removeFormGroupFocus(this); - }); + _toggleTypeFocus($input); }, "radio": function(selector) { // Add fake-radio to material radios @@ -81,13 +92,7 @@ .data("mdproc", true) .after(""); - - var $formGroup = $input.closest(".form-group"); // note that form-group may be grandparent in the case of an input-group - $formGroup.find('label').hover(function() { - _addFormGroupFocus(this); - }, function() { - _removeFormGroupFocus(this); - }); + _toggleTypeFocus($input); }, "input": function(selector) { $((selector) ? selector : this.options.inputElements) @@ -151,13 +156,6 @@ "attachInputEventHandlers": function() { var validate = this.options.validate; - // checkboxes didn't appear to bubble to the document, so we'll bind these directly - $(".form-group .checkbox label").hover(function() { - _addFormGroupFocus(this); - }, function() { - _removeFormGroupFocus(this); - }); - $(document) .on("change", ".checkbox input[type=checkbox]", function() { $(this).blur(); }) .on("keydown paste", ".form-control", function(e) { From fdb8cf9c89db74b27a1d336a97f6ab780ddeee57 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Thu, 10 Dec 2015 08:13:50 -0600 Subject: [PATCH 2/9] Resolves #775 Snackbar transitions have invalid '0' values --- less/plugins/_plugin-snackbarjs.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/plugins/_plugin-snackbarjs.less b/less/plugins/_plugin-snackbarjs.less index 417284fa..ef0b3006 100644 --- a/less/plugins/_plugin-snackbarjs.less +++ b/less/plugins/_plugin-snackbarjs.less @@ -11,7 +11,7 @@ // Animation height: 0; - transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s, padding 0 linear 0.2s, height 0 linear 0.2s; + transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0s linear 0.2s, padding 0s linear 0.2s, height 0s linear 0.2s; transform: translateY(200%); } @@ -22,7 +22,7 @@ // Animation height: auto; - transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s, height 0 linear 0.2s; + transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0s linear 0.2s, height 0s linear 0.2s; transform: none; } From 59902cc1bdeda1672cddb4c7d4d1c88da5d72a4d Mon Sep 17 00:00:00 2001 From: Igors Krasjukovs Date: Sun, 13 Dec 2015 20:45:41 +0200 Subject: [PATCH 3/9] Update _core.less --- less/_core.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_core.less b/less/_core.less index d4bf8882..517053fd 100644 --- a/less/_core.less +++ b/less/_core.less @@ -29,7 +29,7 @@ h5, h6{ } a, a:hover, a:focus { - color: @brand-primary; + color: @link-color; & .material-icons { vertical-align: middle; From 14f3959e8351e1420763deb9dede530e126c933a Mon Sep 17 00:00:00 2001 From: Igors Krasjukovs Date: Sun, 13 Dec 2015 20:46:34 +0200 Subject: [PATCH 4/9] Update _core.scss --- sass/_core.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/_core.scss b/sass/_core.scss index 67f13b15..4099c302 100644 --- a/sass/_core.scss +++ b/sass/_core.scss @@ -31,7 +31,7 @@ h5, h6{ } a, a:hover, a:focus { - color: $brand-primary; + color: $link-color; & .material-icons { vertical-align: middle; From 6ec039b5dfe90f46b1d5e55cfcb8593d03c4496f Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Sun, 13 Dec 2015 19:28:39 -0600 Subject: [PATCH 5/9] Ignore invalid key codes for isChar --- scripts/material.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/material.js b/scripts/material.js index 5dc91ded..802a3b7b 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -14,7 +14,16 @@ if (typeof evt.which == "undefined") { return true; } else if (typeof evt.which == "number" && evt.which > 0) { - return !evt.ctrlKey && !evt.metaKey && !evt.altKey && evt.which != 8 && evt.which != 9; + return !evt.ctrlKey + && !evt.metaKey + && !evt.altKey + && evt.which != 8 // backspace + && evt.which != 9 // tab + && evt.which != 13 // enter + && evt.which != 16 // shift + && evt.which != 17 // ctrl + && evt.which != 20 // caps lock + && evt.which != 27; // escape } return false; } From f019b3f3d53cebe31a3cb69abb574166d197c669 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Sun, 13 Dec 2015 19:51:57 -0600 Subject: [PATCH 6/9] See #783 - validity should have no bearing on marking something as empty or not. Already fixed in v4. --- scripts/material.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/material.js b/scripts/material.js index dc9a09a5..7b8e7466 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -181,7 +181,7 @@ var $formGroup = $input.closest(".form-group"); var isValid = (typeof $input[0].checkValidity === "undefined" || $input[0].checkValidity()); - if ($input.val() === "" && isValid) { + if ($input.val() === "") { $formGroup.addClass("is-empty"); } else { From 7fda8a4b612d0a8647dd18a82e42ff255b8c9d8a Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 14 Dec 2015 08:38:23 -0600 Subject: [PATCH 7/9] dist --- dist/js/material.js | 2 +- dist/js/material.min.js | 2 +- dist/js/material.min.js.map | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/js/material.js b/dist/js/material.js index dc9a09a5..7b8e7466 100644 --- a/dist/js/material.js +++ b/dist/js/material.js @@ -181,7 +181,7 @@ var $formGroup = $input.closest(".form-group"); var isValid = (typeof $input[0].checkValidity === "undefined" || $input[0].checkValidity()); - if ($input.val() === "" && isValid) { + if ($input.val() === "") { $formGroup.addClass("is-empty"); } else { diff --git a/dist/js/material.min.js b/dist/js/material.min.js index 480d0a0c..35b04a9c 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&&13!=a.which&&16!=a.which&&17!=a.which&&20!=a.which&&27!=a.which:!1}function c(b){var c=a(b);c.prop("disabled")||c.closest(".form-group").addClass("is-focused")}function d(b){b.closest("label").hover(function(){var b=a(this).find("input");b.prop("disabled")||c(b)},function(){e(a(this).find("input"))})}function e(b){a(b).closest(".form-group").removeClass("is-focused")}a.expr[":"].notmdproc=function(b){return a(b).data("mdproc")?!1:!0},a.material={options:{validate:!0,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){var c=a(b?b:this.options.checkboxElements).filter(":notmdproc").data("mdproc",!0).after("");d(c)},togglebutton:function(b){var c=a(b?b:this.options.togglebuttonElements).filter(":notmdproc").data("mdproc",!0).after("");d(c)},radio:function(b){var c=a(b?b:this.options.radioElements).filter(":notmdproc").data("mdproc",!0).after("");d(c)},input:function(b){a(b?b:this.options.inputElements).filter(":notmdproc").data("mdproc",!0).each(function(){var b=a(this),c=b.closest(".form-group");0===c.length&&(b.wrap("
"),c=b.closest(".form-group")),b.attr("data-hint")&&(b.after("

"+b.attr("data-hint")+"

"),b.removeAttr("data-hint"));var d={"input-lg":"form-group-lg","input-sm":"form-group-sm"};if(a.each(d,function(a,d){b.hasClass(a)&&(b.removeClass(a),c.addClass(d))}),b.hasClass("floating-label")){var e=b.attr("placeholder");b.attr("placeholder",null).removeClass("floating-label");var f=b.attr("id"),g="";f&&(g="for='"+f+"'"),c.addClass("label-floating"),b.after("")}(null===b.val()||"undefined"==b.val()||""===b.val())&&c.addClass("is-empty"),c.append(""),c.find("input[type=file]").length>0&&c.addClass("is-fileinput")})},attachInputEventHandlers:function(){var d=this.options.validate;a(document).on("change",".checkbox input[type=checkbox]",function(){a(this).blur()}).on("keydown paste",".form-control",function(c){b(c)&&a(this).closest(".form-group").removeClass("is-empty")}).on("keyup change",".form-control",function(){var b=a(this),c=b.closest(".form-group"),e="undefined"==typeof b[0].checkValidity||b[0].checkValidity();""===b.val()&&e?c.addClass("is-empty"):c.removeClass("is-empty"),d&&(e?c.removeClass("has-error"):c.addClass("has-error"))}).on("focus",".form-control, .form-group.is-fileinput",function(){c(this)}).on("blur",".form-control, .form-group.is-fileinput",function(){e(this)}).on("change",".form-group input",function(){var b=a(this);if("file"!=b.attr("type")){var c=b.closest(".form-group"),d=b.val();d?c.removeClass("is-empty"):c.addClass("is-empty")}}).on("change",".form-group.is-fileinput input[type='file']",function(){var b=a(this),c=b.closest(".form-group"),d="";a.each(this.files,function(a,b){d+=b.name+", "}),d=d.substring(0,d.length-2),d?c.removeClass("is-empty"):c.addClass("is-empty"),c.find("input.form-control[readonly]").val(d)})},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",".form-group input",function(){clearInterval(b)})},init:function(b){this.options=a.extend({},this.options,b);var c=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&&c.arrive(this.options.withRipples,function(){a.material.ripples(a(this))}),this.options.input&&c.arrive(this.options.inputElements,function(){a.material.input(a(this))}),this.options.checkbox&&c.arrive(this.options.checkboxElements,function(){a.material.checkbox(a(this))}),this.options.radio&&c.arrive(this.options.radioElements,function(){a.material.radio(a(this))}),this.options.togglebutton&&c.arrive(this.options.togglebuttonElements,function(){a.material.togglebutton(a(this))}))}}}(jQuery); +!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&&13!=a.which&&16!=a.which&&17!=a.which&&20!=a.which&&27!=a.which:!1}function c(b){var c=a(b);c.prop("disabled")||c.closest(".form-group").addClass("is-focused")}function d(b){b.closest("label").hover(function(){var b=a(this).find("input");b.prop("disabled")||c(b)},function(){e(a(this).find("input"))})}function e(b){a(b).closest(".form-group").removeClass("is-focused")}a.expr[":"].notmdproc=function(b){return a(b).data("mdproc")?!1:!0},a.material={options:{validate:!0,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){var c=a(b?b:this.options.checkboxElements).filter(":notmdproc").data("mdproc",!0).after("");d(c)},togglebutton:function(b){var c=a(b?b:this.options.togglebuttonElements).filter(":notmdproc").data("mdproc",!0).after("");d(c)},radio:function(b){var c=a(b?b:this.options.radioElements).filter(":notmdproc").data("mdproc",!0).after("");d(c)},input:function(b){a(b?b:this.options.inputElements).filter(":notmdproc").data("mdproc",!0).each(function(){var b=a(this),c=b.closest(".form-group");0===c.length&&(b.wrap("
"),c=b.closest(".form-group")),b.attr("data-hint")&&(b.after("

"+b.attr("data-hint")+"

"),b.removeAttr("data-hint"));var d={"input-lg":"form-group-lg","input-sm":"form-group-sm"};if(a.each(d,function(a,d){b.hasClass(a)&&(b.removeClass(a),c.addClass(d))}),b.hasClass("floating-label")){var e=b.attr("placeholder");b.attr("placeholder",null).removeClass("floating-label");var f=b.attr("id"),g="";f&&(g="for='"+f+"'"),c.addClass("label-floating"),b.after("")}(null===b.val()||"undefined"==b.val()||""===b.val())&&c.addClass("is-empty"),c.append(""),c.find("input[type=file]").length>0&&c.addClass("is-fileinput")})},attachInputEventHandlers:function(){var d=this.options.validate;a(document).on("change",".checkbox input[type=checkbox]",function(){a(this).blur()}).on("keydown paste",".form-control",function(c){b(c)&&a(this).closest(".form-group").removeClass("is-empty")}).on("keyup change",".form-control",function(){var b=a(this),c=b.closest(".form-group"),e="undefined"==typeof b[0].checkValidity||b[0].checkValidity();""===b.val()?c.addClass("is-empty"):c.removeClass("is-empty"),d&&(e?c.removeClass("has-error"):c.addClass("has-error"))}).on("focus",".form-control, .form-group.is-fileinput",function(){c(this)}).on("blur",".form-control, .form-group.is-fileinput",function(){e(this)}).on("change",".form-group input",function(){var b=a(this);if("file"!=b.attr("type")){var c=b.closest(".form-group"),d=b.val();d?c.removeClass("is-empty"):c.addClass("is-empty")}}).on("change",".form-group.is-fileinput input[type='file']",function(){var b=a(this),c=b.closest(".form-group"),d="";a.each(this.files,function(a,b){d+=b.name+", "}),d=d.substring(0,d.length-2),d?c.removeClass("is-empty"):c.addClass("is-empty"),c.find("input.form-control[readonly]").val(d)})},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",".form-group input",function(){clearInterval(b)})},init:function(b){this.options=a.extend({},this.options,b);var c=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&&c.arrive(this.options.withRipples,function(){a.material.ripples(a(this))}),this.options.input&&c.arrive(this.options.inputElements,function(){a.material.input(a(this))}),this.options.checkbox&&c.arrive(this.options.checkboxElements,function(){a.material.checkbox(a(this))}),this.options.radio&&c.arrive(this.options.radioElements,function(){a.material.radio(a(this))}),this.options.togglebutton&&c.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 f3ad97c8..c5f6fb08 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","_addFormGroupFocus","element","$element","prop","closest","addClass","_toggleTypeFocus","$input","hover","$i","this","find","_removeFormGroupFocus","removeClass","expr","notmdproc","obj","data","material","options","validate","input","ripples","checkbox","togglebutton","radio","arrive","autofill","withRipples","join","inputElements","checkboxElements","togglebuttonElements","radioElements","selector","filter","after","each","$formGroup","length","wrap","attr","removeAttr","legacySizes","input-lg","input-sm","legacySize","standardSize","hasClass","placeholder","id","forAttribute","val","append","attachInputEventHandlers","document","on","blur","e","isValid","checkValidity","value","files","i","file","name","substring","loading","setInterval","$this","trigger","setTimeout","clearInterval","attachAutofillEventHandlers","focused","$inputs","parents","not","init","extend","$document","fn","jQuery"],"mappings":"CAEA,SAAWA,GAUT,QAASC,GAAQC,GACf,MAAwB,mBAAbA,GAAIC,OACN,EACsB,gBAAbD,GAAIC,OAAqBD,EAAIC,MAAQ,GAElDD,EAAIE,UACDF,EAAIG,UACJH,EAAII,QACQ,GAAbJ,EAAIC,OACS,GAAbD,EAAIC,OACS,IAAbD,EAAIC,OACS,IAAbD,EAAIC,OACS,IAAbD,EAAIC,OACS,IAAbD,EAAIC,OACS,IAAbD,EAAIC,OAGJ,EAGT,QAASI,GAAmBC,GAC1B,GAAIC,GAAWT,EAAEQ,EACZC,GAASC,KAAK,aACjBD,EAASE,QAAQ,eAAeC,SAAS,cAI7C,QAASC,GAAiBC,GACxBA,EAAOH,QAAQ,SAASI,MAAM,WAC5B,GAAIC,GAAKhB,EAAEiB,MAAMC,KAAK,QACjBF,GAAGN,KAAK,aACXH,EAAmBS,IAEpB,WACDG,EAAsBnB,EAAEiB,MAAMC,KAAK,YAIvC,QAASC,GAAsBX,GAC7BR,EAAEQ,GAASG,QAAQ,eAAeS,YAAY,cA/ChDpB,EAAEqB,KAAK,KAAKC,UAAY,SAAUC,GAChC,MAAIvB,GAAEuB,GAAKC,KAAK,WACP,GAEA,GA8CXxB,EAAEyB,UACAC,SAEEC,UAAY,EACZC,OAAS,EACTC,SAAW,EACXC,UAAY,EACZC,cAAgB,EAChBC,OAAS,EACTC,QAAU,EACVC,UAAY,EAEZC,aACE,sBACA,cACA,gCACA,mBACA,kCACA,cACA,oEACAC,KAAK,KACPC,cAAiB,iEACjBC,iBAAoB,2CACpBC,qBAAwB,+CACxBC,cAAiB,sCAEnBV,SAAY,SAAUW,GAEpB,GAAI3B,GAASd,EAAE,EAAayC,EAAWxB,KAAKS,QAAQY,kBACjDI,OAAO,cACPlB,KAAK,UAAU,GACfmB,MAAM,qEAET9B,GAAiBC,IAEnBiB,aAAgB,SAAUU,GAExB,GAAI3B,GAASd,EAAE,EAAayC,EAAWxB,KAAKS,QAAQa,sBACjDG,OAAO,cACPlB,KAAK,UAAU,GACfmB,MAAM,+BAET9B,GAAiBC,IAEnBkB,MAAS,SAAUS,GAEjB,GAAI3B,GAASd,EAAE,EAAayC,EAAWxB,KAAKS,QAAQc,eACjDE,OAAO,cACPlB,KAAK,UAAU,GACfmB,MAAM,0DAET9B,GAAiBC,IAEnBc,MAAS,SAAUa,GACjBzC,EAAE,EAAayC,EAAWxB,KAAKS,QAAQW,eACpCK,OAAO,cACPlB,KAAK,UAAU,GACfoB,KAAK,WACJ,GAAI9B,GAASd,EAAEiB,MAGX4B,EAAa/B,EAAOH,QAAQ,cACN,KAAtBkC,EAAWC,SACbhC,EAAOiC,KAAK,kCACZF,EAAa/B,EAAOH,QAAQ,gBAI1BG,EAAOkC,KAAK,eACdlC,EAAO6B,MAAM,yBAA2B7B,EAAOkC,KAAK,aAAe,QACnElC,EAAOmC,WAAW,aAIpB,IAAIC,IACFC,WAAY,gBACZC,WAAY,gBAUd,IARApD,EAAE4C,KAAKM,EAAa,SAAUG,EAAYC,GACpCxC,EAAOyC,SAASF,KAClBvC,EAAOM,YAAYiC,GACnBR,EAAWjC,SAAS0C,MAKpBxC,EAAOyC,SAAS,kBAAmB,CACrC,GAAIC,GAAc1C,EAAOkC,KAAK,cAC9BlC,GAAOkC,KAAK,cAAe,MAAM5B,YAAY,iBAC7C,IAAIqC,GAAK3C,EAAOkC,KAAK,MACjBU,EAAe,EACfD,KACFC,EAAe,QAAUD,EAAK,KAEhCZ,EAAWjC,SAAS,kBACpBE,EAAO6B,MAAM,UAAYe,EAAe,yBAA2BF,EAAc,aAI9D,OAAjB1C,EAAO6C,OAAkC,aAAhB7C,EAAO6C,OAAyC,KAAjB7C,EAAO6C,QACjEd,EAAWjC,SAAS,YAItBiC,EAAWe,OAAO,wCAGdf,EAAW3B,KAAK,oBAAoB4B,OAAS,GAC/CD,EAAWjC,SAAS,mBAI5BiD,yBAA4B,WAC1B,GAAIlC,GAAWV,KAAKS,QAAQC,QAE5B3B,GAAE8D,UACCC,GAAG,SAAU,iCAAkC,WAC9C/D,EAAEiB,MAAM+C,SAETD,GAAG,gBAAiB,gBAAiB,SAAUE,GAC1ChE,EAAQgE,IACVjE,EAAEiB,MAAMN,QAAQ,eAAeS,YAAY,cAG9C2C,GAAG,eAAgB,gBAAiB,WACnC,GAAIjD,GAASd,EAAEiB,MACX4B,EAAa/B,EAAOH,QAAQ,eAC5BuD,EAA8C,mBAA5BpD,GAAO,GAAGqD,eAAiCrD,EAAO,GAAGqD,eAEtD,MAAjBrD,EAAO6C,OAAgBO,EACzBrB,EAAWjC,SAAS,YAGpBiC,EAAWzB,YAAY,YASrBO,IACEuC,EACFrB,EAAWzB,YAAY,aAGvByB,EAAWjC,SAAS,gBAIzBmD,GAAG,QAAS,0CAA2C,WACtDxD,EAAmBU,QAEpB8C,GAAG,OAAQ,0CAA2C,WACrD5C,EAAsBF,QAIvB8C,GAAG,SAAU,oBAAqB,WACjC,GAAIjD,GAASd,EAAEiB,KACf,IAA2B,QAAvBH,EAAOkC,KAAK,QAAhB,CAIA,GAAIH,GAAa/B,EAAOH,QAAQ,eAC5ByD,EAAQtD,EAAO6C,KACfS,GACFvB,EAAWzB,YAAY,YAEvByB,EAAWjC,SAAS,eAIvBmD,GAAG,SAAU,8CAA+C,WAC3D,GAAIjD,GAASd,EAAEiB,MACX4B,EAAa/B,EAAOH,QAAQ,eAC5ByD,EAAQ,EACZpE,GAAE4C,KAAK3B,KAAKoD,MAAO,SAAUC,EAAGC,GAC9BH,GAASG,EAAKC,KAAO,OAEvBJ,EAAQA,EAAMK,UAAU,EAAGL,EAAMtB,OAAS,GACtCsB,EACFvB,EAAWzB,YAAY,YAEvByB,EAAWjC,SAAS,YAEtBiC,EAAW3B,KAAK,gCAAgCyC,IAAIS,MAG1DvC,QAAW,SAAUY,GACnBzC,EAAE,EAAayC,EAAWxB,KAAKS,QAAQS,aAAaN,WAEtDK,SAAY,WAEV,GAAIwC,GAAUC,YAAY,WACxB3E,EAAE,yBAAyB4C,KAAK,WAC9B,GAAIgC,GAAQ5E,EAAEiB,KACV2D,GAAMjB,OAASiB,EAAMjB,QAAUiB,EAAM5B,KAAK,UAC5C4B,EAAMC,QAAQ,aAGjB,IAGHC,YAAW,WACTC,cAAcL,IACb,MAELM,4BAA+B,WAE7B,GAAIC,EACJjF,GAAE8D,UACCC,GAAG,QAAS,QAAS,WACpB,GAAImB,GAAUlF,EAAEiB,MAAMkE,QAAQ,QAAQjE,KAAK,SAASkE,IAAI,cACxDH,GAAUN,YAAY,WACpBO,EAAQtC,KAAK,WACX,GAAIgC,GAAQ5E,EAAEiB,KACV2D,GAAMjB,QAAUiB,EAAM5B,KAAK,UAC7B4B,EAAMC,QAAQ,aAGjB,OAEJd,GAAG,OAAQ,oBAAqB,WAC/BgB,cAAcE,MAGpBI,KAAQ,SAAU3D,GAChBT,KAAKS,QAAU1B,EAAEsF,UAAWrE,KAAKS,QAASA,EAC1C,IAAI6D,GAAYvF,EAAE8D,SAEd9D,GAAEwF,GAAG3D,SAAWZ,KAAKS,QAAQG,SAC/BZ,KAAKY,UAEHZ,KAAKS,QAAQE,QACfX,KAAKW,QACLX,KAAK4C,4BAEH5C,KAAKS,QAAQI,UACfb,KAAKa,WAEHb,KAAKS,QAAQK,cACfd,KAAKc,eAEHd,KAAKS,QAAQM,OACff,KAAKe,QAEHf,KAAKS,QAAQQ,WACfjB,KAAKiB,WACLjB,KAAK+D,+BAGHlB,SAAS7B,QAAUhB,KAAKS,QAAQO,SAC9BjC,EAAEwF,GAAG3D,SAAWZ,KAAKS,QAAQG,SAC/B0D,EAAUtD,OAAOhB,KAAKS,QAAQS,YAAa,WACzCnC,EAAEyB,SAASI,QAAQ7B,EAAEiB,SAGrBA,KAAKS,QAAQE,OACf2D,EAAUtD,OAAOhB,KAAKS,QAAQW,cAAe,WAC3CrC,EAAEyB,SAASG,MAAM5B,EAAEiB,SAGnBA,KAAKS,QAAQI,UACfyD,EAAUtD,OAAOhB,KAAKS,QAAQY,iBAAkB,WAC9CtC,EAAEyB,SAASK,SAAS9B,EAAEiB,SAGtBA,KAAKS,QAAQM,OACfuD,EAAUtD,OAAOhB,KAAKS,QAAQc,cAAe,WAC3CxC,EAAEyB,SAASO,MAAMhC,EAAEiB,SAGnBA,KAAKS,QAAQK,cACfwD,EAAUtD,OAAOhB,KAAKS,QAAQa,qBAAsB,WAClDvC,EAAEyB,SAASM,aAAa/B,EAAEiB,aAQnCwE","file":"material.min.js"} \ No newline at end of file +{"version":3,"sources":["material.js"],"names":["$","_isChar","evt","which","ctrlKey","metaKey","altKey","_addFormGroupFocus","element","$element","prop","closest","addClass","_toggleTypeFocus","$input","hover","$i","this","find","_removeFormGroupFocus","removeClass","expr","notmdproc","obj","data","material","options","validate","input","ripples","checkbox","togglebutton","radio","arrive","autofill","withRipples","join","inputElements","checkboxElements","togglebuttonElements","radioElements","selector","filter","after","each","$formGroup","length","wrap","attr","removeAttr","legacySizes","input-lg","input-sm","legacySize","standardSize","hasClass","placeholder","id","forAttribute","val","append","attachInputEventHandlers","document","on","blur","e","isValid","checkValidity","value","files","i","file","name","substring","loading","setInterval","$this","trigger","setTimeout","clearInterval","attachAutofillEventHandlers","focused","$inputs","parents","not","init","extend","$document","fn","jQuery"],"mappings":"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","file":"material.min.js"} \ No newline at end of file From 60c51e2456c1ab10d53b37e881f4b2e81b973446 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 14 Dec 2015 08:52:40 -0600 Subject: [PATCH 8/9] Added notes on Bower, resolves #780 --- README.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d610ae07..3686ec85 100644 --- a/README.md +++ b/README.md @@ -42,16 +42,24 @@ Add the necessary links to your `` element for fonts and stylsheets: ``` -## Support +### Bower -If you like this project you may support it by donating via Gittip, starring this repository or reporting issues. All issues filed should be reduced to a [CodePen](http://codepen.io/rosskevin/pen/VvRgrN) test case where possible. +Many use bower including compiling source for this project. Here are a couple of things to know: + + 1. When using SASS, `@import` directives cannot be interpolated. Given the variety of configurations, the typical `bower_components` directory is occasionally in a different location. Given the options, a `loadPath` was [added to the SASS compiler](https://github.com/FezVrasta/bootstrap-material-design/pull/762/files) + so that bootstrap files could be loaded without specifying the path to the `bower_components` directory. You may similarly need to add a load path to your compiler. It is still debatable if this is for the greater good, but seems like the only + way to accomodate multiple configurations. + 2. This project will install both `bootstrap` and `bootstrap-sass` in `bower_components`. Each is used for the LESS and SASS version compilation respectively. If you are only using one, feel free to [ignore the other bower dependency](http://stackoverflow.com/a/27791606/2363935). + +## Support and Contributions + +All issues filed should be reduced to a [CodePen](http://codepen.io/rosskevin/pen/VvRgrN) test case where possible. Please see the [CONTRIBUTING.md](CONTRIBUTING.md) file. + +If you like this project you may support it by donating via Gittip, starring this repository or reporting issues. [![gittip](demo/imgs/gittip-button.jpg)](https://www.gratipay.com/FezVrasta/) [![issues](demo/imgs/issues-button.jpg)](https://github.com/FezVrasta/bootstrap-material-design/issues) -## Contribute - -Please see the [CONTRIBUTING.md](CONTRIBUTING.md) file. ## Development From cbee53547c1de1c2382d64bd25b40d8fd3731c88 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 14 Dec 2015 08:54:37 -0600 Subject: [PATCH 9/9] 0.5.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75681cd1..7b05d0f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-material-design", - "version": "0.5.5", + "version": "0.5.6", "description": "Material Design for Bootstrap 3", "main": "scripts/index.js", "scripts": {