From 045888fa3887f5e65658499da11c8ad737222759 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2017 08:38:04 -0800 Subject: version bump --- js/dist/button.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/dist/button.js') diff --git a/js/dist/button.js b/js/dist/button.js index 72e9e067d..6eb6dd576 100644 --- a/js/dist/button.js +++ b/js/dist/button.js @@ -4,7 +4,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): button.js + * Bootstrap (v4.0.0-alpha.6): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ var Button = function ($) { */ var NAME = 'button'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.button'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; -- cgit v1.2.3 From bc0cf36dc85cc974d92d3a7c64987aa6bc37ea25 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Apr 2017 13:54:07 -0700 Subject: grunt --- js/dist/button.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'js/dist/button.js') diff --git a/js/dist/button.js b/js/dist/button.js index 6eb6dd576..da8c35e69 100644 --- a/js/dist/button.js +++ b/js/dist/button.js @@ -62,6 +62,7 @@ var Button = function ($) { Button.prototype.toggle = function toggle() { var triggerChangeEvent = true; + var addAriaPressed = true; var rootElement = $(this._element).closest(Selector.DATA_TOGGLE)[0]; if (rootElement) { @@ -86,10 +87,13 @@ var Button = function ($) { } input.focus(); + addAriaPressed = false; } } - this._element.setAttribute('aria-pressed', !$(this._element).hasClass(ClassName.ACTIVE)); + if (addAriaPressed) { + this._element.setAttribute('aria-pressed', !$(this._element).hasClass(ClassName.ACTIVE)); + } if (triggerChangeEvent) { $(this._element).toggleClass(ClassName.ACTIVE); -- cgit v1.2.3 From ba312c20a5ceca42117dd53303bafda485d8facd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Apr 2017 23:58:09 -0700 Subject: build --- js/dist/button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/dist/button.js') diff --git a/js/dist/button.js b/js/dist/button.js index da8c35e69..367e50495 100644 --- a/js/dist/button.js +++ b/js/dist/button.js @@ -168,4 +168,4 @@ var Button = function ($) { return Button; }(jQuery); -//# sourceMappingURL=button.js.map +//# sourceMappingURL=button.js.map \ No newline at end of file -- cgit v1.2.3 From 3719ed4cb69fd8c75869158b086b4fc077e63e14 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 16 May 2017 09:59:44 +0200 Subject: build --- js/dist/button.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/dist/button.js') diff --git a/js/dist/button.js b/js/dist/button.js index 367e50495..cd82242c1 100644 --- a/js/dist/button.js +++ b/js/dist/button.js @@ -82,6 +82,9 @@ var Button = function ($) { } if (triggerChangeEvent) { + if (input.hasAttribute('disabled') || rootElement.hasAttribute('disabled') || input.classList.contains('disabled') || rootElement.classList.contains('disabled')) { + return; + } input.checked = !$(this._element).hasClass(ClassName.ACTIVE); $(input).trigger('change'); } -- cgit v1.2.3