L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-87597-500' of https://github.com/yusufwib01/moodle into MOODLE_500_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2026-02-13 15:08:55 +07:00
parent b88c7a1dbb 757f0d1a44
commit a7d7f41bff
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/amd/build/message_drawer.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
message/amd/build/message_drawer.min.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
message/amd/build/message_user_button.min.js
Vendored
+1 -1
View File
@@ -5,6 +5,6 @@
* @copyright 2019 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define("core_message/message_user_button",["jquery","core/custom_interaction_events","core_message/message_drawer_helper","core/templates"],(function($,CustomEvents,MessageDrawerHelper,Templates){var SELECTORS_MESSAGE_TEXTAREA='[data-region="send-message-txt"]',SELECTORS_MESSAGE_USER_BUTTON="#message-user-button",TEMPLATES_CONTENT="core_message/message_jumpto",getUserId=function(element){return parseInt(element.attr("data-userid"))},getConversationId=function(element){return parseInt(element.attr("data-conversationid"))};return{send:function(element){element=$(element);var args={conversationid:getConversationId(element),buttonid:$(element).attr("id"),userid:getUserId(element)};Templates.render(TEMPLATES_CONTENT,{}).then((function(html){element.after(html)})).then((function(){$(SELECTORS_MESSAGE_USER_BUTTON).next().focus((function(){$(SELECTORS_MESSAGE_TEXTAREA).focus()}))})),CustomEvents.define(element,[CustomEvents.events.activate]),element.on(CustomEvents.events.activate,(function(e,data){$(e.target).hasClass("active")?(MessageDrawerHelper.hide(),$(SELECTORS_MESSAGE_USER_BUTTON).next().attr("tabindex",-1)):($(SELECTORS_MESSAGE_USER_BUTTON).next().attr("tabindex",0),args.conversationid?MessageDrawerHelper.showConversation(args):MessageDrawerHelper.createConversationWithUser(args)),$(e.target).focus(),$(e.target).toggleClass("active"),e.preventDefault(),data.originalEvent.preventDefault()}))}}}));
define("core_message/message_user_button",["jquery","core/custom_interaction_events","core_message/message_drawer_helper","core/templates","core/pubsub","core_message/message_drawer_events"],(function($,CustomEvents,MessageDrawerHelper,Templates,PubSub,MessageDrawerEvents){var SELECTORS_MESSAGE_TEXTAREA='[data-region="send-message-txt"]',SELECTORS_MESSAGE_USER_BUTTON="#message-user-button",TEMPLATES_CONTENT="core_message/message_jumpto",getUserId=function(element){return parseInt(element.attr("data-userid"))},getConversationId=function(element){return parseInt(element.attr("data-conversationid"))};return{send:function(element){element=$(element);var args={conversationid:getConversationId(element),buttonid:$(element).attr("id"),userid:getUserId(element)};Templates.render(TEMPLATES_CONTENT,{}).then((function(html){element.after(html)})).then((function(){$(SELECTORS_MESSAGE_USER_BUTTON).next().focus((function(){$(SELECTORS_MESSAGE_TEXTAREA).focus()}))})),CustomEvents.define(element,[CustomEvents.events.activate]),element.on(CustomEvents.events.activate,(function(e,data){$(e.target).hasClass("active")?(MessageDrawerHelper.hide(),$(SELECTORS_MESSAGE_USER_BUTTON).next().attr("tabindex",-1)):($(SELECTORS_MESSAGE_USER_BUTTON).next().attr("tabindex",0),args.conversationid?MessageDrawerHelper.showConversation(args):MessageDrawerHelper.createConversationWithUser(args),element.addClass("active")),element.focus(),e.preventDefault(),data.originalEvent.preventDefault()})),PubSub.subscribe(MessageDrawerEvents.HIDE,(function(){element.removeClass("active")}))}}}));
//# sourceMappingURL=message_user_button.min.js.map
message/amd/build/message_user_button.min.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
message/amd/src/message_drawer.js
+1
View File
@@ -586,6 +586,7 @@ function(
$('#' + button).focus();
}
PubSub.publish(Events.TOGGLE_VISIBILITY, button);
PubSub.publish(Events.HIDE, {});
});
PubSub.subscribe(Events.CREATE_CONVERSATION_WITH_USER, function(args) {
message/amd/src/message_user_button.js
+16 -4
View File
@@ -20,8 +20,15 @@
* @copyright 2019 Mark Nelson <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define(['jquery', 'core/custom_interaction_events', 'core_message/message_drawer_helper', 'core/templates'],
function($, CustomEvents, MessageDrawerHelper, Templates) {
define([
'jquery',
'core/custom_interaction_events',
'core_message/message_drawer_helper',
'core/templates',
'core/pubsub',
'core_message/message_drawer_events'
],
function($, CustomEvents, MessageDrawerHelper, Templates, PubSub, MessageDrawerEvents) {
var SELECTORS = {
@@ -93,12 +100,17 @@ define(['jquery', 'core/custom_interaction_events', 'core_message/message_drawer
} else {
MessageDrawerHelper.createConversationWithUser(args);
}
element.addClass('active');
}
$(e.target).focus();
$(e.target).toggleClass('active');
element.focus();
e.preventDefault();
data.originalEvent.preventDefault();
});
// Remove the active class when the drawer is hidden.
PubSub.subscribe(MessageDrawerEvents.HIDE, function() {
element.removeClass('active');
});
};
return /** @alias module:core_message/message_user_button */ {