javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update overlays

Browse Source
This commit is contained in:
Adam Bradley
2015-06-18 15:43:21 -05:00
parent e32f2f72e3
commit 079fb3c6c9
5 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ionic/components/overlay/overlay.js
View File

@@ -8,7 +8,7 @@ export class Overlay {
/* Instance Methods */
open(animation) {
animation = animation || this._opts.enterAnimation;
animation = animation || this.options.enterAnimation;
let enterAnimation = Animation.create(this.domElement, animation);
ClickBlock(true, enterAnimation.duration() + 200);
@@ -23,7 +23,7 @@ export class Overlay {
close(animation) {
return new Promise(resolve => {
animation = animation || this._opts.leaveAnimation;
animation = animation || this.options.leaveAnimation;
let leavingAnimation = Animation.create(this.domElement, animation);
leavingAnimation.play().then(() => {
@@ -34,9 +34,9 @@ export class Overlay {
});
}
setOptions(opts) {
if (!this._opts) this._opts = {};
util.extend(this._opts, opts);
extendOptions(opts) {
if (!this.options) this.options = {};
util.extend(this.options, opts);
}
_clean() {
@@ -46,14 +46,18 @@ export class Overlay {
/* Static Methods */
static create(ComponentType: Type, opts) {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
IonicRoot.append(ComponentType).then((ref) => {
let overlay = ref.instance;
overlay._dispose = ref.dispose;
overlay.domElement = ref.elementRef.domElement;
overlay.setOptions(opts);
overlay.extendOptions(opts);
overlay.open();
resolve(overlay);
}).catch(err => {
console.error('Overlay create:', err);
reject(err);
});
});
}