From cfa2aa64012a618334424a8cf27cd6aa78877b62 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@codiqa.com>
Date: Fri, 15 Nov 2013 21:08:53 -0600
Subject: [PATCH] Fixed #143 - side menu zindex bug

---
 dist/js/ionic-angular.js                      | 25 +++++++++----------
 dist/js/ionic.js                              |  5 ++++
 js/ext/angular/src/directive/ionicSideMenu.js | 25 +++++++++----------
 js/ext/angular/test/sideMenu.html             |  4 +--
 js/views/sideMenuView.js                      |  5 ++++
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 4750324ee7..3c841e3d87 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -24355,23 +24355,22 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
       return function($scope, $element, $attr, sideMenuCtrl) {
         $scope.side = $attr.side;
 
-        sideMenuCtrl.left.pushDown = function() {
-          $element[0].style.zIndex = -1;
-        };
-        sideMenuCtrl.left.bringUp = function() {
-          $element[0].style.zIndex = 0;
-        };
-        sideMenuCtrl.right.pushDown = function() {
-          $element[0].style.zIndex = -1;
-        };
-        sideMenuCtrl.right.bringUp = function() {
-          $element[0].style.zIndex = 0;
-        };
-
         if($scope.side == 'left') {
           sideMenuCtrl.left.isEnabled = true;
+          sideMenuCtrl.left.pushDown = function() {
+            $element[0].style.zIndex = -1;
+          };
+          sideMenuCtrl.left.bringUp = function() {
+            $element[0].style.zIndex = 0;
+          };
         } else if($scope.side == 'right') {
           sideMenuCtrl.right.isEnabled = true;
+          sideMenuCtrl.right.pushDown = function() {
+            $element[0].style.zIndex = -1;
+          };
+          sideMenuCtrl.right.bringUp = function() {
+            $element[0].style.zIndex = 0;
+          };
         }
 
         $element.append(transclude($scope));
diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index d9b22ed711..28c0995475 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -3604,6 +3604,11 @@ window.ionic = {
 (function(ionic) {
 'use strict';
 
+  /**
+   * The side menu view handles one of the side menu's in a Side Menu Controller
+   * configuration.
+   * It takes a DOM reference to that side menu element.
+   */
   ionic.views.SideMenu = ionic.views.View.inherit({
     initialize: function(opts) {
       this.el = opts.el;
diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js
index 178bf059f5..883721cdac 100644
--- a/js/ext/angular/src/directive/ionicSideMenu.js
+++ b/js/ext/angular/src/directive/ionicSideMenu.js
@@ -126,23 +126,22 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
       return function($scope, $element, $attr, sideMenuCtrl) {
         $scope.side = $attr.side;
 
-        sideMenuCtrl.left.pushDown = function() {
-          $element[0].style.zIndex = -1;
-        };
-        sideMenuCtrl.left.bringUp = function() {
-          $element[0].style.zIndex = 0;
-        };
-        sideMenuCtrl.right.pushDown = function() {
-          $element[0].style.zIndex = -1;
-        };
-        sideMenuCtrl.right.bringUp = function() {
-          $element[0].style.zIndex = 0;
-        };
-
         if($scope.side == 'left') {
           sideMenuCtrl.left.isEnabled = true;
+          sideMenuCtrl.left.pushDown = function() {
+            $element[0].style.zIndex = -1;
+          };
+          sideMenuCtrl.left.bringUp = function() {
+            $element[0].style.zIndex = 0;
+          };
         } else if($scope.side == 'right') {
           sideMenuCtrl.right.isEnabled = true;
+          sideMenuCtrl.right.pushDown = function() {
+            $element[0].style.zIndex = -1;
+          };
+          sideMenuCtrl.right.bringUp = function() {
+            $element[0].style.zIndex = 0;
+          };
         }
 
         $element.append(transclude($scope));
diff --git a/js/ext/angular/test/sideMenu.html b/js/ext/angular/test/sideMenu.html
index 7aa2777135..3a9255e074 100644
--- a/js/ext/angular/test/sideMenu.html
+++ b/js/ext/angular/test/sideMenu.html
@@ -7,6 +7,8 @@
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
     <link href="/vendor/font-awesome/css/font-awesome.css" rel="stylesheet">
     <link rel="stylesheet" href="../../../../dist/css/ionic.css">
+    <script src="../../../../dist/js/ionic.js"></script>
+    <script src="../../../../dist/js/ionic-angular.js"></script>
   </head>
   <body>
 
@@ -47,8 +49,6 @@
         </menu>
       </side-menu>
     </div>
-    <script src="../../../../dist/js/ionic.js"></script>
-    <script src="../../../../dist/js/ionic-angular.js"></script>
     <script>
       angular.module('sideMenuTest', ['ionic'])
 
diff --git a/js/views/sideMenuView.js b/js/views/sideMenuView.js
index 230e89404c..56ef3b5132 100644
--- a/js/views/sideMenuView.js
+++ b/js/views/sideMenuView.js
@@ -1,6 +1,11 @@
 (function(ionic) {
 'use strict';
 
+  /**
+   * The side menu view handles one of the side menu's in a Side Menu Controller
+   * configuration.
+   * It takes a DOM reference to that side menu element.
+   */
   ionic.views.SideMenu = ionic.views.View.inherit({
     initialize: function(opts) {
       this.el = opts.el;