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

Move more validation

Browse Source 
(imported from commit 62d660a3c34f4aeb170771ee85580362a2c1b8a7)
This commit is contained in:
Keegan McAllister
2012-10-03 16:53:15 -04:00
parent 0c76788ed5
commit d619618fed
2 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,5 @@
var status_classes = 'alert-error alert-success alert-info';
function clear_compose_box() {
$("#zephyr_compose").find('input[type=text], textarea').val('');
}
@@ -66,6 +68,37 @@ function compose_error(error_text, bad_input) {
bad_input.focus().select();
}
// *Synchronously* check if a class exists.
// If not, displays an error and returns false.
function check_class_for_send(class_name) {
var okay = true;
$.ajax({
url: "subscriptions/exists/" + class_name,
async: false,
success: function (data) {
if (data === "False") {
// The class doesn't exist
okay = false;
send_status.removeClass(status_classes);
send_status.show();
$('#class-dne-name').text(class_name);
$('#class-dne').show();
$('#create-it').focus();
buttons.removeAttr('disabled');
hide_compose();
}
$("#home-error").hide();
},
error: function (xhr) {
okay = false;
report_error("Error checking subscription", xhr, $("#home-error"));
$("#class").focus();
buttons.removeAttr('disabled');
}
});
return okay;
}
function validate_class_message() {
if (compose_class_name() === "") {
compose_error("Please specify a class", $("#class"));

36
zephyr/static/js/zephyr.js
View File

@@ -10,7 +10,6 @@
var zephyr_array = [];
var zephyr_dict = {};
var instance_list = [];
var status_classes = 'alert-error alert-success alert-info';
$(function () {
var send_status = $('#send-status');
@@ -40,34 +39,11 @@ $(function () {
}
var zephyr_class = compose_class_name();
var okay = true;
$.ajax({
url: "subscriptions/exists/" + zephyr_class,
async: false,
success: function (data) {
if (data === "False") {
// The class doesn't exist
okay = false;
send_status.removeClass(status_classes);
send_status.show();
$('#class-dne-name').text(zephyr_class);
$('#class-dne').show();
$('#create-it').focus();
buttons.removeAttr('disabled');
hide_compose();
}
$("#home-error").hide();
},
error: function (xhr) {
okay = false;
report_error("Error checking subscription", xhr, $("#home-error"));
$("#class").focus();
buttons.removeAttr('disabled');
}
});
if (okay && class_list.indexOf(zephyr_class.toLowerCase()) === -1) {
if (!check_class_for_send(zephyr_class))
return false;
if (class_list.indexOf(zephyr_class.toLowerCase()) === -1) {
// You're not subbed to the class
okay = false;
send_status.removeClass(status_classes);
send_status.show();
$('#class-nosub-name').text(zephyr_class);
@@ -75,8 +51,10 @@ $(function () {
$('#sub-it').focus();
buttons.removeAttr('disabled');
hide_compose();
return false;
}
return okay;
return true;
},
success: function (resp, statusText, xhr, form) {
form.find('textarea').val('');