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(searchbar): add click events back for safari

Browse Source 
references #731
This commit is contained in:
Brandy Carney
2015-12-14 12:37:37 -05:00
parent 4175edcbd8
commit 44508a3234
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/searchbar/searchbar.ios.scss
View File

@@ -32,6 +32,7 @@ $searchbar-ios-input-clear-icon-size: 18px !default;
ion-searchbar {
padding: $searchbar-ios-padding-top-bottom $searchbar-ios-padding-left-right;
background: $searchbar-ios-background-color;
border-top: 1px solid transparent;
border-bottom: 1px solid $searchbar-ios-border-color;
min-height: $searchbar-ios-min-height;
}
@@ -103,6 +104,7 @@ ion-searchbar {
min-height: 30px;
margin-left: 0;
margin-right: 0;
padding: 0;
visibility: hidden;

11
ionic/components/searchbar/searchbar.ts
View File

@@ -40,12 +40,14 @@ import {Button} from '../button/button';
},
template:
'<div class="searchbar-input-container">' +
'<button (mousedown)="cancelSearchbar($event, query)" clear dark class="searchbar-md-cancel"><icon arrow-back></icon></button>' +
'<button (click)="cancelSearchbar($event, query)" (mousedown)="cancelSearchbar($event, query)" clear dark class="searchbar-md-cancel">' +
'<icon arrow-back></icon>' +
'</button>' +
'<div class="searchbar-search-icon"></div>' +
'<input [value]="query" (blur)="inputBlurred($event)" (focus)="inputFocused()" class="searchbar-input" type="search" [attr.placeholder]="placeholder">' +
'<button clear *ngIf="query" class="searchbar-clear-icon" (mousedown)="clearInput()"></button>' +
'<button clear *ngIf="query" class="searchbar-clear-icon" (click)="clearInput()" (mousedown)="clearInput()"></button>' +
'</div>' +
'<button clear (mousedown)="cancelSearchbar($event)" [hidden]="hideCancelButton" class="searchbar-ios-cancel">{{cancelButtonText}}</button>',
'<button clear (click)="cancelSearchbar($event)" (mousedown)="cancelSearchbar($event)" [hidden]="hideCancelButton" class="searchbar-ios-cancel">{{cancelButtonText}}</button>',
directives: [FORM_DIRECTIVES, NgIf, NgClass, Icon, Button, forwardRef(() => SearchbarInput)]
})
export class Searchbar extends Ion {
@@ -118,6 +120,7 @@ export class Searchbar extends Ion {
this.blurInput = true;
return;
}
//console.log("Blurring input");
this.isFocused = false;
this.shouldLeftAlign = this.searchbarInput.value && this.searchbarInput.value.trim() != '';
}
@@ -127,6 +130,7 @@ export class Searchbar extends Ion {
* Clears the input field and triggers the control change.
*/
clearInput() {
//console.log("Clearing input");
this.searchbarInput.writeValue('');
this.searchbarInput.onChange('');
this.blurInput = false;
@@ -139,6 +143,7 @@ export class Searchbar extends Ion {
* then calls the custom cancel function if the user passed one in.
*/
cancelSearchbar(event, value) {
//console.log("Cancel searchbar");
this.clearInput();
this.blurInput = true;