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

MOBILE-2431 renotethemes: Fix remote styles not enabled after adding a site

main
Albert Gasset 2018-06-19 13:00:28 +02:00
parent cbd1553438
commit ddac8483d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/addon/remotethemes/remotethemes.module.ts
View File

@ -54,8 +54,7 @@ export class AddonRemoteThemesModule {
load: remoteThemesProvider.preloadSites.bind(remoteThemesProvider) load: remoteThemesProvider.preloadSites.bind(remoteThemesProvider)
}); });
let addingSite, let addingSite;
unloadTmpStyles;
// When a new site is added to the app, add its styles. // When a new site is added to the app, add its styles.
eventsProvider.on(CoreEventsProvider.SITE_ADDED, (data) => { eventsProvider.on(CoreEventsProvider.SITE_ADDED, (data) => {
@ -68,9 +67,10 @@ export class AddonRemoteThemesModule {
addingSite = false; addingSite = false;
} }
if (unloadTmpStyles == data.siteId) { // User has logged in, remove tmp styles and enable loaded styles.
// This site had some tmp styles loaded, unload them. if (data.siteId == sitesProvider.getCurrentSiteId()) {
remoteThemesProvider.unloadTmpStyles(); remoteThemesProvider.unloadTmpStyles();
remoteThemesProvider.enable(data.siteId);
} }
}); });
}); });
@ -86,6 +86,7 @@ export class AddonRemoteThemesModule {
// Enable styles of current site on login. // Enable styles of current site on login.
eventsProvider.on(CoreEventsProvider.LOGIN, (data) => { eventsProvider.on(CoreEventsProvider.LOGIN, (data) => {
remoteThemesProvider.unloadTmpStyles();
remoteThemesProvider.enable(data.siteId); remoteThemesProvider.enable(data.siteId);
}); });
@ -106,10 +107,9 @@ export class AddonRemoteThemesModule {
// Unload temporary styles when site config is "unchecked" in login. // Unload temporary styles when site config is "unchecked" in login.
eventsProvider.on(CoreEventsProvider.LOGIN_SITE_UNCHECKED, (data) => { eventsProvider.on(CoreEventsProvider.LOGIN_SITE_UNCHECKED, (data) => {
if (data.siteId && data.siteid == addingSite) { if (data.siteId && data.siteId === addingSite) {
// The tmp styles are from a site that is being added permanently. // The tmp styles are from a site that is being added permanently.
// Wait for the final site styles to be loaded before removing the tmp styles so there is no blink effect. // Wait for the final site styles to be loaded before removing the tmp styles so there is no blink effect.
unloadTmpStyles = data.siteId;
} else { } else {
// The tmp styles are from a site that wasn't added in the end. Just remove them. // The tmp styles are from a site that wasn't added in the end. Just remove them.
remoteThemesProvider.unloadTmpStyles(); remoteThemesProvider.unloadTmpStyles();