fix(exposeAsideWhen): disable with isEnabled=false

Closes #2210
ionic-team · Sep 15, 2014 · 6f79a5e · 6f79a5e
1 parent 74de015
commit 6f79a5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/js/angular/controller/sideMenuController.js b/js/angular/controller/sideMenuController.js
@@ -259,6 +259,8 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody) {
   };
 
   self.exposeAside = function(shouldExposeAside) {
+    if(!self.left || !self.left.isEnabled) return;
+
     self.close();
     isAsideExposed = shouldExposeAside;
 

diff --git a/test/unit/angular/controller/sideMenuController.unit.js b/test/unit/angular/controller/sideMenuController.unit.js
@@ -134,6 +134,16 @@ describe('$ionicSideMenus controller', function() {
     expect(ctrl.getOpenPercentage()).toEqual(0);
   });
 
+  it('should set enabled/disabled exposeAside', function() {
+    expect(ctrl.isAsideExposed()).toEqual(false);
+    ctrl.left.setIsEnabled(false);
+    ctrl.exposeAside(true);
+    expect(ctrl.isAsideExposed()).toEqual(false);
+    ctrl.left.setIsEnabled(true);
+    ctrl.exposeAside(true);
+    expect(ctrl.isAsideExposed()).toEqual(true);
+  });
+
   it('should toggle right', function() {
     ctrl.toggleRight();
     expect(ctrl.getOpenPercentage()).toEqual(-100);