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

Remove transitional feature_flags.alert_words flag.

Browse Source 
(imported from commit f00eba8a12054e9771105e341e2652a53271e298)
This commit is contained in:
Steve Howell
2013-10-11 11:30:57 -04:00
committed by Leo Franchi
parent d5f14e3bb7
commit b98e7f8d90
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/alert_words.js
View File

@@ -11,7 +11,7 @@ function escape_user_regex(value) {
} }
exports.process_message = function (message) { exports.process_message = function (message) {
if (!feature_flags.alert_words || !exports.notifies(message)) { if (!exports.notifies(message)) {
return; return;
} }

3
static/js/alert_words_ui.js
View File

@@ -1,7 +1,4 @@
$(function () { $(function () {
if (!feature_flags.alert_words) {
$('#word-alert-area').remove();
}
var word_list = $('#word-alerts'); var word_list = $('#word-alerts');
_.each(alert_words.words, function (word) { _.each(alert_words.words, function (word) {
var li = templates.render('alert_word_settings_item', {'word': word}); var li = templates.render('alert_word_settings_item', {'word': word});

2
static/js/ui.js
View File

@@ -1433,7 +1433,7 @@ $(function () {
var notification_docs = $("#notification-docs"); var notification_docs = $("#notification-docs");
notification_docs.popover({"placement": "right", notification_docs.popover({"placement": "right",
"content": templates.render('notification_docs', {alert_words: feature_flags.alert_words}), "content": templates.render('notification_docs', {}),
"trigger": "manual"}); "trigger": "manual"});
$("body").on("mouseover", "#notification-docs", function (e) { $("body").on("mouseover", "#notification-docs", function (e) {
notification_docs.popover('show'); notification_docs.popover('show');

4
static/templates/notification_docs.handlebars
View File

@@ -7,9 +7,7 @@
<li>a private message</li> <li>a private message</li>
<li>a message that @-mentions you</li> <li>a message that @-mentions you</li>
<li>a message to a stream you have configured to show desktop notifications (via the streams page)</li> <li>a message to a stream you have configured to show desktop notifications (via the streams page)</li>
{{#if alert_words}} <li>any custom word alerts that you have configured</li>
<li>any custom word alerts that you have configured</li>
{{/if}}
</ul> </ul>
<br /> <br />
<p>If the Zulip window is in focus and you can already see the message when it arrives, we won't notify you.</p> <p>If the Zulip window is in focus and you can already see the message when it arrives, we won't notify you.</p>