Skip to content

Commit

Permalink
[fix] Peer select modal : Show if GVA is enable
Browse files Browse the repository at this point in the history
[enh] Enable ES plugin by default
  • Loading branch information
blavenie committed Jul 26, 2019
1 parent 4a92287 commit f01f5dd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/app/shared/toolbar/toolbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<!-- search bar -->
<ion-searchbar #searchbar animated
type="search"
*ngIf="hasSearch"
[hidden]="!showSearchBar"
show-cancel-button="always"
(ionChange)="onSearch.emit($event)"
Expand All @@ -37,7 +38,7 @@
*ngIf="hasSearch && !showSearchBar">
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
<ion-button (click)="onValidate.emit($event)" *ngIf="mobile && hasValidate">
<ion-button (click)="onValidate.emit($event)" *ngIf="hasValidate">
<ion-icon slot="icon-only" name="checkmark"></ion-icon>
</ion-button>
</ion-buttons>
Expand Down
4 changes: 2 additions & 2 deletions src/app/shared/toolbar/toolbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class ToolbarComponent implements OnInit, OnDestroy {
defaultBackHref: string;

@Input()
hasValidate: boolean;
hasValidate = false;

@Input()
hasSearch: boolean;
Expand Down Expand Up @@ -78,7 +78,7 @@ export class ToolbarComponent implements OnInit, OnDestroy {

ngOnInit() {
this.mobile = toBoolean(this.mobile, this.platform.is('mobile'));
this.hasValidate = toBoolean(this.hasValidate, this.onValidate.observers.length > 0) && this.mobile;
this.hasValidate = this.hasValidate || this.onValidate.observers.length > 0 && this.mobile;
this.hasSearch = toBoolean(this.hasSearch, this.onSearch.observers.length > 0);
this.showSearchBar = false;
this._subscription = this.progressBarService.onProgressChanged
Expand Down
4 changes: 2 additions & 2 deletions src/app/wot/pages/wot-search.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"
class="mat-row-disabled"
(click)="clickRow($event, row)"></mat-row>
</mat-table>
></mat-row>
</mat-table><!-- -- (click)="clickRow($event, row)" -->

<!-- Paginator -->
<ion-row no-padding>
Expand Down

0 comments on commit f01f5dd

Please sign in to comment.