mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 14:03:30 +00:00 
			
		
		
		
	Remove transitional feature_flags.alert_words flag.
(imported from commit f00eba8a12054e9771105e341e2652a53271e298)
This commit is contained in:
		
				
					committed by
					
						
						Leo Franchi
					
				
			
			
				
	
			
			
			
						parent
						
							d5f14e3bb7
						
					
				
				
					commit
					b98e7f8d90
				
			@@ -11,7 +11,7 @@ function escape_user_regex(value) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
exports.process_message = function (message) {
 | 
			
		||||
    if (!feature_flags.alert_words || !exports.notifies(message)) {
 | 
			
		||||
    if (!exports.notifies(message)) {
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,4 @@
 | 
			
		||||
$(function () {
 | 
			
		||||
    if (!feature_flags.alert_words) {
 | 
			
		||||
        $('#word-alert-area').remove();
 | 
			
		||||
    }
 | 
			
		||||
    var word_list = $('#word-alerts');
 | 
			
		||||
    _.each(alert_words.words, function (word) {
 | 
			
		||||
        var li = templates.render('alert_word_settings_item', {'word': word});
 | 
			
		||||
 
 | 
			
		||||
@@ -1433,7 +1433,7 @@ $(function () {
 | 
			
		||||
 | 
			
		||||
    var notification_docs = $("#notification-docs");
 | 
			
		||||
    notification_docs.popover({"placement": "right",
 | 
			
		||||
                               "content": templates.render('notification_docs', {alert_words: feature_flags.alert_words}),
 | 
			
		||||
                               "content": templates.render('notification_docs', {}),
 | 
			
		||||
                               "trigger": "manual"});
 | 
			
		||||
    $("body").on("mouseover", "#notification-docs", function (e) {
 | 
			
		||||
        notification_docs.popover('show');
 | 
			
		||||
 
 | 
			
		||||
@@ -7,9 +7,7 @@
 | 
			
		||||
<li>a private message</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>
 | 
			
		||||
{{#if alert_words}}
 | 
			
		||||
  <li>any custom word alerts that you have configured</li>
 | 
			
		||||
{{/if}}
 | 
			
		||||
<li>any custom word alerts that you have configured</li>
 | 
			
		||||
</ul>
 | 
			
		||||
<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>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user