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

fix(popup): copied over the defaults so that the users opts will override them

Browse Source 
This way if we want to let the user pass an animation for an individual
popup we can use that animation they pass over the default ones. Fixes
#342
This commit is contained in:
Brandy Carney
2015-10-29 13:56:01 -04:00
parent 196fbe2e01
commit 4f81e5b8c8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/popup/popup.ts
View File

@@ -82,7 +82,9 @@ export class Popup {
opts.promiseResolve = resolve;
opts.promiseReject = reject;
return this.ctrl.open(OVERLAY_TYPE, PopupCmp, util.extend(opts, this._defaults));
let defaults = util.merge({}, this._defaults);
return this.ctrl.open(OVERLAY_TYPE, PopupCmp, util.extend(defaults, opts));
});
}