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

Merge pull request #4080 from dpalou/MOBILE-4470

Browse Source 
MOBILE-4470 remotethemes: Revert fix styles not loaded in offline
This commit is contained in:
Noel De Martin 2024-06-04 08:41:10 +02:00 committed by GitHub
commit 4704b63142
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/addons/calendar/tests/behat/create_events.feature
View File

@ -26,9 +26,8 @@ Feature: Test creation of calendar events in app
When I press "More" in the app
And I press "Calendar" in the app
And I press "New event" in the app
Then I should find "## now ##%b %e, %Y##" in the app
# Flaky step, sometimes it fails due to minute change when checking.
And I should find "## now ##%l:%M %p##" in the app
Then the field "Date" matches value "## now ##%Y-%m-%dT%H:%M##" in the app
And I should not be able to press "Save" in the app
# Check that student can only create User events.

3
src/core/features/login/pages/reconnect/reconnect.ts
View File

@ -144,7 +144,6 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
{
config: this.siteConfig,
loginSuccessful: this.loginSuccessful,
siteId: this.siteId,
},
this.siteId,
);
@ -181,7 +180,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
if (!this.eventThrown && !this.viewLeft) {
this.eventThrown = true;
CoreEvents.trigger(CoreEvents.LOGIN_SITE_CHECKED, { config: this.siteConfig, siteId: this.siteId });
CoreEvents.trigger(CoreEvents.LOGIN_SITE_CHECKED, { config: this.siteConfig });
}
this.isBrowserSSO = CoreLoginHelper.isSSOLoginNeeded(this.siteConfig.typeoflogin);

12
src/core/features/styles/services/styles.ts
View File

@ -148,15 +148,8 @@ export class CoreStylesService {
this.removeSite(site.getId());
});
// Load temporary styles when site config is checked in login/reconnect.
// Load temporary styles when site config is checked in login.
CoreEvents.on(CoreEvents.LOGIN_SITE_CHECKED, (data) => {
if (data.siteId) {
// Reconnecting to a site, enable the site styles.
this.enableSiteStyles(data.siteId);
return;
}
this.loadTmpStyles(data.config).catch((error) => {
this.logger.error('Error loading tmp styles', error);
});
@ -170,9 +163,8 @@ export class CoreStylesService {
return;
}
// User didn't access the site, unload tmp styles and site styles if any.
// The tmp styles are from a site that wasn't added in the end. Just remove them.
this.unloadTmpStyles();
this.clear();
});
}

2
src/core/singletons/events.ts
View File

@ -428,7 +428,6 @@ export type CoreEventActivityDataSentData = {
*/
export type CoreEventLoginSiteCheckedData = {
config: CoreSitePublicConfigResponse;
siteId?: string;
};
/**
@ -437,7 +436,6 @@ export type CoreEventLoginSiteCheckedData = {
export type CoreEventLoginSiteUncheckedData = {
config?: CoreSitePublicConfigResponse;
loginSuccessful: boolean;
siteId?: string;
};
/**