fix(sideMenuContent): make dragContent default to true

ionic-team · Feb 11, 2014 · 61a280b · 61a280b
1 parent eed6b19
commit 61a280b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js
@@ -60,9 +60,13 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
 
         $element.addClass('menu-content');
 
-        $scope.$watch(attr.dragContent, function(value) {
-          $scope.dragContent = value;
-        });
+        if (angular.isDefined(attr.dragContent)) {
+          $scope.$watch(attr.dragContent, function(value) {
+            $scope.dragContent = value;
+          });
+        } else {
+          $scope.dragContent = true;
+        }
 
         var defaultPrevented = false;
         var isDragging = false;
@@ -81,7 +85,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
             }
             isDragging = true;
             sideMenuCtrl._handleDrag(e);
-            e.gesture.srcEvent.preventDefault();
+            //e.gesture.srcEvent.preventDefault();
           }
         };
 

diff --git a/js/ext/angular/test/sideMenu2.html b/js/ext/angular/test/sideMenu2.html
@@ -43,6 +43,10 @@
       <view title="'Welcome'">
         <content has-header="true" padding="true">
           <p>Swipe to the right to reveal the left menu.</p>
+          <div class="button" ng-click="sideMenuController.toggleLeft()" style="position: absolute; left: 100px; top: 200px;">
+            Left Menu
+          </div>
+          <p ng-repeat="p in range">{{$index}}....</p>
           <p>(On desktop click and drag from left to right)</p>
         </content>
       </view>
@@ -153,6 +157,9 @@
       .controller('MainCtrl', function($scope) {
         console.log('MainCtrl');
 
+        $scope.range = [];
+        for (var i=0; i<150; i++) $scope.range.push(i);
+
         $scope.attendees = [
           { firstname: 'Nicolas', lastname: 'Cage' },
           { firstname: 'Jean-Claude', lastname: 'Van Damme' },