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

MDL-55573 core_message: keep conversation and contact panels up-to-date

Browse Source
This commit is contained in:
Mark Nelson
2016-10-07 16:26:40 +08:00
parent 6c3b954114
commit bf4c393c09
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/amd/src/message_area_contacts.js
+31 -11
View File
@@ -163,13 +163,19 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
// Get the text we will display on the contact panel.
text = this._getContactText(text);
// Get the user node.
var user = this.messageArea.find(this.messageArea.SELECTORS.CONVERSATIONS + " " +
this.messageArea.SELECTORS.CONTACT + "[data-userid='" + userid + "']");
// If the user has not been loaded yet, let's copy the element from contact panel to the conversation panel.
var user = this._getUserNode(this.messageArea.SELECTORS.CONVERSATIONS, userid);
// If the user has not been loaded yet, let's copy the element from contact or search panel to the conversation panel.
if (user.length === 0) {
// Let's clone the data on the contact page.
var usercontact = this.messageArea.find(this.messageArea.SELECTORS.CONTACTS + " " +
this.messageArea.SELECTORS.CONTACT + "[data-userid='" + userid + "']");
var usercontact = this._getUserNode(this.messageArea.SELECTORS.CONTACTS, userid);
if (usercontact.length === 0) {
// No luck, maybe we sent the message to a user we searched for - check search page.
usercontact = this._getUserNode(this.messageArea.SELECTORS.SEARCHRESULTSAREA, userid);
}
if (usercontact.length == 0) {
// Can't do much.
return;
}
user = usercontact.clone();
// Change the data action attribute.
user.attr('data-action', 'view-contact-msg');
@@ -402,8 +408,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
}
// Check if the last message needs updating.
var user = this.messageArea.find(this.messageArea.SELECTORS.CONVERSATIONS + " " +
this.messageArea.SELECTORS.CONTACT + "[data-userid='" + userid + "']");
var user = this._getUserNode(this.messageArea.SELECTORS.CONVERSATIONS, userid);
if (user.length !== 0) {
var lastmessagelisted = user.find(this.messageArea.SELECTORS.LASTMESSAGE);
lastmessagelisted = lastmessagelisted.html();
@@ -437,13 +442,29 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
* @private
*/
Contacts.prototype._addContact = function(userid) {
var user = this.messageArea.find(this.messageArea.SELECTORS.CONTACTS + " " + this.messageArea.SELECTORS.CONTACT +
"[data-userid='" + userid + "']").hide();
var user = this._getUserNode(this.messageArea.SELECTORS.CONTACTS, userid);
if (user.length !== 0) {
user.show();
} else {
// Must have added contact we searched for that wasn't in the contact list. Let's just refresh the contact panel.
this.messageArea.find(this.messageArea.SELECTORS.CONTACTS).empty();
this._numContactsDisplayed = 0;
this._loadContacts();
}
};
/**
* Handles retrieving a user node from a list.
*
* @param {String} selector
* @param {int} userid
* @private
*/
Contacts.prototype._getUserNode = function(selector, userid) {
return this.messageArea.find(selector + " " + this.messageArea.SELECTORS.CONTACT +
"[data-userid='" + userid + "']");
};
/**
* Handles removing a contact from the list.
*
@@ -452,8 +473,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
* @private
*/
Contacts.prototype._removeContact = function(selector, userid) {
this.messageArea.find(selector + " " + this.messageArea.SELECTORS.CONTACT +
"[data-userid='" + userid + "']").hide();
this._getUserNode(selector, userid).hide();
};
/**