Merge pull request #4109 from crazyserver/MOBILE-4619

MOBILE-4619 sites: Remove site classes on login unchecked
moodlehq · Jul 11, 2024 · 3400d18 · 3400d18
2 parents a842065 + 03e0c36
commit 3400d18
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/addons/remotethemes/services/remotethemes-handler.ts b/src/addons/remotethemes/services/remotethemes-handler.ts
@@ -54,7 +54,7 @@ export class AddonRemoteThemesHandlerService implements CoreStyleHandler {
      * @inheritDoc
      */
     async getStyle(siteId: string, config?: CoreSitePublicConfigResponse): Promise<string> {
-        if (siteId == CoreStylesService.TMP_SITE_ID) {
+        if (siteId === CoreStylesService.TMP_SITE_ID) {
             if (!config) {
                 return '';
             }

diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -261,10 +261,10 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
 
             if (error.loggedout) {
                 this.cancel();
-            } else if (error.errorcode == 'forcepasswordchangenotice') {
+            } else if (error.errorcode === 'forcepasswordchangenotice') {
                 // Reset password field.
                 this.credForm.controls.password.reset();
-            } else if (error.errorcode == 'invalidlogin') {
+            } else if (error.errorcode === 'invalidlogin') {
                 this.reconnectAttempts++;
             }
         } finally {

diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
@@ -79,7 +79,7 @@ export class CoreLoginSitePage implements OnInit {
     constructor(protected formBuilder: FormBuilder) {}
 
     /**
-     * Initialize the component.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         let url = '';

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
@@ -109,7 +109,7 @@ export class CoreSitesProvider {
     }
 
     /**
-     * Initialize.
+     * @inheritdoc
      */
     initialize(): void {
         // Initialize general site events.
@@ -160,6 +160,16 @@ export class CoreSitesProvider {
             CoreHTMLClasses.addSiteUrlClass(data.config.httpswwwroot);
         });
 
+        // Unload temporary styles when site config is "unchecked" in login.
+        CoreEvents.on(CoreEvents.LOGIN_SITE_UNCHECKED, ({ loginSuccessful }) => {
+            if (loginSuccessful) {
+                // The classes are already added in LOGIN_SITE_CHECKED.
+                return;
+            }
+
+            CoreHTMLClasses.removeSiteClasses();
+        });
+
         CoreEvents.on(CoreEvents.SITE_UPDATED, async (data) => {
             if (data.siteId !== CoreSites.getCurrentSiteId()) {
                 return;
@@ -647,7 +657,7 @@ export class CoreSitesProvider {
                 this.currentSite = site;
                 // Store session.
                 await this.login(siteId);
-            } else if (this.currentSite && this.currentSite.getId() == siteId) {
+            } else if (this.currentSite && this.currentSite.getId() === siteId) {
                 // Current site has just been updated, trigger the event.
                 CoreEvents.trigger(CoreEvents.SITE_UPDATED, info, siteId);
             }