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

compose: Add a function for handling validation errors.

Browse Source
This commit is contained in:
Alena Volkova
2018-01-23 15:06:47 -05:00
committed by Tim Abbott
parent 695b3e48e8
commit e4a62aa778
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
static/js/compose.js
View File

@@ -499,17 +499,13 @@ function validate_stream_message_announce(stream_name) {
return true; return true;
} }
exports.validate_stream_message_address_info = function (stream_name) { exports.validation_error = function (error_type, stream_name) {
if (stream_data.is_subscribed(stream_name)) {
return true;
}
var response; var response;
var context = {}; var context = {};
context.stream_name = Handlebars.Utils.escapeExpression(stream_name); context.stream_name = Handlebars.Utils.escapeExpression(stream_name);
switch (check_unsubscribed_stream_for_send(stream_name,
page_params.narrow_stream !== undefined)) { switch (error_type) {
case "does-not-exist": case "does-not-exist":
response = i18n.t("<p>The stream <b>__stream_name__</b> does not exist.</p><p>Manage your subscriptions <a href='#streams/all'>on your Streams page</a>.</p>", context); response = i18n.t("<p>The stream <b>__stream_name__</b> does not exist.</p><p>Manage your subscriptions <a href='#streams/all'>on your Streams page</a>.</p>", context);
compose_error(response, $('#stream')); compose_error(response, $('#stream'));
@@ -525,6 +521,15 @@ exports.validate_stream_message_address_info = function (stream_name) {
return true; return true;
}; };
exports.validate_stream_message_address_info = function (stream_name) {
if (stream_data.is_subscribed(stream_name)) {
return true;
}
var autosubscribe = page_params.narrow_stream !== undefined;
var error_type = check_unsubscribed_stream_for_send(stream_name, autosubscribe);
return exports.validation_error(error_type, stream_name);
};
function validate_stream_message() { function validate_stream_message() {
var stream_name = compose_state.stream_name(); var stream_name = compose_state.stream_name();
if (stream_name === "") { if (stream_name === "") {