diff --git a/src/buttons/buttons.js b/src/buttons/buttons.js index 9477e32317..14ed715a9e 100644 --- a/src/buttons/buttons.js +++ b/src/buttons/buttons.js @@ -44,7 +44,7 @@ angular.module('ui.bootstrap.buttons', []) }; }) -.directive('uibBtnCheckbox', ['$document', function($document) { +.directive('uibBtnCheckbox', function() { return { require: ['uibBtnCheckbox', 'ngModel'], controller: 'UibButtonsController', @@ -82,21 +82,9 @@ angular.module('ui.bootstrap.buttons', []) ngModelCtrl.$render(); }); }); - - //accessibility - element.on('keypress', function(e) { - if (attrs.disabled || e.which !== 32 || $document[0].activeElement !== element[0]) { - return; - } - - scope.$apply(function() { - ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue()); - ngModelCtrl.$render(); - }); - }); } }; -}]); +}); /* Deprecated buttons below */ diff --git a/src/buttons/test/buttons.spec.js b/src/buttons/test/buttons.spec.js index 1634e08687..d533d376b7 100644 --- a/src/buttons/test/buttons.spec.js +++ b/src/buttons/test/buttons.spec.js @@ -74,27 +74,6 @@ describe('buttons', function() { expect(btn).not.toHaveClass('active'); }); - it('should toggle custom model values on spacebar if focused', function() { - $scope.model = 0; - var btn = compileButton('', $scope); - $('body').append(btn); - var e = $.Event('keypress'); - e.which = 32; - - btn[0].focus(); - btn.trigger(e); - $scope.$digest(); - expect($scope.model).toEqual(1); - expect(btn).toHaveClass('active'); - - btn.trigger(e); - $scope.$digest(); - expect($scope.model).toEqual(0); - expect(btn).not.toHaveClass('active'); - - btn.remove(); - }); - it('should monitor true / false value changes - issue 666', function() { $scope.model = 1; @@ -116,7 +95,6 @@ describe('buttons', function() { $scope.model = 1; $scope.falseVal = 0; var btn = compileButton('', $scope); - $('body').append(btn); expect(btn).not.toHaveClass('active'); expect($scope.model).toEqual(1); @@ -128,19 +106,6 @@ describe('buttons', function() { $scope.$digest(); expect(btn).not.toHaveClass('active'); - - btn[0].focus(); - var e = $.Event('keypress'); - e.which = 32; - btn.trigger(e); - - expect(btn).not.toHaveClass('active'); - - $scope.$digest(); - - expect(btn).not.toHaveClass('active'); - - btn.remove(); }); describe('setting buttonConfig', function() {