Skip to content

Commit 6f79a5e

Browse files
committed
fix(exposeAsideWhen): disable with isEnabled=false
Closes #2210
1 parent 74de015 commit 6f79a5e

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

Diff for: js/angular/controller/sideMenuController.js

+2
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody) {
259259
};
260260

261261
self.exposeAside = function(shouldExposeAside) {
262+
if(!self.left || !self.left.isEnabled) return;
263+
262264
self.close();
263265
isAsideExposed = shouldExposeAside;
264266

Diff for: test/unit/angular/controller/sideMenuController.unit.js

+10
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,16 @@ describe('$ionicSideMenus controller', function() {
134134
expect(ctrl.getOpenPercentage()).toEqual(0);
135135
});
136136

137+
it('should set enabled/disabled exposeAside', function() {
138+
expect(ctrl.isAsideExposed()).toEqual(false);
139+
ctrl.left.setIsEnabled(false);
140+
ctrl.exposeAside(true);
141+
expect(ctrl.isAsideExposed()).toEqual(false);
142+
ctrl.left.setIsEnabled(true);
143+
ctrl.exposeAside(true);
144+
expect(ctrl.isAsideExposed()).toEqual(true);
145+
});
146+
137147
it('should toggle right', function() {
138148
ctrl.toggleRight();
139149
expect(ctrl.getOpenPercentage()).toEqual(-100);

0 commit comments

Comments
 (0)