composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

CombodoBackofficeToolbox.InitCodeHighlighting: Better protection as it was adding a log on every page with no attribute 💩

Browse Source
This commit is contained in:
Molkobain
2021-12-09 18:05:27 +01:00
parent 97cf0a2534
commit c1eb928893
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
js/pages/backoffice/toolbox.js
View File

@@ -134,12 +134,6 @@ const CombodoBackofficeToolbox = {
* @constructor
*/
InitCodeHighlighting: function (oContainerElem = null, bForce = false) {
// Check if the lib is loaded
if (typeof hljs === 'undefined') {
CombodoJSConsole.Error('Cannot format code snippets as the highlight.js lib is not loaded');
return;
}
if (oContainerElem === null) {
oContainerElem = $('body');
}
@@ -147,13 +141,28 @@ const CombodoBackofficeToolbox = {
const sComplementarySelector = bForce ? '' : ':not(.hljs)';
// AttributeHTML and HTML AttributeText
oContainerElem.find('[data-attribute-type="AttributeHTML"], [data-attribute-type="AttributeText"], [data-attribute-type="AttributeTemplateHTML"]').find('.HTML pre'+sComplementarySelector+' > code').parent().each(function (iIdx, oElem) {
hljs.highlightBlock(oElem);
});
let oCodeElements = oContainerElem.find('[data-attribute-type="AttributeHTML"], [data-attribute-type="AttributeText"], [data-attribute-type="AttributeTemplateHTML"]').find('.HTML pre'+sComplementarySelector+' > code');
if (oCodeElements.length > 0) {
if (typeof hljs === 'undefined') {
CombodoJSConsole.Error('Cannot format code snippets in HTML fields as the highlight.js lib is not loaded');
} else {
oCodeElements.parent().each(function (iIdx, oElem) {
hljs.highlightBlock(oElem);
});
}
}
// CaseLogs
oContainerElem.find('[data-role="ibo-activity-entry--main-information-content"] pre'+sComplementarySelector+' > code').parent().each(function (iIdx, oElem) {
hljs.highlightBlock(oElem);
});
oCodeElements = oContainerElem.find('[data-role="ibo-activity-entry--main-information-content"] pre'+sComplementarySelector+' > code');
if (oCodeElements.length > 0) {
if (typeof hljs === 'undefined') {
CombodoJSConsole.Error('Cannot format code snippets in log entries as the highlight.js lib is not loaded');
} else {
oCodeElements.parent().each(function (iIdx, oElem) {
hljs.highlightBlock(oElem);
});
}
}
}
};