From d4c23424148164665d9bfcf19f894c63c49025b3 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 5 Oct 2015 12:37:46 -0400
Subject: [PATCH 1/2] feat(button): Added ability to give the button a "type"
 which will be converted to an attribute.

Note this is working for basic buttons but breaks in the popup
currently, that is a TODO. Changed the default to types for the popup
to an empty string. Closes #183
---
 ionic/components/button/button.ts          | 11 +++++++--
 ionic/components/popup/popup.ts            | 26 +++++++++++-----------
 ionic/components/popup/test/basic/index.ts |  3 +--
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ionic/components/button/button.ts b/ionic/components/button/button.ts
index 9151012bf9..b0d45f3004 100644
--- a/ionic/components/button/button.ts
+++ b/ionic/components/button/button.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef} from 'angular2/angular2';
+import {Directive, ElementRef, Renderer} from 'angular2/angular2';
 
 import {IonicConfig} from '../../config/config';
 
@@ -13,7 +13,8 @@ export class Button {
 
   constructor(
     config: IonicConfig,
-    elementRef: ElementRef
+    elementRef: ElementRef,
+    renderer: Renderer
   ) {
     let element = elementRef.nativeElement;
 
@@ -21,6 +22,12 @@ export class Button {
       element.classList.add('disable-hover');
     }
 
+    // TODO this isn't working in the popup
+    if (element.hasAttribute('type')) {
+      let type = element.getAttribute("type");
+      renderer.setElementAttribute(elementRef, type, "");
+    }
+
     if (element.hasAttribute('ion-item')) {
       // no need to put on these icon classes for an ion-item
       return;
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index e9b1c75b57..05f818c336 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -4,6 +4,7 @@ import {FORM_DIRECTIVES, NgControl, NgControlGroup,
 import {Overlay} from '../overlay/overlay';
 import {Animation} from '../../animations/animation';
 import {Ion} from '../ion';
+import {Button} from '../button/button';
 import * as util from 'ionic/util';
 
 
@@ -99,7 +100,7 @@ export class Popup extends Overlay {
    *   template: '', // String (optional). The html template to place in the popup body.
    *   templateUrl: '', // String (optional). The URL of an html template to place in the popup body.
    *   okText: '', // String (default: 'OK'). The text of the OK button.
-   *   okType: '', // String (default: 'primary'). The type of the OK button.
+   *   okType: '', // String (default: ''). The type of the OK button.
    * }
    * ```
    *
@@ -113,7 +114,7 @@ export class Popup extends Overlay {
     }
     let button = {
       text: opts.okText || 'OK',
-      type: opts.okType || 'primary',
+      type: opts.okType || '',
       onTap: (event, popupRef) => {
         // Allow it to close
         //resolve();
@@ -146,9 +147,9 @@ export class Popup extends Overlay {
    *   template: '', // String (optional). The html template to place in the popup body.
    *   templateUrl: '', // String (optional). The URL of an html template to place in the popup body.
    *   cancelText: '', // String (default: 'Cancel'). The text of the Cancel button.
-   *   cancelType: '', // String (default: 'primary'). The type of the Cancel button.
+   *   cancelType: '', // String (default: ''). The type of the Cancel button.
    *   okText: '', // String (default: 'OK'). The text of the OK button.
-   *   okType: '', // String (default: 'primary'). The type of the OK button.
+   *   okType: '', // String (default: ''). The type of the OK button.
    * }
    * ```
    *
@@ -162,14 +163,14 @@ export class Popup extends Overlay {
     }
     let okButton = {
       text: opts.okText || 'OK',
-      type: opts.okType || 'primary',
+      type: opts.okType || '',
       onTap: (event, popupRef) => {
         // Allow it to close
       }
     }
     let cancelButton = {
       text: opts.cancelText || 'Cancel',
-      type: opts.cancelType || 'primary',
+      type: opts.cancelType || '',
       isCancel: true,
       onTap: (event, popupRef) => {
         // Allow it to close
@@ -202,9 +203,9 @@ export class Popup extends Overlay {
    *   inputType: // String (default: 'text'). The type of input to use.
    *   inputPlaceholder: // String (default: ''). A placeholder to use for the input.
    *   cancelText: '', // String (default: 'Cancel'). The text of the Cancel button.
-   *   cancelType: '', // String (default: 'primary'). The type of the Cancel button.
+   *   cancelType: '', // String (default: ''). The type of the Cancel button.
    *   okText: '', // String (default: 'OK'). The text of the OK button.
-   *   okType: '', // String (default: 'primary'). The type of the OK button.
+   *   okType: '', // String (default: ''). The type of the OK button.
    * }
    * ```
    *
@@ -218,7 +219,7 @@ export class Popup extends Overlay {
     }
     let okButton = {
       text: opts.okText || 'OK',
-      type: opts.okType || 'primary',
+      type: opts.okType || '',
       onTap: (event, popupRef) => {
         // Allow it to close
       }
@@ -226,7 +227,7 @@ export class Popup extends Overlay {
 
     let cancelButton = {
       text: opts.cancelText || 'Cancel',
-      type: opts.cancelType || 'primary',
+      type: opts.cancelType || '',
       isCancel: true,
       onTap: (event, popupRef) => {
         // Allow it to close
@@ -262,7 +263,6 @@ export class Popup extends Overlay {
 
 const OVERLAY_TYPE = 'popup';
 
-
 @Component({
   selector: 'ion-popup-default'
 })
@@ -279,10 +279,10 @@ const OVERLAY_TYPE = 'popup';
       '<input type="{{inputType || \'text\'}}" placeholder="{{inputPlaceholder}}" *ng-if="showPrompt" class="prompt-input">' +
     '</div>' +
     '<div class="popup-buttons" *ng-if="buttons.length">' +
-      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [inner-html]="button.text"></button>' +
+      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [inner-html]="button.text" [type]="button.type"></button>' +
     '</div>' +
   '</popup-wrapper>',
-  directives: [FORM_DIRECTIVES, NgClass, NgIf, NgFor]
+  directives: [FORM_DIRECTIVES, NgClass, NgIf, NgFor, Button]
 })
 
 class StandardPopup {
diff --git a/ionic/components/popup/test/basic/index.ts b/ionic/components/popup/test/basic/index.ts
index 4a5e9a2e76..1f22c5c096 100644
--- a/ionic/components/popup/test/basic/index.ts
+++ b/ionic/components/popup/test/basic/index.ts
@@ -32,8 +32,7 @@ class E2EApp {
       title: "New Album",
       template: "Enter a name for this new album you're so keen on adding",
       inputPlaceholder: "Title",
-      okText: "Save",
-      okType: "secondary"
+      okText: "Save"
     }).then((name) => {
       this.promptResult = name;
       this.promptOpen = false;

From 649e76167fa7dfcd85a2321e1d548ccaf707c3e8 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 5 Oct 2015 12:41:47 -0400
Subject: [PATCH 2/2] fix(popup): Removed button type, it's throwing console
 errors

References #183
---
 ionic/components/popup/popup.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index 05f818c336..49f8a510bd 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -266,6 +266,7 @@ const OVERLAY_TYPE = 'popup';
 @Component({
   selector: 'ion-popup-default'
 })
+// TODO add button type to button: [type]="button.type"
 @View({
   template:
   '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
@@ -279,7 +280,7 @@ const OVERLAY_TYPE = 'popup';
       '<input type="{{inputType || \'text\'}}" placeholder="{{inputPlaceholder}}" *ng-if="showPrompt" class="prompt-input">' +
     '</div>' +
     '<div class="popup-buttons" *ng-if="buttons.length">' +
-      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [inner-html]="button.text" [type]="button.type"></button>' +
+      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [inner-html]="button.text"></button>' +
     '</div>' +
   '</popup-wrapper>',
   directives: [FORM_DIRECTIVES, NgClass, NgIf, NgFor, Button]