Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't show a user-facing error when subscribe-and-sending and already subscribed. 

(imported from commit 7262740e8d967bf69a61fb9fddd74270a3211f5f)
This commit is contained in:
Tim Abbott 2012-10-31 12:54:22 -04:00
parent cb9cdf22c3
commit 0120b2b239
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zephyr/static/js/subs.js
View File

@ -52,6 +52,12 @@ exports.fetch = function () {
}); });
}; };
function add_for_send_success(stream_name, prompt_button) {
add_to_stream_list(stream_name);
compose.finish();
prompt_button.stop(true).fadeOut(500);
}
exports.add_for_send = function (stream, prompt_button) { exports.add_for_send = function (stream, prompt_button) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
@ -60,12 +66,17 @@ exports.add_for_send = function (stream, prompt_button) {
dataType: 'json', dataType: 'json',
timeout: 10*60*1000, // 10 minutes in ms timeout: 10*60*1000, // 10 minutes in ms
success: function (response) { success: function (response) {
add_to_stream_list(response.data); add_for_send_success(response.data, prompt_button);
compose.finish();
prompt_button.stop(true).fadeOut(500);
}, },
error: function (xhr, error_type, exn) { error: function (xhr, error_type, exn) {
report_error("Unable to subscribe", xhr, $("#home-error")); if ($.parseJSON(xhr.responseText).msg === "Subscription already exists") {
// If we're already subscribed, the issue here was
// actually that the client didn't know we were
// already subscribed -- so just send the message.
add_for_send_success(stream, prompt_button);
} else {
report_error("Unable to subscribe", xhr, $("#home-error"));
}
} }
}); });
}; };