From d324bb615a6356747e5b7ac378ad58dc79e57a21 Mon Sep 17 00:00:00 2001
From: Andrew <andrewtjoslin@gmail.com>
Date: Wed, 8 Oct 2014 16:32:44 -0600
Subject: [PATCH] enhance(ionSlideBox): allow scrolling to work

---
 js/angular/directive/slideBox.js | 15 ++-------------
 js/angular/service/attachDrag.js |  4 ++++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/js/angular/directive/slideBox.js b/js/angular/directive/slideBox.js
index 8086965ac1..29ca6727c0 100644
--- a/js/angular/directive/slideBox.js
+++ b/js/angular/directive/slideBox.js
@@ -45,7 +45,7 @@ function($ionicSlideBoxDelegate, $window) {
   return {
     restrict: 'E',
     controller: '$ionSlideBox',
-    require: ['ionSlideBox', '^?$ionicScroll'],
+    require: ['ionSlideBox'],
     transclude: true,
     scope: {
       selectedIndex: '=?selected',
@@ -62,10 +62,7 @@ function($ionicSlideBoxDelegate, $window) {
     return postLink;
   }
 
-  function postLink(scope, element, attr, ctrls) {
-    var slideBoxCtrl = ctrls[0];
-    var scrollCtrl = ctrls[1];
-
+  function postLink(scope, element, attr, slideBoxCtrl) {
     element.addClass('slider');
 
     var deregister = $ionicSlideBoxDelegate._registerInstance(slideBoxCtrl, attr.delegateHandle);
@@ -79,15 +76,7 @@ function($ionicSlideBoxDelegate, $window) {
     throttledReposition();
     angular.element($window).on('resize', throttledReposition);
 
-    if (scrollCtrl) {
-      var oldScrollingY = scrollCtrl.scrollView.options.scrollingY;
-      scrollCtrl.scrollView.options.scrollingY = false;
-    }
-
     scope.$on('$destroy', function() {
-      if (scrollCtrl) {
-        scrollCtrl.scrollView.options.scrollingY = oldScrollingY;
-      }
       angular.element($window).off('resize', throttledReposition);
     });
 
diff --git a/js/angular/service/attachDrag.js b/js/angular/service/attachDrag.js
index bdb760a1c7..b7482e545e 100644
--- a/js/angular/service/attachDrag.js
+++ b/js/angular/service/attachDrag.js
@@ -25,6 +25,10 @@ IonicModule
       ionic.offGesture(dragEndGesture, 'dragend', handleDragEnd);
     });
 
+    element.on('touchmove pointermove mousemove', function(ev) {
+      if (dragState && dragState.dragging) ev.preventDefault();
+    });
+
     var dragState;
     function handleDragStart(ev) {
       if (dragState) return;