fix(sideMenu): when drag-content=false, allow drag-to-close

Closes #1419
ionic-team · Jul 7, 2014 · e3db085 · e3db085
1 parent 685111e
commit e3db085
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/angular/controller/sideMenuController.js b/js/angular/controller/sideMenuController.js
@@ -38,7 +38,7 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform) {
   };
 
   this.isDraggableTarget = function(e) {
-    return $scope.dragContent &&
+    return (self.isOpen() || $scope.dragContent) &&
            (!e.gesture.srcEvent.defaultPrevented &&
             !e.target.tagName.match(/input|textarea|select|object|embed/i) &&
             !e.target.isContentEditable &&

diff --git a/test/html/sideMenu.html b/test/html/sideMenu.html
@@ -13,14 +13,14 @@
 
       <ion-side-menus>
 
-        <ion-side-menu-content edge-drag-threshold="true">
+        <ion-side-menu-content edge-drag-threshold="true" drag-content="!$root.disableDrag">
           <header class="bar bar-header bar-positive">
             <button class="button button-icon ion-navicon" ng-click="toggleLeft()"></button>
             <h1 class="title">Slide me</h1>
             <button class="button button-icon ion-navicon" ng-click="toggleRight()"></button>
           </header>
           <ion-content class="has-header">
-            <ion-toggle ng-model="$root.$draggy">Hello</ion-toggle>
+            <ion-toggle ng-model="$root.disableDrag">Disable Drag Content?</ion-toggle>
             <input type="range" ng-model="$root.menuWidth" min="0" max="300">
             <h1>Content</h1>
             <ion-list>