Skip to content

Commit 620b7c8

Browse files
committedMay 25, 2016
feat(popover): add height auto for safari and remove ability to scroll on backdrop
references #5420
1 parent 4db72cf commit 620b7c8

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed
 

‎src/components/popover/popover.scss

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ion-popover {
3939
ion-page {
4040
position: relative;
4141
display: flex;
42+
height: auto;
4243
}
4344
}
4445

‎src/components/popover/popover.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class Popover extends ViewController {
7272
@Component({
7373
selector: 'ion-popover',
7474
template:
75-
'<div disable-activated class="backdrop" (click)="bdClick()" [class.hide-backdrop]="!d.showBackdrop"></div>' +
75+
'<div class="backdrop" (touchmove)="bdTouch($event)" (click)="bdClick($event)" [class.hide-backdrop]="!d.showBackdrop" disable-activated tappable role="presentation"></div>' +
7676
'<div class="popover-wrapper">' +
7777
'<div class="popover-arrow"></div>' +
7878
'<div class="popover-content">' +
@@ -125,6 +125,11 @@ class PopoverCmp {
125125
return this._viewCtrl.dismiss(null, role);
126126
}
127127

128+
bdTouch(ev) {
129+
ev.preventDefault();
130+
ev.stopPropagation();
131+
}
132+
128133
bdClick() {
129134
if (this.isEnabled() && this.d.enableBackdropDismiss) {
130135
this.dismiss('backdrop');
@@ -269,7 +274,6 @@ class PopoverMdPopIn extends PopoverTransition {
269274
super(opts);
270275

271276
let ele = enteringView.pageRef().nativeElement;
272-
this.positionView(ele, opts.ev);
273277

274278
let wrapper = new Animation(ele.querySelector('.popover-wrapper'));
275279

@@ -317,7 +321,6 @@ class PopoverWpPopIn extends PopoverTransition {
317321
super(opts);
318322

319323
let ele = enteringView.pageRef().nativeElement;
320-
this.positionView(ele, opts.ev);
321324

322325
let wrapper = new Animation(ele.querySelector('.popover-wrapper'));
323326

‎src/components/popover/test/basic/main.html

+3
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,8 @@
4747
<button (click)="presentListPopover($event)">
4848
<ion-icon name="more"></ion-icon>
4949
</button>
50+
<button (click)="presentLongListPopover($event)">
51+
<ion-icon name="search"></ion-icon>
52+
</button>
5053
</ion-buttons>
5154
</ion-toolbar>

0 commit comments

Comments
 (0)
Please sign in to comment.