From 1839797a24901bc226ec7a786853ccc26fc2732e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@codiqa.com>
Date: Fri, 11 Oct 2013 16:50:05 -0500
Subject: [PATCH] Fixed dragging list items

---
 dist/js/ionic-angular.js                  | 7 +++++--
 dist/js/ionic.js                          | 5 +++++
 js/ext/angular/src/directive/ionicList.js | 7 +++++--
 js/ext/angular/test/list.html             | 3 +++
 js/views/listView.js                      | 5 +++++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 8b0b55e89a..a95f2de4c0 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -247,14 +247,16 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
                    <div class="list-item-content" ng-transclude>\
                    </div>\
                    <div class="list-item-drag" ng-if="canReorder && isEditing">\
-                     <button ng-click="startReorder()"><i ng-class="reorderIcon"></i></button>\
+                     <button class="button button-icon" ng-click="startReorder()"><i ng-class="reorderIcon"></i></button>\
                    </div>\
                    <div class="list-item-buttons" ng-if="canSwipe && !isEditing">\
                      <button ng-click="onButtonClicked(button)" class="button" ng-class="button.type" ng-repeat="button in buttons">{{button.text}}</button>\
                    </div>\
                 </li>',
     link: function($scope, $element, $attr, list) {
+      $scope.isEditing = false;
       $scope.deleteIcon = list.scope.deleteIcon;
+      $scope.reorderIcon = list.scope.reorderIcon;
 
       list.scope.$watch('isEditing', function(v) {
         $scope.isEditing = v;
@@ -271,7 +273,8 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
 
     scope: {
       isEditing: '=',
-      deleteIcon: '@'
+      deleteIcon: '@',
+      reorderIcon: '@'
     },
 
     // So we can require being under this
diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index 7f74b32b3e..1af8362494 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -1928,6 +1928,11 @@ window.ionic = {
           _this._startDrag(e);
         }
 
+        // We really aren't dragging
+        if(!_this._currentDrag) {
+          return;
+        }
+
         // Check if we should start dragging. Check if we've dragged past the threshold,
         // or we are starting from the open state.
         if(!_this._isDragging &&
diff --git a/js/ext/angular/src/directive/ionicList.js b/js/ext/angular/src/directive/ionicList.js
index 825ae14e66..c7b6d27c40 100644
--- a/js/ext/angular/src/directive/ionicList.js
+++ b/js/ext/angular/src/directive/ionicList.js
@@ -22,14 +22,16 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
                    <div class="list-item-content" ng-transclude>\
                    </div>\
                    <div class="list-item-drag" ng-if="canReorder && isEditing">\
-                     <button ng-click="startReorder()"><i ng-class="reorderIcon"></i></button>\
+                     <button class="button button-icon" ng-click="startReorder()"><i ng-class="reorderIcon"></i></button>\
                    </div>\
                    <div class="list-item-buttons" ng-if="canSwipe && !isEditing">\
                      <button ng-click="onButtonClicked(button)" class="button" ng-class="button.type" ng-repeat="button in buttons">{{button.text}}</button>\
                    </div>\
                 </li>',
     link: function($scope, $element, $attr, list) {
+      $scope.isEditing = false;
       $scope.deleteIcon = list.scope.deleteIcon;
+      $scope.reorderIcon = list.scope.reorderIcon;
 
       list.scope.$watch('isEditing', function(v) {
         $scope.isEditing = v;
@@ -46,7 +48,8 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
 
     scope: {
       isEditing: '=',
-      deleteIcon: '@'
+      deleteIcon: '@',
+      reorderIcon: '@'
     },
 
     // So we can require being under this
diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html
index 69dc6e9dbd..1ae68c13aa 100644
--- a/js/ext/angular/test/list.html
+++ b/js/ext/angular/test/list.html
@@ -51,7 +51,10 @@
     <content has-header="true" ng-controller="TestCtrl" class="reveal-animation">
       <list is-editing="isEditingItems" animation="my-repeat-animation" delete-icon="icon-minus-circled" reorder-icon="icon-navicon">
         <list-item ng-repeat="item in items" 
+        buttons="item.buttons"
         can-delete="true"
+        can-reorder="true"
+        can-swipe="true"
                  on-delete="deleteProject(project)"
                  on-select="selectProject(project)">
           {{item.text}}
diff --git a/js/views/listView.js b/js/views/listView.js
index e8ce24cfb7..bc71e845c3 100644
--- a/js/views/listView.js
+++ b/js/views/listView.js
@@ -122,6 +122,11 @@
           _this._startDrag(e);
         }
 
+        // We really aren't dragging
+        if(!_this._currentDrag) {
+          return;
+        }
+
         // Check if we should start dragging. Check if we've dragged past the threshold,
         // or we are starting from the open state.
         if(!_this._isDragging &&