From c653e83cec69535d95dc8ae40af519e5e7f29320 Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Fri, 21 Mar 2014 07:08:26 -0500
Subject: [PATCH] fix(ionList): only stop side menu drag if canSwipe

Closes #709
---
 js/ext/angular/src/directive/ionicList.js | 1 +
 js/ext/angular/test/sideMenu.html         | 7 +++++--
 js/views/listView.js                      | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/js/ext/angular/src/directive/ionicList.js b/js/ext/angular/src/directive/ionicList.js
index 591c1fd7ab..6b3b1a3d23 100644
--- a/js/ext/angular/src/directive/ionicList.js
+++ b/js/ext/angular/src/directive/ionicList.js
@@ -214,6 +214,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
 
     link: function($scope, $element, $attr, ionicScrollCtrl) {
       $scope.listView = new ionic.views.ListView({
+        canSwipe: $scope.canSwipe !== "false" && !!$scope.optionButtons(),
         el: $element[0],
         listEl: $element[0].children[0],
         scrollEl: ionicScrollCtrl && ionicScrollCtrl.element,
diff --git a/js/ext/angular/test/sideMenu.html b/js/ext/angular/test/sideMenu.html
index df370727cf..9d7873f578 100644
--- a/js/ext/angular/test/sideMenu.html
+++ b/js/ext/angular/test/sideMenu.html
@@ -14,14 +14,17 @@
 
         <ion-pane ion-side-menu-content>
           <header class="bar bar-header bar-positive">
-            <button class="button button-icon ion-navicon" ng-click="sideMenuController.toggleLeft(false)"></button>
+            <button class="button button-icon ion-navicon" ng-click="$ionicSideMenusController.toggleLeft()"></button>
             <h1 class="title">Slide me</h1>
-            <button class="button button-icon ion-navicon" ng-click="sideMenuController.toggleRight(false)"></button>
+            <button class="button button-icon ion-navicon" ng-click="$ionicSideMenusController.toggleRight()"></button>
           </header>
           <ion-content class="has-header">
             <ion-toggle ng-model="$root.$draggy">Hello</ion-toggle>
             <input type="range" ng-model="$root.menuWidth" min="0" max="300">
             <h1>Content</h1>
+            <ion-list option-buttons="[{text:'Hello',type:'button-positive'}]">
+              <ion-item>Sup</ion-item>
+            </ion-list>
           </ion-content>
         </ion-pane>
 
diff --git a/js/views/listView.js b/js/views/listView.js
index aaf47dbcc5..9613b43761 100644
--- a/js/views/listView.js
+++ b/js/views/listView.js
@@ -315,7 +315,8 @@
       opts = ionic.extend({
         onReorder: function(el, oldIndex, newIndex) {},
         virtualRemoveThreshold: -200,
-        virtualAddThreshold: 200
+        virtualAddThreshold: 200,
+        canSwipe: false
       }, opts);
 
       ionic.extend(this, opts);
@@ -505,6 +506,10 @@
     _handleDrag: function(e) {
       var _this = this, content, buttons;
 
+      if (!this.canSwipe) {
+        return;
+      }
+
       if(Math.abs(e.gesture.deltaY) > 5) {
         this._didDragUpOrDown = true;
       }