From 61a280bda8b7604a5eda11e99a45f4b991a8e269 Mon Sep 17 00:00:00 2001 From: Andy Joslin Date: Tue, 11 Feb 2014 16:22:55 -0500 Subject: [PATCH] fix(sideMenuContent): make dragContent default to true --- js/ext/angular/src/directive/ionicSideMenu.js | 12 ++++++++---- js/ext/angular/test/sideMenu2.html | 7 +++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js index 61fc139f98..730fdd9f2f 100644 --- 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 index 2710f26099..523de80c41 100644 --- a/js/ext/angular/test/sideMenu2.html +++ b/js/ext/angular/test/sideMenu2.html @@ -43,6 +43,10 @@

Swipe to the right to reveal the left menu.

+
+ Left Menu +
+

{{$index}}....

(On desktop click and drag from left to right)

@@ -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' },