diff --git a/build/jquery.checkboxes.min.js b/build/jquery.checkboxes.min.js index 956b6c3..b6ac2c3 100644 --- a/build/jquery.checkboxes.min.js +++ b/build/jquery.checkboxes.min.js @@ -1,2 +1,2 @@ -/*! checkboxes.js 1.0.3 | Rubens Mariuzzo (http://mariuzzo.com/) | 2014-02-20 | MIT */ -!function(a){var b=function(a){this.$context=a};b.prototype.check=function(){this.$context.find(":checkbox").filter(":not(:disabled)").prop("checked",!0)},b.prototype.uncheck=function(){this.$context.find(":checkbox").filter(":not(:disabled)").prop("checked",!1)},b.prototype.toggle=function(){this.$context.find(":checkbox").filter(":not(:disabled)").each(function(){var b=a(this);b.prop("checked",!b.is(":checked"))})},b.prototype.max=function(a){if(0===a)this.$context.off("click.checkboxes");else if(a>0){var b=this;this.$context.on("click.checkboxes.max",":checkbox",function(){b.$context.find(":checked").length===a?b.$context.find(":checkbox:not(:checked)").prop("disabled",!0):b.$context.find(":checkbox:not(:checked)").prop("disabled",!1)})}},b.prototype.range=function(b){if(b){var c=this;this.$context.on("click.checkboxes.range",":checkbox",function(b){var d=a(b.target);if(b.shiftKey&&c.$last){var e=c.$context.find(":checkbox"),f=e.index(c.$last),g=e.index(d),h=Math.min(f,g),i=Math.max(f,g)+1;e.slice(h,i).filter(":not(:disabled)").prop("checked",d.prop("checked"))}c.$last=d})}else this.$context.off("click.checkboxes.range")};var c=a.fn.checkboxes;a.fn.checkboxes=function(c){var d=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=a(this),f=e.data("checkboxes");f||e.data("checkboxes",f=new b(e,"object"==typeof c&&c)),"string"==typeof c&&f[c]&&f[c].apply(f,d)})},a.fn.checkboxes.Constructor=b,a.fn.checkboxes.noConflict=function(){return a.fn.checkboxes=c,this},a(document).on("click.checkboxes.data-api","[data-toggle^=checkboxes]",function(b){var c=a(b.target),d=c.attr("href"),e=a(c.data("context")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=c.data("action");e&&f&&(b.preventDefault(),e.checkboxes(f))}),a(document).on("ready.checkboxes.data-api",function(){a("[data-toggle^=checkboxes]").each(function(){var b=a(this),c=b.data();delete c.toggle;for(var d in c)b.checkboxes(d,c[d])})})}(window.jQuery); \ No newline at end of file +/*! checkboxes.js 1.0.3 | Rubens Mariuzzo (http://mariuzzo.com/) | 2014-05-15 | MIT */ +!function(a){var b=function(a){this.$context=a};b.prototype.check=function(){this.$context.find(":checkbox").filter(":not(:disabled)").prop("checked",!0)},b.prototype.uncheck=function(){this.$context.find(":checkbox").filter(":not(:disabled)").prop("checked",!1)},b.prototype.toggle=function(){this.$context.find(":checkbox").filter(":not(:disabled)").each(function(){var b=a(this);b.prop("checked",!b.is(":checked"))})},b.prototype.max=function(a){if(0===a)this.$context.off("click.checkboxes");else if(a>0){var b=this;this.$context.on("click.checkboxes.max",":checkbox",function(){b.$context.find(":checked").length===a?b.$context.find(":checkbox:not(:checked)").prop("disabled",!0):b.$context.find(":checkbox:not(:checked)").prop("disabled",!1)})}},b.prototype.range=function(b){if(b){var c=this;this.$context.on("click.checkboxes.range",":checkbox",function(b){var d=a(b.target);if(b.shiftKey&&c.$last){var e=c.$context.find(":checkbox"),f=e.index(c.$last),g=e.index(d),h=Math.min(f,g),i=Math.max(f,g)+1;e.slice(h,i).filter(":not(:disabled)").prop("checked",d.prop("checked"))}c.$last=d})}else this.$context.off("click.checkboxes.range")};var c=a.fn.checkboxes;a.fn.checkboxes=function(c){var d=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=a(this),f=e.data("checkboxes");f||e.data("checkboxes",f=new b(e,"object"==typeof c&&c)),"string"==typeof c&&f[c]&&f[c].apply(f,d)})},a.fn.checkboxes.Constructor=b,a.fn.checkboxes.noConflict=function(){return a.fn.checkboxes=c,this},a(document).on("click.checkboxes.data-api","[data-toggle^=checkboxes]",function(b){var c=a(b.target),d=c.attr("href"),e=a(c.data("context")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=c.data("action");e&&f&&(c.is(":checkbox")||b.preventDefault(),e.checkboxes(f))}),a(document).on("ready.checkboxes.data-api",function(){a("[data-toggle^=checkboxes]").each(function(){var b=a(this),c=b.data();delete c.toggle;for(var d in c)b.checkboxes(d,c[d])})})}(window.jQuery); \ No newline at end of file diff --git a/src/jquery.checkboxes.js b/src/jquery.checkboxes.js index 26de6b1..25c58b4 100644 --- a/src/jquery.checkboxes.js +++ b/src/jquery.checkboxes.js @@ -1,4 +1,6 @@ -/*! Checkbox.js - MIT - Rubens Mariuzzo */ ! function($) { +/*! Checkbox.js - MIT - Rubens Mariuzzo */ + +! function($) { ////////////////////////////////// /* Checkboxes class definition. */ @@ -128,7 +130,9 @@ $context = $(el.data('context') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))), action = el.data('action'); if ($context && action) { - e.preventDefault(); + if (!el.is(':checkbox')) { + e.preventDefault(); + } $context.checkboxes(action); } }); diff --git a/test/test.html b/test/test.html index 320ba5b..54caee6 100644 --- a/test/test.html +++ b/test/test.html @@ -47,5 +47,12 @@ Uncheck all + \ No newline at end of file