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

Merge pull request #3616 from crazyserver/MOBILE-4187 

Mobile 4187
main
Noel De Martin 2023-04-19 13:39:33 +02:00 committed by GitHub
parent 825c1617f1 015d0c42f3
commit 546dd59693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/app.component.ts
View File

@ -52,7 +52,7 @@ export class AppComponent implements OnInit, AfterViewInit {
ngOnInit(): void { ngOnInit(): void {
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
const win = <any> window; const win = <any> window;
CoreDomUtils.toggleModeClass('ionic5', true); CoreDomUtils.toggleModeClass('ionic5', true, { includeLegacy: true });
this.addVersionClass(MOODLEAPP_VERSION_PREFIX, CoreConstants.CONFIG.versionname.replace('-dev', '')); this.addVersionClass(MOODLEAPP_VERSION_PREFIX, CoreConstants.CONFIG.versionname.replace('-dev', ''));
CoreEvents.on(CoreEvents.LOGOUT, async () => { CoreEvents.on(CoreEvents.LOGOUT, async () => {
@ -212,22 +212,22 @@ export class AppComponent implements OnInit, AfterViewInit {
const isOnline = CoreNetwork.isOnline(); const isOnline = CoreNetwork.isOnline();
const hadOfflineMessage = CoreDomUtils.hasModeClass('core-offline'); const hadOfflineMessage = CoreDomUtils.hasModeClass('core-offline');
CoreDomUtils.toggleModeClass('core-offline', !isOnline); CoreDomUtils.toggleModeClass('core-offline', !isOnline, { includeLegacy: true });
if (isOnline && hadOfflineMessage) { if (isOnline && hadOfflineMessage) {
CoreDomUtils.toggleModeClass('core-online', true); CoreDomUtils.toggleModeClass('core-online', true, { includeLegacy: true });
setTimeout(() => { setTimeout(() => {
CoreDomUtils.toggleModeClass('core-online', false); CoreDomUtils.toggleModeClass('core-online', false, { includeLegacy: true });
}, 3000); }, 3000);
} else if (!isOnline) { } else if (!isOnline) {
CoreDomUtils.toggleModeClass('core-online', false); CoreDomUtils.toggleModeClass('core-online', false, { includeLegacy: true });
} }
}); });
}); });
const isOnline = CoreNetwork.isOnline(); const isOnline = CoreNetwork.isOnline();
CoreDomUtils.toggleModeClass('core-offline', !isOnline); CoreDomUtils.toggleModeClass('core-offline', !isOnline, { includeLegacy: true });
// Set StatusBar properties. // Set StatusBar properties.
CoreApp.setStatusBarColor(); CoreApp.setStatusBarColor();
@ -256,9 +256,9 @@ export class AppComponent implements OnInit, AfterViewInit {
parts[1] = parts[1] || '0'; parts[1] = parts[1] || '0';
parts[2] = parts[2] || '0'; parts[2] = parts[2] || '0';
CoreDomUtils.toggleModeClass(prefix + parts[0], true); CoreDomUtils.toggleModeClass(prefix + parts[0], true, { includeLegacy: true });
CoreDomUtils.toggleModeClass(prefix + parts[0] + '-' + parts[1], true); CoreDomUtils.toggleModeClass(prefix + parts[0] + '-' + parts[1], true, { includeLegacy: true });
CoreDomUtils.toggleModeClass(prefix + parts[0] + '-' + parts[1] + '-' + parts[2], true); CoreDomUtils.toggleModeClass(prefix + parts[0] + '-' + parts[1] + '-' + parts[2], true, { includeLegacy: true });
} }
/** /**
@ -272,7 +272,7 @@ export class AppComponent implements OnInit, AfterViewInit {
continue; continue;
} }
CoreDomUtils.toggleModeClass(modeClass, false); CoreDomUtils.toggleModeClass(modeClass, false, { includeLegacy: true });
} }
} }
@ -291,7 +291,7 @@ export class AppComponent implements OnInit, AfterViewInit {
return ''; return '';
} }
let className = parsedUrl.domain?.replace('.', '-') || ''; let className = parsedUrl.domain?.replace(/\./g, '-') || '';
if (parsedUrl.port) { if (parsedUrl.port) {
className += `--${parsedUrl.port}`; className += `--${parsedUrl.port}`;
@ -301,7 +301,7 @@ export class AppComponent implements OnInit, AfterViewInit {
const trailing = new RegExp('/+$'); const trailing = new RegExp('/+$');
const path = parsedUrl.path.replace(leading, '').replace(trailing, ''); const path = parsedUrl.path.replace(leading, '').replace(trailing, '');
if (path) { if (path) {
className += '--' + path.replace('/', '-'); className += '--' + path.replace(/\//g, '-') || '';
} }
} }

2
src/core/features/settings/services/settings-helper.ts
View File

@ -462,7 +462,7 @@ export class CoreSettingsHelperProvider {
const isDark = CoreDomUtils.hasModeClass('dark'); const isDark = CoreDomUtils.hasModeClass('dark');
if (isDark !== enable) { if (isDark !== enable) {
CoreDomUtils.toggleModeClass('dark', enable); CoreDomUtils.toggleModeClass('dark', enable, { includeLegacy: true });
this.darkModeObservable.next(enable); this.darkModeObservable.next(enable);
CoreApp.setStatusBarColor(); CoreApp.setStatusBarColor();

9
src/core/services/utils/dom.ts
View File

@ -2034,12 +2034,17 @@ export class CoreDomUtilsProvider {
* *
* @param className Class name. * @param className Class name.
* @param enable Whether to add or remove the class. * @param enable Whether to add or remove the class.
* @param options Legacy options, deprecated since 4.1.
*/ */
toggleModeClass(className: string, enable?: boolean): void { toggleModeClass(
className: string,
enable = false,
options: { includeLegacy: boolean } = { includeLegacy: false },
): void {
document.documentElement.classList.toggle(className, enable); document.documentElement.classList.toggle(className, enable);
// @deprecated since 4.1 // @deprecated since 4.1
document.body.classList.toggle(className, enable); document.body.classList.toggle(className, enable && options.includeLegacy);
} }
} }