-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
229 additions
and
65 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
/** | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU General Public License | ||
* as published by the Free Software Foundation; under version 2 | ||
* of the License (non-upgradable). | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program; if not, write to the Free Software | ||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
* | ||
* Copyright (c) 2023 (original work) Open Assessment Technologies SA; | ||
*/ | ||
define(function () { | ||
'use strict'; | ||
|
||
const autogeneratedCodeStartCommentText = ' autogenerated code, do not edit '; | ||
const autogeneratedCodeEndCommentText = ' end of autogenerated code '; | ||
const autogeneratedCodeStartComment = `<!--${autogeneratedCodeStartCommentText}-->`; | ||
const autogeneratedCodeEndComment = `<!--${autogeneratedCodeEndCommentText}-->`; | ||
|
||
const isCommentNode = (node, text) => | ||
node && | ||
node.nodeType === Node.COMMENT_NODE && | ||
node.textContent && | ||
decodeURIComponent(node.textContent).includes(text); | ||
|
||
const findAutogeneratedCodeCommentSibling = (el, siblingDirection) => { | ||
let commentNode = null; | ||
const siblingNode = el[siblingDirection]; | ||
const commentsByDirection = { | ||
previousSibling: autogeneratedCodeStartCommentText, | ||
nextSibling: autogeneratedCodeEndCommentText | ||
}; | ||
|
||
if (!siblingNode) { | ||
return null; | ||
} | ||
|
||
if (siblingNode.textContent && siblingNode.textContent.trim().length === 0) { | ||
commentNode = findAutogeneratedCodeCommentSibling(siblingNode, siblingDirection); | ||
} else { | ||
//ckeditor wraps comments and URIEncodes it | ||
//so that is the reason to use decodeURIComponent | ||
if (isCommentNode(siblingNode, commentsByDirection[siblingDirection])) { | ||
commentNode = siblingNode; | ||
} | ||
} | ||
return commentNode; | ||
}; | ||
|
||
const isWrapped = $el => | ||
findAutogeneratedCodeCommentSibling($el[0], 'previousSibling') && | ||
findAutogeneratedCodeCommentSibling($el[0], 'nextSibling'); | ||
|
||
return { | ||
wrapWithAutogeneratedComment: $el => { | ||
if (!isWrapped($el)) { | ||
$el.before(autogeneratedCodeStartComment); | ||
$el.after(autogeneratedCodeEndComment); | ||
} | ||
}, | ||
|
||
removeAutogeneratedComments: text => { | ||
return text.replaceAll(autogeneratedCodeStartComment, '').replaceAll(autogeneratedCodeEndComment, ''); | ||
}, | ||
|
||
removeAutogeneratedCommentNodes: el => { | ||
const prevCommentNode = findAutogeneratedCodeCommentSibling(el, 'previousSibling'); | ||
const nextCommentNode = findAutogeneratedCodeCommentSibling(el, 'nextSibling'); | ||
if (prevCommentNode) { | ||
prevCommentNode.remove(); | ||
} | ||
if (nextCommentNode) { | ||
nextCommentNode.remove(); | ||
} | ||
} | ||
}; | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/** | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU General Public License | ||
* as published by the Free Software Foundation; under version 2 | ||
* of the License (non-upgradable). | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program; if not, write to the Free Software | ||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
* | ||
* Copyright (c) 2023 (original work) Open Assessment Technologies SA; | ||
*/ | ||
define(function () { | ||
'use strict'; | ||
|
||
const autogeneratedCodeStartCommentText = ' autogenerated code, do not edit '; | ||
const autogeneratedCodeEndCommentText = ' end of autogenerated code '; | ||
const autogeneratedCodeStartComment = `<!--${autogeneratedCodeStartCommentText}-->`; | ||
const autogeneratedCodeEndComment = `<!--${autogeneratedCodeEndCommentText}-->`; | ||
|
||
const isCommentNode = (node, text) => | ||
node && | ||
node.nodeType === Node.COMMENT_NODE && | ||
node.textContent && | ||
decodeURIComponent(node.textContent).includes(text); | ||
|
||
const hasAutogeneratedCodeCommentSibling = (el, siblingDirection) => { | ||
let commentFound = false; | ||
const siblingNode = el[siblingDirection]; | ||
const commentsByDirection = { | ||
previousSibling: autogeneratedCodeStartCommentText, | ||
nextSibling: autogeneratedCodeEndCommentText | ||
}; | ||
|
||
if (!siblingNode) { | ||
return false; | ||
} | ||
|
||
if (siblingNode.textContent && siblingNode.textContent.trim().length === 0) { | ||
commentFound = hasAutogeneratedCodeCommentSibling(siblingNode, siblingDirection); | ||
} else { | ||
//ckeditor wraps comments and URIEncodes it | ||
//so that is the reason to use decodeURIComponent | ||
commentFound = isCommentNode(siblingNode, commentsByDirection[siblingDirection]); | ||
} | ||
return commentFound; | ||
}; | ||
|
||
const isWrapped = $el => | ||
hasAutogeneratedCodeCommentSibling($el[0], 'previousSibling') && | ||
hasAutogeneratedCodeCommentSibling($el[0], 'nextSibling'); | ||
|
||
return { | ||
wrapWithAutogeneratedComment: $el => { | ||
if (!isWrapped($el)) { | ||
$el.before(autogeneratedCodeStartComment); | ||
$el.after(autogeneratedCodeEndComment); | ||
} | ||
}, | ||
|
||
removeAutogeneratedComments: text => { | ||
return text.replaceAll(autogeneratedCodeStartComment, '').replaceAll(autogeneratedCodeEndComment, ''); | ||
} | ||
}; | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters