Merge pull request #42 from ionic-team/master

pull `master`
abennouna · Jan 19, 2019 · f0ed0f9 · f0ed0f9
2 parents 11e8db9 + 7832be3
commit f0ed0f9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/angular/test/test-app/package-lock.json b/angular/test/test-app/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -33,7 +33,7 @@
     "ionicons": "4.5.1"
   },
   "devDependencies": {
-    "@stencil/core": "0.16.3",
+    "@stencil/core": "0.17.0",
     "@stencil/sass": "0.1.1",
     "@stencil/utils": "latest",
     "@types/jest": "^23.3.1",

diff --git a/core/src/components/button/button.tsx b/core/src/components/button/button.tsx
@@ -104,7 +104,7 @@ export class Button implements ComponentInterface {
   @Listen('click')
   onClick(ev: Event) {
     if (this.type === 'button') {
-      return openURL(this.win, this.href, ev, this.routerDirection);
+      openURL(this.win, this.href, ev, this.routerDirection);
 
     } else if (hasShadowDom(this.el)) {
       // this button wants to specifically submit a form
@@ -122,7 +122,6 @@ export class Button implements ComponentInterface {
         fakeButton.remove();
       }
     }
-    return Promise.resolve(false);
   }
 
   private onFocus = () => {

diff --git a/core/src/components/toast/toast.tsx b/core/src/components/toast/toast.tsx
@@ -187,7 +187,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
             <div class="toast-message">{this.message}</div>
           }
           {this.showCloseButton &&
-            <ion-button fill="clear" class="toast-button ion-activatable" onClick={() => this.dismiss(undefined, 'cancel')}>
+            <ion-button fill="clear" class="toast-button" onClick={() => this.dismiss(undefined, 'cancel')}>
               {this.closeButtonText || 'Close'}
             </ion-button>
           }