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

compose: Split validate_stream_message into separate functions.

Browse Source
This commit is contained in:
Sampriti Panda
2017-01-05 16:35:51 +05:30
committed by Tim Abbott
parent 5fc65efd69
commit c15d1ff343
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
static/js/compose.js
View File

@@ -771,21 +771,7 @@ function check_stream_for_send(stream_name, autosubscribe) {
return result;
}
function validate_stream_message() {
var stream_name = exports.stream_name();
if (stream_name === "") {
compose_error(i18n.t("Please specify a stream"), $("#stream"));
return false;
}
if (page_params.mandatory_topics) {
var topic = exports.subject();
if (topic === "") {
compose_error(i18n.t("Please specify a topic"), $("#subject"));
return false;
}
}
function validate_stream_message_mentions(stream_name) {
var current_stream = stream_data.get_sub(stream_name);
var stream_count = current_stream.subscribers.num_items();
@@ -808,6 +794,10 @@ function validate_stream_message() {
// at this point, the user has either acknowledged the warning or removed @all / @everyone
user_acknowledged_all_everyone = undefined;
return true;
}
function validate_stream_message_address_info(stream_name) {
var response;
if (!stream_data.is_subscribed(stream_name)) {
@@ -818,12 +808,12 @@ function validate_stream_message() {
"<p>Manage your subscriptions <a href='#subscriptions'>on your Streams page</a>.</p>";
compose_error(response, $('#stream'));
return false;
case "error":
return false;
case "subscribed":
// You're actually subscribed to the stream, but this
// browser window doesn't know it.
return true;
case "error":
return false;
case "not-subscribed":
response = "<p>You're not subscribed to the stream <b>" +
Handlebars.Utils.escapeExpression(stream_name) + "</b>.</p>" +
@@ -835,6 +825,29 @@ function validate_stream_message() {
return true;
}
function validate_stream_message() {
var stream_name = exports.stream_name();
if (stream_name === "") {
compose_error(i18n.t("Please specify a stream"), $("#stream"));
return false;
}
if (page_params.mandatory_topics) {
var topic = exports.subject();
if (topic === "") {
compose_error(i18n.t("Please specify a topic"), $("#subject"));
return false;
}
}
if (!validate_stream_message_mentions(stream_name) ||
!validate_stream_message_address_info(stream_name)) {
return false;
}
return true;
}
// The function checks whether the recipients are users of the realm or cross realm users (bots
// for now)
function validate_private_message() {