Revert "Revert "Merge branch 'master' of https://github.com/driftyco/ionic""

This reverts commit 4a6086c1f8.

src/components/menu/test/basic/index.ts

@@ -67,6 +67,14 @@ class E2EPage {
     });
   }
 
+  openRightMenu() {
+    this.menu.open('right');
+  }
+
+  openLeftMenu() {
+    this.menu.open('left');
+  }
+
   onDrag(ev: any) {
     console.log('Menu is being dragged', ev);
   }

src/components/menu/test/basic/main.html

@@ -14,6 +14,10 @@
         {{p.title}}
       </button>
 
+      <button ion-item (click)="openRightMenu()">
+        Open Right Menu
+      </button>
+
       <button ion-item menuClose="left" class="e2eCloseLeftMenu" detail-none>
         Close Menu
       </button>
@@ -90,6 +94,10 @@
         {{p.title}}
       </button>
 
+      <button ion-item (click)="openLeftMenu()">
+        Open Left Menu
+      </button>
+
       <button ion-item menuClose="right" class="e2eCloseRightMenu" detail-none>
         Close Menu
       </button>
@@ -148,6 +156,6 @@
 
 </ion-menu>
 
-<ion-nav [root]="rootPage" #content></ion-nav>
+<ion-nav [root]="rootPage" #content swipeBackEnabled="true"></ion-nav>
 
 <div [hidden]="isChangeDetecting()"></div>

src/components/menu/test/basic/page1.html

@@ -35,9 +35,19 @@
 
   <h3>Page 1</h3>
 
-  <p>
-    <button class="e2eContentToggleLeftMenu" menuToggle="left">Toggle Left Menu</button>
-  </p>
+  <ion-list>
+    <ion-item-sliding>
+      <button ion-item class="e2eContentToggleLeftMenu" menuToggle="left">Toggle Left Menu</button>
+
+      <ion-item-options side="left">
+        <button>Test</button>
+      </ion-item-options>
+      <ion-item-options>
+        <button>Test</button>
+      </ion-item-options>
+    </ion-item-sliding>
+  </ion-list>
+
 
   <p>
     <button class="e2eContentToggleRightMenu" menuToggle="right">Toggle Right Menu</button>