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

Merge branch 'MDL-49802-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2015-05-07 10:03:37 +08:00
parent 92f47ae2f9 913784114d
commit 85643ff6e0
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-debug.js
Vendored
+2 -3
View File
@@ -351,19 +351,18 @@ Y.namespace('M.core_message.messenger').sendMessage = Y.extend(SENDMSGDIALOG, M.
// Hide the dialog.
Y.later(1300, this, function() {
this.setSendLock(false);
this.hideNotice();
this.hide();
});
},
failure: function() {
this.setSendLock(false);
this.hideNotice();
new M.core.alert({
title: M.util.get_string('error', 'core'),
message: M.util.get_string('errorwhilesendingmessage', 'core_message')
});
},
complete: function() {
this.setSendLock(false);
}
},
context: this
message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger.js
Vendored
+2 -3
View File
@@ -351,19 +351,18 @@ Y.namespace('M.core_message.messenger').sendMessage = Y.extend(SENDMSGDIALOG, M.
// Hide the dialog.
Y.later(1300, this, function() {
this.setSendLock(false);
this.hideNotice();
this.hide();
});
},
failure: function() {
this.setSendLock(false);
this.hideNotice();
new M.core.alert({
title: M.util.get_string('error', 'core'),
message: M.util.get_string('errorwhilesendingmessage', 'core_message')
});
},
complete: function() {
this.setSendLock(false);
}
},
context: this
message/yui/src/messenger/js/sendmessage.js
Vendored
+2 -3
View File
@@ -186,19 +186,18 @@ Y.namespace('M.core_message.messenger').sendMessage = Y.extend(SENDMSGDIALOG, M.
// Hide the dialog.
Y.later(1300, this, function() {
this.setSendLock(false);
this.hideNotice();
this.hide();
});
},
failure: function() {
this.setSendLock(false);
this.hideNotice();
new M.core.alert({
title: M.util.get_string('error', 'core'),
message: M.util.get_string('errorwhilesendingmessage', 'core_message')
});
},
complete: function() {
this.setSendLock(false);
}
},
context: this