From f158bf95a8814dfb5c1f4fca81dc6e92a2dec540 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 2 Oct 2015 12:19:59 -0400 Subject: [PATCH] chore(popup): Removing opts variable as it isn't used Fixing iOS styling. References #183 --- ionic/components/popup/modes/ios.scss | 2 +- ionic/components/popup/popup.ts | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ionic/components/popup/modes/ios.scss b/ionic/components/popup/modes/ios.scss index 04ddd2379e..9729194054 100644 --- a/ionic/components/popup/modes/ios.scss +++ b/ionic/components/popup/modes/ios.scss @@ -5,7 +5,7 @@ $popup-ios-max-width: 84% !default; $popup-ios-background: rgba(0,0,0,0) !default; $popup-ios-border-radius: 13px !default; -$popup-ios-background-color: rgba(255,255,255,0.85) !default; +$popup-ios-background-color: #f8f8f8 !default; $popup-ios-head-text-align: center !default; $popup-ios-title-font-size: 17px !default; diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts index 60d877fb7b..a3d3871af6 100644 --- a/ionic/components/popup/popup.ts +++ b/ionic/components/popup/popup.ts @@ -52,10 +52,9 @@ export class Popup extends Overlay { /** * TODO * @param {TODO} context TODO - * @param {TODO} [opts={}] TODO * @returns {TODO} TODO */ - popup(context, opts={}) { + popup(context) { return new Promise((resolve, reject)=> { let config = this.config; let defaults = { @@ -66,18 +65,16 @@ export class Popup extends Overlay { context.promiseResolve = resolve; context.promiseReject = reject; - return this.create(OVERLAY_TYPE, StandardPopup, util.extend(defaults, opts), context); + return this.create(OVERLAY_TYPE, StandardPopup, defaults, context); }); } /** * TODO * @param {TODO} context TODO - * @param {TODO} [opts={}] TODO * @returns {TODO} TODO */ - alert(context={}, opts={}) { - console.log(context, opts); + alert(context={}) { if (typeof context === 'string') { context = { title: context @@ -100,16 +97,15 @@ export class Popup extends Overlay { ] }, context); - return this.popup(context, opts); + return this.popup(context); } /** * TODO * @param {TODO} context TODO - * @param {TODO} [opts={}] TODO * @returns {TODO} TODO */ - confirm(context={}, opts={}) { + confirm(context={}) { if (typeof context === 'string') { context = { title: context @@ -137,16 +133,15 @@ export class Popup extends Overlay { cancelButton, okButton ] }, context); - return this.popup(context, opts); + return this.popup(context); } /** * TODO * @param {TODO} [context={}] TODO - * @param {TODO} [opts={}] TODO * @returns {TODO} TODO */ - prompt(context={}, opts={}) { + prompt(context={}) { if (typeof context === 'string') { context = { title: context @@ -179,13 +174,12 @@ export class Popup extends Overlay { ] }, context); - return this.popup(context, opts); + return this.popup(context); } /** * TODO * @param {TODO} context TODO - * @param {TODO} [opts={}] TODO * @returns {TODO} TODO */ get(handle) {