CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

MOBILE-3947 chore: Allow inner HTML templates

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2023-11-28 12:31:26 +01:00
parent 47d5eb5eaa
commit 2db3635882
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.module.ts
View File

@ -52,6 +52,8 @@ export function createTranslateLoader(http: HttpClient): TranslateHttpLoader {
IonicModule.forRoot( IonicModule.forRoot(
{ {
navAnimation: moodleTransitionAnimation, navAnimation: moodleTransitionAnimation,
innerHTMLTemplatesEnabled: true,
sanitizerEnabled: true,
}, },
), ),
HttpClientModule, // HttpClient is used to make JSON requests. It fails for HEAD requests because there is no content. HttpClientModule, // HttpClient is used to make JSON requests. It fails for HEAD requests because there is no content.

2
src/core/features/login/pages/site/site.ts
View File

@ -459,8 +459,8 @@ export class CoreLoginSitePage implements OnInit {
}); });
if (errorDetails) { if (errorDetails) {
// Avoid sanitizing JS.
const containerElement = alertElement.querySelector('.core-error-info-container'); const containerElement = alertElement.querySelector('.core-error-info-container');
if (containerElement) { if (containerElement) {
containerElement.innerHTML = CoreErrorInfoComponent.render(errorDetails, errorCode); containerElement.innerHTML = CoreErrorInfoComponent.render(errorDetails, errorCode);
} }

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

@ -815,14 +815,20 @@ export class CoreDomUtilsProvider {
* @returns Promise resolved with the alert modal. * @returns Promise resolved with the alert modal.
*/ */
async showAlertWithOptions(options: AlertOptions = {}, autocloseTime?: number): Promise<HTMLIonAlertElement> { async showAlertWithOptions(options: AlertOptions = {}, autocloseTime?: number): Promise<HTMLIonAlertElement> {
const hasHTMLTags = CoreTextUtils.hasHTMLTags(<string> options.message || ''); let message = typeof options.message == 'string'
? options.message
: options.message?.value || '';
const hasHTMLTags = CoreTextUtils.hasHTMLTags(message);
if (hasHTMLTags && !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.7')) { if (hasHTMLTags && !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.7')) {
// Treat multilang. // Treat multilang.
options.message = await CoreLang.filterMultilang(<string> options.message); message = await CoreLang.filterMultilang(message);
} }
const alertId = <string> Md5.hashAsciiStr((options.header || '') + '#' + (options.message || '')); options.message = message;
const alertId = Md5.hashAsciiStr((options.header || '') + '#' + (message|| ''));
if (this.displayedAlerts[alertId]) { if (this.displayedAlerts[alertId]) {
// There's already an alert with the same message and title. Return it. // There's already an alert with the same message and title. Return it.