paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 07:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: give users an action to take on subscription errors.

Browse Source 
(imported from commit 62b2500bb1993f70b8218cd58fb335de25b18480)
This commit is contained in:
Jessica McKellar
2013-02-20 11:04:00 -05:00
parent 42ba9adad7
commit 41aa91d300
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zephyr/static/js/compose.js
View File

@@ -118,7 +118,7 @@ function compose_error(error_text, bad_input) {
$('#send-status').removeClass(status_classes) $('#send-status').removeClass(status_classes)
.addClass('alert-error') .addClass('alert-error')
.stop(true).fadeTo(0, 1); .stop(true).fadeTo(0, 1);
$('#error-msg').text(error_text); $('#error-msg').html(error_text);
$("#compose-send-button").removeAttr('disabled'); $("#compose-send-button").removeAttr('disabled');
bad_input.focus().select(); bad_input.focus().select();
} }
@@ -320,7 +320,9 @@ function validate_stream_message() {
if (!subs.have(stream_name)) { if (!subs.have(stream_name)) {
switch(check_stream_for_send(stream_name)) { switch(check_stream_for_send(stream_name)) {
case "does-not-exist": case "does-not-exist":
response = 'The stream "' + stream_name + '" does not exist.'; response = "<p>The stream <b>" +
Handlebars.Utils.escapeExpression(stream_name) + "</b> does not exist.</p>" +
"<p>Manage your subscriptions <a href='#subscriptions'>on your Streams page</a>.</p>";
compose_error(response, $('#stream')); compose_error(response, $('#stream'));
return false; return false;
case "error": case "error":
@@ -330,7 +332,9 @@ function validate_stream_message() {
// browser window doesn't know it. // browser window doesn't know it.
return true; return true;
case "not-subscribed": case "not-subscribed":
response = 'You\'re not subscribed to the stream "' + stream_name + '".'; response = "<p>You're not subscribed to the stream <b>" +
Handlebars.Utils.escapeExpression(stream_name) + "</b>.</p>" +
"<p>Manage your subscriptions <a href='#subscriptions'>on your Streams page</a>.</p>";
compose_error(response, $('#stream')); compose_error(response, $('#stream'));
return false; return false;
} }