feat(popover): add height auto for safari and remove ability to scrol…

…l on backdrop references #5420
ionic-team · May 25, 2016 · 620b7c8 · 620b7c8
1 parent 4db72cf
commit 620b7c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/components/popover/popover.scss b/src/components/popover/popover.scss
@@ -39,6 +39,7 @@ ion-popover {
   ion-page {
     position: relative;
     display: flex;
+    height: auto;
   }
 }
 

diff --git a/src/components/popover/popover.ts b/src/components/popover/popover.ts
@@ -72,7 +72,7 @@ export class Popover extends ViewController {
 @Component({
   selector: 'ion-popover',
   template:
-    '<div disable-activated class="backdrop" (click)="bdClick()" [class.hide-backdrop]="!d.showBackdrop"></div>' +
+    '<div class="backdrop" (touchmove)="bdTouch($event)" (click)="bdClick($event)" [class.hide-backdrop]="!d.showBackdrop" disable-activated tappable role="presentation"></div>' +
     '<div class="popover-wrapper">' +
       '<div class="popover-arrow"></div>' +
       '<div class="popover-content">' +
@@ -125,6 +125,11 @@ class PopoverCmp {
     return this._viewCtrl.dismiss(null, role);
   }
 
+  bdTouch(ev) {
+    ev.preventDefault();
+    ev.stopPropagation();
+  }
+
   bdClick() {
     if (this.isEnabled() && this.d.enableBackdropDismiss) {
       this.dismiss('backdrop');
@@ -269,7 +274,6 @@ class PopoverMdPopIn extends PopoverTransition {
     super(opts);
 
     let ele = enteringView.pageRef().nativeElement;
-    this.positionView(ele, opts.ev);
 
     let wrapper = new Animation(ele.querySelector('.popover-wrapper'));
 
@@ -317,7 +321,6 @@ class PopoverWpPopIn extends PopoverTransition {
     super(opts);
 
     let ele = enteringView.pageRef().nativeElement;
-    this.positionView(ele, opts.ev);
 
     let wrapper = new Animation(ele.querySelector('.popover-wrapper'));
 

diff --git a/src/components/popover/test/basic/main.html b/src/components/popover/test/basic/main.html
@@ -47,5 +47,8 @@
     <button (click)="presentListPopover($event)">
       <ion-icon name="more"></ion-icon>
     </button>
+    <button (click)="presentLongListPopover($event)">
+      <ion-icon name="search"></ion-icon>
+    </button>
   </ion-buttons>
 </ion-toolbar>