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

MOBILE-2903 menu: Disable responsive menu items is set on site

main
Pau Ferrer Ocaña 2019-05-02 11:59:22 +02:00
parent 809753aac1
commit 12d75f14b2
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ion-tabs/core-ion-tabs.html
View File

@ -1,5 +1,5 @@
<div class="tabbar" role="tablist" #tabbar [hidden]="hidden"> <div class="tabbar" role="tablist" #tabbar [hidden]="hidden">
<a [hidden]="_loaded === false" *ngFor="let t of _tabs" [tab]="t" class="tab-button" role="tab" href="#" (ionSelect)="select(t)" [attr.aria-hidden]="!t.show" [attr.aria-label]="t.tabTitle || ''"></a> <a [hidden]="_loaded === false" *ngFor="let t of _tabs" [tab]="t" class="tab-button" role="tab" href="#" (ionSelect)="select(t)" [attr.aria-hidden]="!t.show" [attr.aria-label]="t.tabTitle || ''" [title]="t.tabTitle || ''"></a>
<div class="tab-highlight"></div> <div class="tab-highlight"></div>
<div *ngIf="_loaded === false" class="core-ion-tabs-loading"> <div *ngIf="_loaded === false" class="core-ion-tabs-loading">
<span class="core-ion-tabs-loading-spinner"> <span class="core-ion-tabs-loading-spinner">

13
src/core/mainmenu/providers/mainmenu.ts
View File

@ -170,7 +170,7 @@ export class CoreMainMenuProvider {
* @return {number} Number of items depending on the device width. * @return {number} Number of items depending on the device width.
*/ */
getNumItems(): number { getNumItems(): number {
if (window && window.innerWidth) { if (!this.isResponsiveMainMenuItemsDisabledInCurrentSite() && window && window.innerWidth) {
let numElements; let numElements;
if (this.tablet) { if (this.tablet) {
@ -207,4 +207,15 @@ export class CoreMainMenuProvider {
return tablet ? 'side' : 'bottom'; return tablet ? 'side' : 'bottom';
} }
/**
* Check if responsive main menu items is disabled in the current site.
*
* @return {boolean} Whether it's disabled.
*/
protected isResponsiveMainMenuItemsDisabledInCurrentSite(): boolean {
const site = this.sitesProvider.getCurrentSite();
return site && site.isFeatureDisabled('NoDelegate_ResponsiveMainMenuItems');
}
} }