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

Merge pull request #3773 from alfonso-salces/MOBILE-4385 

MOBILE-4385 side-blocks: Check if the html contain some tags
main
Pau Ferrer Ocaña 2023-08-23 15:46:40 +02:00 committed by GitHub
parent a4d2af2b92 55d7dc6c72
commit 47af5a252e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/features/block/components/side-blocks/side-blocks.ts
View File

@ -21,6 +21,7 @@ import { CoreBlockComponent } from '../block/block';
import { CoreUtils } from '@services/utils/utils'; import { CoreUtils } from '@services/utils/utils';
import { IonRefresher } from '@ionic/angular'; import { IonRefresher } from '@ionic/angular';
import { CoreCoursesDashboard } from '@features/courses/services/dashboard'; import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
import { CoreTextUtils } from '@services/utils/text';
/** /**
* Component that displays the list of side blocks. * Component that displays the list of side blocks.
@ -95,11 +96,7 @@ export class CoreBlockSideBlocksComponent implements OnInit {
} }
this.blocks = this.blocks.filter(block => this.blocks = this.blocks.filter(block =>
block.name !== 'html' || block.name !== 'html' || (block.contents && !CoreTextUtils.htmlIsBlank(block.contents.content)));
(
block.name === 'html' &&
!!block.contents?.content.trim().replace(/(\r\n|\n|\r)/, '').length
));
} }
/** /**

7
src/core/services/utils/text.ts
View File

@ -622,9 +622,12 @@ export class CoreTextUtilsProvider {
return true; return true;
} }
this.template.innerHTML = content; this.template.innerHTML = content.trim().replace(/(\r\n|\n|\r)/g, '');
const tags = this.template.content.querySelectorAll(
'img, audio, video, object, iframe, canvas, svg, input, select, textarea, frame, embed',
);
return this.template.content.textContent == '' && this.template.content.querySelector('img, object, hr') === null; return this.template.content.textContent === '' && tags.length === 0;
} }
/** /**