javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 05:21:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(overlays): click delays for md ripple

Browse Source
This commit is contained in:
Adam Bradley
2015-12-30 21:53:38 -06:00
parent 3b66b0f96d
commit e0b0d7ac30
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ionic/components/action-sheet/action-sheet.ts
View File

@ -87,6 +87,7 @@ class ActionSheetCmp {
constructor( constructor(
private _viewCtrl: ViewController, private _viewCtrl: ViewController,
private _config: Config,
params: NavParams, renderer: Renderer params: NavParams, renderer: Renderer
) { ) {
this.d = params.data; this.d = params.data;
@ -108,7 +109,9 @@ class ActionSheetCmp {
} }
if (shouldDismiss) { if (shouldDismiss) {
this.dismiss(); setTimeout(() => {
this.dismiss();
}, this._config.get('pageTransitionDelay'));
} }
} }

1
ionic/components/alert/alert.md.scss
View File

@ -75,6 +75,7 @@ $alert-md-buttons-justify-content: flex-end !default;
.alert-button { .alert-button {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
padding: 10px;
font-weight: 500; font-weight: 500;
color: $alert-md-button-text-color; color: $alert-md-button-text-color;
background-color: $alert-md-button-background-color; background-color: $alert-md-button-background-color;

7
ionic/components/alert/alert.ts
View File

@ -3,8 +3,8 @@ import {NgClass, NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
import {NavParams} from '../nav/nav-controller'; import {NavParams} from '../nav/nav-controller';
import {ViewController} from '../nav/view-controller'; import {ViewController} from '../nav/view-controller';
import {Config} from '../../config/config';
import {Animation} from '../../animations/animation'; import {Animation} from '../../animations/animation';
import {Button} from '../button/button';
import {isDefined} from '../../util/util'; import {isDefined} from '../../util/util';
@ -81,6 +81,7 @@ class AlertCmp {
constructor( constructor(
private _viewCtrl: ViewController, private _viewCtrl: ViewController,
private _elementRef: ElementRef, private _elementRef: ElementRef,
private _config: Config,
params: NavParams, params: NavParams,
renderer: Renderer renderer: Renderer
) { ) {
@ -103,7 +104,9 @@ class AlertCmp {
} }
if (shouldDismiss) { if (shouldDismiss) {
this.dismiss(); setTimeout(() => {
this.dismiss();
}, this._config.get('pageTransitionDelay'));
} }
} }