Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Issue #3511 fixed #3513

Closed
wants to merge 13 commits into from
Closed

Issue #3511 fixed #3513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
05b3343
Toggle dropdown in resolve function of $animate
Apr 8, 2015
af7636b
Update dropdown.js
Apr 8, 2015
851b984
Update dropdown.js
Apr 8, 2015
2635892
Update dropdown.spec.js
Apr 17, 2015
93a215a
Added $browser dependency
Apr 17, 2015
00f9a92
Update .travis.yml
Apr 17, 2015
8d21e16
Update dropdown.spec.js
Apr 17, 2015
86547f0
Update dropdown.spec.js
Apr 17, 2015
34bd9b2
Update dropdown.spec.js
Apr 17, 2015
885c525
Update dropdown.spec.js
Apr 17, 2015
69c6104
Update dropdown.spec.js
Apr 20, 2015
1e2f746
Update dropdown.spec.js
Apr 20, 2015
6f3c1d1
Update .travis.yml
Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/dropdown/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,11 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
});
}

$animate[isOpen ? 'addClass' : 'removeClass'](self.$element, openClass);

$animate[isOpen ? 'addClass' : 'removeClass'](self.$element, openClass).then(function() {
if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
toggleInvoker($scope, { open: !!isOpen });
}
});
if ( isOpen ) {
scope.focusToggleElement();
dropdownService.open( scope );
Expand All @@ -138,9 +141,6 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
}

setIsOpen($scope, isOpen);
if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
toggleInvoker($scope, { open: !!isOpen });
}
});

$scope.$on('$locationChangeSuccess', function() {
Expand Down
13 changes: 11 additions & 2 deletions src/dropdown/test/dropdown.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
describe('dropdownToggle', function() {
var $compile, $rootScope, $document, element;
var $compile, $rootScope, $document, element, $browser;

beforeEach(module('ui.bootstrap.dropdown'));

beforeEach(inject(function(_$compile_, _$rootScope_, _$document_) {
beforeEach(inject(function(_$compile_, _$rootScope_, _$document_, _$browser_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
$document = _$document_;
$browser = _$browser_;
}));

afterEach(function() {
Expand Down Expand Up @@ -296,9 +297,11 @@ describe('dropdownToggle', function() {
it('should call it correctly when toggles', function() {
$rootScope.isopen = true;
$rootScope.$digest();
$browser.defer.flush();
expect($rootScope.toggleHandler).toHaveBeenCalledWith(true);

clickDropdownToggle();
$browser.defer.flush();
expect($rootScope.toggleHandler).toHaveBeenCalledWith(false);
});
});
Expand All @@ -312,16 +315,19 @@ describe('dropdownToggle', function() {
});

it('should not have been called initially', function() {
$browser.defer.flush();
expect($rootScope.toggleHandler).not.toHaveBeenCalled();
});

it('should call it correctly when toggles', function() {
$rootScope.isopen = false;
$rootScope.$digest();
$browser.defer.flush();
expect($rootScope.toggleHandler).toHaveBeenCalledWith(false);

$rootScope.isopen = true;
$rootScope.$digest();
$browser.defer.flush();
expect($rootScope.toggleHandler).toHaveBeenCalledWith(true);
});
});
Expand All @@ -334,14 +340,17 @@ describe('dropdownToggle', function() {
});

it('should not have been called initially', function() {
$browser.defer.flush();
expect($rootScope.toggleHandler).not.toHaveBeenCalled();
});

it('should call it when clicked', function() {
clickDropdownToggle();
$browser.defer.flush();
expect($rootScope.toggleHandler).toHaveBeenCalledWith(true);

clickDropdownToggle();
$browser.defer.flush();
expect($rootScope.toggleHandler).toHaveBeenCalledWith(false);
});
});
Expand Down