MDL-72321 qbank_comment: Only initialise javascript if plugin is enabled
This commit is contained in:
Nathan Nguyen
committed by
Mark Johnson
Mark Johnson
parent
6f2e91a169
commit
43866217da
@@ -506,6 +506,9 @@ class comment {
|
||||
|
||||
$html .= html_writer::start_tag('div', array('class' => 'comment-area'));
|
||||
$html .= html_writer::start_tag('div', array('class' => 'db'));
|
||||
$html .= html_writer::tag('label',
|
||||
get_string('comment', 'comment'),
|
||||
['for' => 'dlg-content-'.$this->cid, 'class' => 'sr-only']);
|
||||
$html .= html_writer::tag('textarea', '', $textareaattrs);
|
||||
$html .= html_writer::end_tag('div'); // .db
|
||||
|
||||
|
||||
+1
-1
@@ -6,6 +6,6 @@ define("qbank_comment/comment",["exports","core/fragment","core/str","core/modal
|
||||
* @copyright 2021 Catalyst IT Australia Pty Ltd
|
||||
* @author Safat Shahin <safatshahin@catalyst-au.net>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_fragment=_interopRequireDefault(_fragment),Str=function(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}newObj.default=obj,cache&&cache.set(obj,newObj);return newObj}(Str),_modal_events=_interopRequireDefault(_modal_events),_modal_factory=_interopRequireDefault(_modal_factory),_notification=_interopRequireDefault(_notification);_exports.init=questionSelector=>{const target=document.querySelector(questionSelector);target.addEventListener("click",(()=>{((questionId,courseID,contextId)=>{let args={questionid:questionId,courseid:courseID};_modal_factory.default.create({type:_modal_factory.default.types.SAVE_CANCEL,title:Str.get_string("commentheader","qbank_comment"),body:_fragment.default.loadFragment("qbank_comment","question_comment",contextId,args),large:!0}).then((modal=>{let root=modal.getRoot();return root.on(_modal_events.default.bodyRendered,(function(){document.querySelectorAll("div.comment-area a")[0].style.display="none"})),root.on("change","#question_comment_version_dropdown",(function(e){args.questionid=e.target.value,modal.setBody(_fragment.default.loadFragment("qbank_comment","question_comment",contextId,args))})),Str.get_strings([{key:"addcomment",component:"qbank_comment"},{key:"close",component:"qbank_comment"}]).then((strings=>{modal.setButtonText("save",strings[0]),modal.setButtonText("cancel",strings[1])})).fail(_notification.default.exception),root.on(_modal_events.default.cancel,(function(){location.reload(),modal.hide()})),root.on(_modal_events.default.save,(function(e){e.preventDefault();const submitlink=document.querySelectorAll("div.comment-area a")[0],textarea=document.querySelectorAll("div.comment-area textarea")[0];textarea.value!=textarea.getAttribute("aria-label")&&""!=textarea.value&&submitlink.click()})),root.on("click",'button[data-action="hide"]',(()=>{location.reload(),modal.hide()})),modal.show(),modal})).fail(_notification.default.exception)})(target.dataset.questionid,target.dataset.courseid,target.dataset.contextid)}))}}));
|
||||
*/Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_fragment=_interopRequireDefault(_fragment),Str=function(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}newObj.default=obj,cache&&cache.set(obj,newObj);return newObj}(Str),_modal_events=_interopRequireDefault(_modal_events),_modal_factory=_interopRequireDefault(_modal_factory),_notification=_interopRequireDefault(_notification);_exports.init=()=>{const target=document.querySelector("#categoryquestions");null!==target&&target.addEventListener("click",(e=>{e.target.dataset.target&&e.target.dataset.target.includes("questioncommentpreview")&&((questionId,courseID,contextId)=>{let args={questionid:questionId,courseid:courseID};_modal_factory.default.create({type:_modal_factory.default.types.SAVE_CANCEL,title:Str.get_string("commentheader","qbank_comment"),body:_fragment.default.loadFragment("qbank_comment","question_comment",contextId,args),large:!0}).then((modal=>{let root=modal.getRoot();return root.on(_modal_events.default.bodyRendered,(function(){document.querySelectorAll("div.comment-area a")[0].style.display="none"})),root.on("change","#question_comment_version_dropdown",(function(e){args.questionid=e.target.value,modal.setBody(_fragment.default.loadFragment("qbank_comment","question_comment",contextId,args))})),Str.get_strings([{key:"addcomment",component:"qbank_comment"},{key:"close",component:"qbank_comment"}]).then((strings=>{modal.setButtonText("save",strings[0]),modal.setButtonText("cancel",strings[1])})).fail(_notification.default.exception),root.on(_modal_events.default.cancel,(function(){location.reload(),modal.hide()})),root.on(_modal_events.default.save,(function(e){e.preventDefault();const submitlink=document.querySelectorAll("div.comment-area a")[0],textarea=document.querySelectorAll("div.comment-area textarea")[0];textarea.value!=textarea.getAttribute("aria-label")&&""!=textarea.value&&submitlink.click()})),root.on("click",'button[data-action="hide"]',(()=>{location.reload(),modal.hide()})),modal.show(),modal})).fail(_notification.default.exception)})(e.target.dataset.questionid,e.target.dataset.courseid,e.target.dataset.contextid)}))}}));
|
||||
|
||||
//# sourceMappingURL=comment.min.js.map
|
||||
File diff suppressed because one or more lines are too long
@@ -101,12 +101,15 @@ const commentEvent = (questionId, courseID, contextId) => {
|
||||
* Entrypoint of the js.
|
||||
*
|
||||
* @method init
|
||||
* @param {string} questionSelector the question comment identifier.
|
||||
*/
|
||||
export const init = (questionSelector) => {
|
||||
const target = document.querySelector(questionSelector);
|
||||
target.addEventListener('click', () => {
|
||||
// Call for the event listener to listed for clicks in any comment count row.
|
||||
commentEvent(target.dataset.questionid, target.dataset.courseid, target.dataset.contextid);
|
||||
});
|
||||
export const init = () => {
|
||||
const target = document.querySelector('#categoryquestions');
|
||||
if (target !== null) {
|
||||
target.addEventListener('click', (e) => {
|
||||
if (e.target.dataset.target && e.target.dataset.target.includes('questioncommentpreview')) {
|
||||
// Call for the event listener to listed for clicks in any comment count row.
|
||||
commentEvent(e.target.dataset.questionid, e.target.dataset.courseid, e.target.dataset.contextid);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
@@ -29,6 +29,35 @@ use question_bank;
|
||||
*/
|
||||
class comment_count_column extends column_base {
|
||||
|
||||
/**
|
||||
* @var bool Comments enabled or not from config.
|
||||
*/
|
||||
protected $commentsenabled = true;
|
||||
|
||||
/**
|
||||
* Load javascript module if enabled.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function init(): void {
|
||||
parent::init();
|
||||
$this->check_comments_status();
|
||||
if ($this->commentsenabled) {
|
||||
global $PAGE;
|
||||
$PAGE->requires->js_call_amd('qbank_comment/comment', 'init');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if comments is turned on in the system or not.
|
||||
*/
|
||||
protected function check_comments_status(): void {
|
||||
global $CFG;
|
||||
if (!$CFG->usecomments) {
|
||||
$this->commentsenabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the name of the column, used internally.
|
||||
*
|
||||
@@ -54,7 +83,7 @@ class comment_count_column extends column_base {
|
||||
* @param string $rowclasses Classes that can be added.
|
||||
*/
|
||||
protected function display_content($question, $rowclasses): void {
|
||||
global $DB, $PAGE;
|
||||
global $DB;
|
||||
$syscontext = \context_system::instance();
|
||||
$args = [
|
||||
'component' => 'qbank_comment',
|
||||
@@ -66,8 +95,6 @@ class comment_count_column extends column_base {
|
||||
$attributes = [];
|
||||
if (question_has_capability_on($question, 'comment')) {
|
||||
$target = 'questioncommentpreview_' . $question->id;
|
||||
$datatarget = '[data-target="' . $target . '"]';
|
||||
$PAGE->requires->js_call_amd('qbank_comment/comment', 'init', [$datatarget]);
|
||||
$attributes = [
|
||||
'href' => '#',
|
||||
'data-target' => $target,
|
||||
|
||||
Reference in New Issue
Block a user