From 104bdd1be822bc5c13de94f27d1aecdb144e287c Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 23 Sep 2013 08:21:05 +0200 Subject: [PATCH] feat(dropdownToggle): disable dropdown when it has the disabled class --- src/dropdownToggle/dropdownToggle.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dropdownToggle/dropdownToggle.js b/src/dropdownToggle/dropdownToggle.js index e04ccf7b90..cbfab6efea 100644 --- a/src/dropdownToggle/dropdownToggle.js +++ b/src/dropdownToggle/dropdownToggle.js @@ -31,7 +31,7 @@ angular.module('ui.bootstrap.dropdownToggle', []).directive('dropdownToggle', [' closeMenu(); } - if (!elementWasOpen) { + if (!elementWasOpen && !element.hasClass('disabled') && !element.prop('disabled')) { element.parent().addClass('open'); openElement = element; closeMenu = function (event) { @@ -49,4 +49,4 @@ angular.module('ui.bootstrap.dropdownToggle', []).directive('dropdownToggle', [' }); } }; -}]); \ No newline at end of file +}]);