EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2145 from dpalou/MOBILE-3187 

MOBILE-3187 myoverview: Fix keyboard flicker on filter
main
Juan Leyva 2019-11-08 11:24:12 +01:00 committed by GitHub
parent cdd4876029 9c4d30c16f
commit fb5c9576b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
View File

@ -9,7 +9,7 @@
<ion-spinner *ngIf="!prefetchCoursesData[selectedFilter].icon || prefetchCoursesData[selectedFilter].icon == 'spinner'"></ion-spinner>
</div>
<core-context-menu item-end>
<core-context-menu-item *ngIf="loaded && showFilterSwitchButton()" [priority]="1000" [content]="'core.courses.filtermycourses' | translate" (action)="switchFilter()" iconAction="funnel"></core-context-menu-item>
<core-context-menu-item *ngIf="loaded && showFilterSwitchButton()" [priority]="1000" [content]="'core.courses.filtermycourses' | translate" (action)="switchFilter()" iconAction="funnel" (onClosed)="switchFilterClosed()"></core-context-menu-item>
<core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="900" content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.title' | translate)}}" (action)="switchSort('fullname')" [iconAction]="sort == 'fullname' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
<core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="800" content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.lastaccessed' | translate)}}" (action)="switchSort('lastaccess')" [iconAction]="sort == 'lastaccess' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
</core-context-menu>

8
src/addon/block/myoverview/components/myoverview/myoverview.ts
View File

@ -334,10 +334,16 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.showFilter = !this.showFilter;
this.courses.filter = '';
this.filteredCourses = this.courses[this.showFilter ? 'all' : this.selectedFilter];
}
/**
* Popover closed after clicking switch filter.
*/
switchFilterClosed(): void {
if (this.showFilter) {
setTimeout(() => {
this.searchbar.setFocus();
}, 500);
});
}
}

2
src/components/context-menu/context-menu-item.ts
View File

@ -51,12 +51,14 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
@Input() badgeClass?: number; // A class to set in the badge.
@Input() hidden?: boolean; // Whether the item should be hidden.
@Output() action?: EventEmitter<() => void>; // Will emit an event when the item clicked.
@Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
protected hasAction = false;
protected destroyed = false;
constructor(private ctxtMenu: CoreContextMenuComponent) {
this.action = new EventEmitter();
this.onClosed = new EventEmitter();
}
/**

12
src/components/context-menu/context-menu-popover.ts
View File

@ -40,8 +40,8 @@ export class CoreContextMenuPopoverComponent {
/**
* Close the popover.
*/
closeMenu(): void {
this.viewCtrl.dismiss();
closeMenu(item?: CoreContextMenuItemComponent): void {
this.viewCtrl.dismiss(item);
}
/**
@ -61,12 +61,12 @@ export class CoreContextMenuPopoverComponent {
}
if (item.closeOnClick) {
this.closeMenu();
this.closeMenu(item);
}
item.action.emit(this.closeMenu.bind(this));
} else if (item.href && item.closeOnClick) {
this.closeMenu();
item.action.emit(this.closeMenu.bind(this, item));
} else if (item.closeOnClick && (item.href || item.onClosed.observers.length > 0)) {
this.closeMenu(item);
}
return true;

6
src/components/context-menu/context-menu.ts
View File

@ -180,8 +180,12 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
const popover = this.popoverCtrl.create(CoreContextMenuPopoverComponent,
{ title: this.title, items: this.items, id: this.uniqueId, showBackdrop: true });
popover.onDidDismiss(() => {
popover.onDidDismiss((item: CoreContextMenuItemComponent) => {
this.expanded = false;
if (item) {
item.onClosed.emit();
}
});
popover.present({
ev: event