From ea04e393c00b629455e737b64bdaccff6ff99424 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sun, 9 Mar 2014 17:44:00 -0500
Subject: [PATCH] fix(sideMenuController): sticking issue #738

---
 js/controllers/sideMenuController.js | 19 +++++++++++++++++--
 js/ext/angular/test/sideMenu.html    |  3 ++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/js/controllers/sideMenuController.js b/js/controllers/sideMenuController.js
index d2ff8f0963..a036468476 100644
--- a/js/controllers/sideMenuController.js
+++ b/js/controllers/sideMenuController.js
@@ -139,12 +139,27 @@
       var maxLeft = this.left && this.left.width || 0;
       var maxRight = this.right && this.right.width || 0;
 
+      console.log('Opening amount', amount);
+
       // Check if we can move to that side, depending if the left/right panel is enabled
-      if((!(this.left && this.left.isEnabled) && amount > 0) || (!(this.right && this.right.isEnabled) && amount < 0)) {
+      if(!(this.left && this.left.isEnabled) && amount > 0) {
+        this.content.setTranslateX(0);
         return;
       }
 
-      if((this._leftShowing && amount > maxLeft) || (this._rightShowing && amount < -maxRight)) {
+      if(!(this.right && this.right.isEnabled) && amount < 0) {
+        console.log('Blocked right');
+        this.content.setTranslateX(0);
+        return;
+      }
+
+      if(this._leftShowing && amount > maxLeft) {
+        this.content.setTranslateX(maxLeft);
+        return;
+      }
+
+      if(this._rightShowing && amount < -maxRight) {
+        this.content.setTranslateX(-maxRight);
         return;
       }
 
diff --git a/js/ext/angular/test/sideMenu.html b/js/ext/angular/test/sideMenu.html
index 94f9dbfa06..69adfd179d 100644
--- a/js/ext/angular/test/sideMenu.html
+++ b/js/ext/angular/test/sideMenu.html
@@ -24,7 +24,8 @@
             <h1>Content</h1>
           </ion-content>
         </ion-pane>
-        <ion-side-menu side="left" width="$root.menuWidth || 200" ng-controller="LeftCtrl">
+
+        <ion-side-menu side="left" width="$root.menuWidth || 270" ng-controller="LeftCtrl">
           <header class="bar bar-header bar-assertive">
             <h1 class="title">Left</h1>
           </header>