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

alert_words_ui: Fix the data flow while removing an alert word.

Browse Source 
Add `remove_alert_word()` function which uses the correct data flow
while removing an alert word.

`alert_words_ui.js` was structured differently from most of the other
settings. It was not using the triggers from the server for running
the success/failure handlers.
This commit is contained in:
Harshit Bansal
2017-06-07 19:36:43 +00:00
committed by Tim Abbott
parent 049bc02778
commit 94fc7dfe20
3 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
static/js/alert_words_ui.js
View File

@@ -31,19 +31,6 @@ function update_alert_word_status(status_text, is_error) {
alert_word_status.show();
}
function update_alert_words() {
var words = _.map($('.alert-word-item'), function (e) {
return $(e).data('word').toString();
});
words = _.filter(words, function (word) {
return word !== "";
});
channel.post({
url: '/json/users/me/alert_words',
idempotent: true,
data: {alert_words: JSON.stringify(words)}});
}
function add_alert_word(alert_word) {
if ($.trim(alert_word) === '') {
update_alert_word_status(i18n.t("Alert word can't be empty!"), true);
@@ -64,6 +51,21 @@ function add_alert_word(alert_word) {
});
}
function remove_alert_word(alert_word) {
var words_to_be_removed = [alert_word];
channel.del({
url: '/json/users/me/alert_words',
data: {alert_words: JSON.stringify(words_to_be_removed)},
success: function () {
update_alert_word_status(i18n.t("Alert word removed successfully!"), false);
},
error: function () {
update_alert_word_status(i18n.t("Error removing alert word!"), true);
},
});
}
exports.set_up_alert_words = function () {
// The settings page must be rendered before this function gets called.
@@ -75,10 +77,8 @@ exports.set_up_alert_words = function () {
});
$('#alert_words_list').on('click', '.remove-alert-word', function (event) {
var li = $(event.currentTarget).parents('li');
li.remove();
update_alert_words();
var word = $(event.currentTarget).parents('li').find('.value').text();
remove_alert_word(word);
});
$('#alert_words_list').on('keypress', '#create_alert_word_name', function (event) {