diff --git a/demos/src/alert/pages/page-one/page-one.ts b/demos/src/alert/pages/page-one/page-one.ts
index 4d03164731..b25f5b177c 100644
--- a/demos/src/alert/pages/page-one/page-one.ts
+++ b/demos/src/alert/pages/page-one/page-one.ts
@@ -58,13 +58,13 @@ export class PageOne {
buttons: [
{
text: 'Cancel',
- handler: (data: any) => {
+ handler: (data) => {
console.log('Cancel clicked');
}
},
{
text: 'Save',
- handler: (data: any) => {
+ handler: (data) => {
console.log('Saved clicked');
}
}
diff --git a/demos/src/searchbar/pages/page-one/page-one.ts b/demos/src/searchbar/pages/page-one/page-one.ts
index b59d9042bb..be9d678779 100644
--- a/demos/src/searchbar/pages/page-one/page-one.ts
+++ b/demos/src/searchbar/pages/page-one/page-one.ts
@@ -16,7 +16,7 @@ export class PageOne {
filterItems(ev: any) {
this.setItems();
- let val = ev.target.value;
+ let val = ev.value;
if (val && val.trim() !== '') {
this.items = this.items.filter(function(item) {
diff --git a/src/components/alert/alert-options.ts b/src/components/alert/alert-options.ts
index 39cd2e8030..454b895ca6 100644
--- a/src/components/alert/alert-options.ts
+++ b/src/components/alert/alert-options.ts
@@ -28,5 +28,5 @@ export interface AlertButton {
text?: string;
role?: string;
cssClass?: string;
- handler?: Function;
+ handler?: (value: any) => boolean|void;
};
diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts
index b71bb510ed..3cf847fd7c 100644
--- a/src/components/checkbox/checkbox.ts
+++ b/src/components/checkbox/checkbox.ts
@@ -1,10 +1,10 @@
-import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, HostListener, Input, OnDestroy, Optional, Output, Renderer, ViewEncapsulation } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, forwardRef, HostListener, Input, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core';
+import { NG_VALUE_ACCESSOR } from '@angular/forms';
import { Config } from '../../config/config';
-import { Form, IonicTapInput } from '../../util/form';
-import { Ion } from '../ion';
import { isTrueProperty } from '../../util/util';
+import { Form, IonicTapInput } from '../../util/form';
+import { BaseInput } from '../../util/base-input';
import { Item } from '../item/item';
export const CHECKBOX_VALUE_ACCESSOR: any = {
@@ -54,14 +54,14 @@ export const CHECKBOX_VALUE_ACCESSOR: any = {
@Component({
selector: 'ion-checkbox',
template:
- '
' +
+ '
' +
'