Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/components/sidenav/sidenav.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate,
*/
function postLink(scope, element, attr, sidenavCtrl) {
var lastParentOverFlow;
var backdrop;
var triggeringElement = null;
var promise = $q.when(true);
var isLockedOpenParsed = $parse(attr.mdIsLockedOpen);
Expand All @@ -240,7 +241,11 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate,
$mdMedia: $mdMedia
});
};
var backdrop = !angular.isDefined(attr.mdDisableBackdrop) ? $mdUtil.createBackdrop(scope, "_md-sidenav-backdrop md-opaque ng-enter") : undefined;

// Only create the backdrop if the backdrop isn't disabled.
if (!angular.isDefined(attr.mdDisableBackdrop)) {
backdrop = $mdUtil.createBackdrop(scope, "_md-sidenav-backdrop md-opaque ng-enter");
}

$mdTheming(element);

Expand Down
2 changes: 1 addition & 1 deletion src/components/sidenav/sidenav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ md-sidenav {

@extend .md-sidenav-left;
}
.md-sidenav-backdrop._md-locked-open {
._md-sidenav-backdrop._md-locked-open {
display: none;
}

Expand Down
10 changes: 5 additions & 5 deletions src/components/sidenav/sidenav.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ describe('mdSidenav', function() {
expect($rootScope.show).toBe(false);
}));

it('should show no backdrop if disabled', inject(function($rootScope, $material, $timeout) {
var el = setup('md-disable-backdrop="true"');
it('should show a backdrop by default', inject(function($rootScope, $material) {
var el = setup('md-is-open="show"');
$rootScope.$apply('show = true');

$material.flushOutstandingAnimations();

var backdrop = el.parent().find('md-backdrop');
expect(backdrop.length).toBe(0);
expect(backdrop.length).toBe(1);
}));

it('should show no backdrop if disabled', inject(function($rootScope, $material, $timeout) {
var el = setup('md-disable-backdrop');
it('should not show a backdrop if md-disable-backdrop is set to true', inject(function($rootScope, $material) {
var el = setup('md-is-open="show" md-disable-backdrop');
$rootScope.$apply('show = true');

$material.flushOutstandingAnimations();
Expand Down