Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix( sidenav): corrected use of internal $toggleOpen()
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasBurleson committed Jul 14, 2015
1 parent 2668ba0 commit 6f72bef
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/components/sidenav/sidenav.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ function SidenavDirective($timeout, $animate, $parse, $log, $mdMedia, $mdConstan
*/
function updateIsOpen(isOpen) {
var parent = element.parent();
var focusEl = sidenavCtrl.focusElement();

parent[isOpen ? 'on' : 'off']('keydown', onKeyDown);
backdrop[isOpen ? 'on' : 'off']('click', close);
Expand All @@ -283,7 +284,6 @@ function SidenavDirective($timeout, $animate, $parse, $log, $mdMedia, $mdConstan
// Capture upon opening..
triggeringElement = $document[0].activeElement;
}
var focusEl = sidenavCtrl.focusElement();

disableParentScroll(isOpen);

Expand All @@ -304,12 +304,16 @@ function SidenavDirective($timeout, $animate, $parse, $log, $mdMedia, $mdConstan
*/
function disableParentScroll(disabled) {
var parent = element.parent();
if ( disabled ) {
if ( disabled && !lastParentOverFlow ) {

lastParentOverFlow = parent.css('overflow');
parent.css('overflow', 'hidden');

} else if (angular.isDefined(lastParentOverFlow)) {

parent.css('overflow', lastParentOverFlow);
lastParentOverFlow = undefined;

}
}

Expand Down Expand Up @@ -404,7 +408,7 @@ function SidenavController($scope, $element, $attrs, $mdComponentRegistry, $q) {
return focusElement;
};

self.$toggleOpen = function() { return $q.when($scope.isOpen); };
self.$toggleOpen = function(value) { return $q.when($scope.isOpen = value); };

self.destroy = $mdComponentRegistry.register(self, $attrs.mdComponentId);
}

0 comments on commit 6f72bef

Please sign in to comment.