From 1bfbd701abf44447b22f1eaea2cd7573462b4b73 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 15 Oct 2013 17:25:21 -0500
Subject: [PATCH] LKilst view work

---
 dist/js/ionic.js     | 29 ++++++++++++++++++++++-------
 js/views/slideBox.js | 29 ++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index 270e60d89b..2e993a711b 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -2364,23 +2364,38 @@ window.ionic = {
     _handleDrag: function(e) {
       var _this = this;
       window.requestAnimationFrame(function() {
+        var content;
+
         // We really aren't dragging
         if(!_this._currentDrag) {
           _this._startDrag(e);
         }
 
-        // 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 &&
-            ((Math.abs(e.gesture.deltaX) > _this.dragThresholdX) || (Math.abs(_this._currentDrag.startOffsetX) > 0)))
-        {
+        // Sanity
+        if(!_this._currentDrag) { return; }
+
+        // Check if we should start dragging. Check if we've dragged past the threshold.
+        if(!_this._isDragging && (Math.abs(e.gesture.deltaX) > _this.dragThresholdX)) {
           _this._isDragging = true;
         }
 
         if(_this._isDragging) {
-          // Grab the new X point, capping it at zero
-          var newX = Math.min(_this._currentDrag.content.offsetWidth, _this._currentDrag.startOffsetX + e.gesture.deltaX);
+          content = _this._currentDrag.content;
 
+          // Grab the new X point, capping it at zero
+          var newX = Math.min(content.offsetWidth, _this._currentDrag.startOffsetX + e.gesture.deltaX);
+
+          /*
+          var rightMostX = -(content.offsetWidth * Math.max(0, content.children.length - 1));
+
+          if(newX > 0) {
+            // We are dragging past the leftmost pane, rubber band
+            newX *= 0.4;
+          } else if(newX < rightMostX) {
+            // Dragging past the rightmost pane, rubber band
+            newX = Math.min(rightMostX, + (((e.gesture.deltaX + buttonsWidth) * 0.4)));
+          }
+          */
 
           _this._currentDrag.content.style.webkitTransform = 'translate3d(' + newX + 'px, 0, 0)';
         }
diff --git a/js/views/slideBox.js b/js/views/slideBox.js
index be3703dafe..e5e96e910f 100644
--- a/js/views/slideBox.js
+++ b/js/views/slideBox.js
@@ -98,23 +98,38 @@
     _handleDrag: function(e) {
       var _this = this;
       window.requestAnimationFrame(function() {
+        var content;
+
         // We really aren't dragging
         if(!_this._currentDrag) {
           _this._startDrag(e);
         }
 
-        // 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 &&
-            ((Math.abs(e.gesture.deltaX) > _this.dragThresholdX) || (Math.abs(_this._currentDrag.startOffsetX) > 0)))
-        {
+        // Sanity
+        if(!_this._currentDrag) { return; }
+
+        // Check if we should start dragging. Check if we've dragged past the threshold.
+        if(!_this._isDragging && (Math.abs(e.gesture.deltaX) > _this.dragThresholdX)) {
           _this._isDragging = true;
         }
 
         if(_this._isDragging) {
-          // Grab the new X point, capping it at zero
-          var newX = Math.min(_this._currentDrag.content.offsetWidth, _this._currentDrag.startOffsetX + e.gesture.deltaX);
+          content = _this._currentDrag.content;
 
+          // Grab the new X point, capping it at zero
+          var newX = Math.min(content.offsetWidth, _this._currentDrag.startOffsetX + e.gesture.deltaX);
+
+          /*
+          var rightMostX = -(content.offsetWidth * Math.max(0, content.children.length - 1));
+
+          if(newX > 0) {
+            // We are dragging past the leftmost pane, rubber band
+            newX *= 0.4;
+          } else if(newX < rightMostX) {
+            // Dragging past the rightmost pane, rubber band
+            newX = Math.min(rightMostX, + (((e.gesture.deltaX + buttonsWidth) * 0.4)));
+          }
+          */
 
           _this._currentDrag.content.style.webkitTransform = 'translate3d(' + newX + 'px, 0, 0)';
         }