diff --git a/static/js/ui.js b/static/js/ui.js index be68dc96bd..7e348e39b8 100644 --- a/static/js/ui.js +++ b/static/js/ui.js @@ -1530,19 +1530,6 @@ $(function () { $("#api_key_button_box").hide(); }); - var notification_docs = $("#notification-docs"); - notification_docs.popover({"placement": "right", - "content": templates.render('notification_docs', {}), - "trigger": "manual"}); - $("body").on("mouseover", "#notification-docs", function (e) { - notification_docs.popover('show'); - e.stopPropagation(); - }); - $("body").on("mouseout", "#notification-docs", function (e) { - notification_docs.popover('hide'); - e.stopPropagation(); - }); - $('body').on('click', '.edit_content_button', function (e) { var row = current_msg_list.get_row(rows.id($(this).closest(".message_row"))); message_edit.start(row); diff --git a/static/templates/notification_docs.handlebars b/static/templates/notification_docs.handlebars deleted file mode 100644 index 4943f89d44..0000000000 --- a/static/templates/notification_docs.handlebars +++ /dev/null @@ -1,15 +0,0 @@ -{{! Explanation of when notifications fire }} -
- -

If enabled, you will get desktop notifications for the following:

- - -
-

If the Zulip window is in focus and you can already see the message when it arrives, we won't notify you.

- -
diff --git a/templates/zerver/settings.html b/templates/zerver/settings.html index 7c39c17dbc..0956fd6c15 100644 --- a/templates/zerver/settings.html +++ b/templates/zerver/settings.html @@ -91,7 +91,7 @@
{% csrf_token %}
-
Notifications
+
Notifications

Stream messages

diff --git a/zerver/tests/frontend/node/templates.js b/zerver/tests/frontend/node/templates.js index 489d8518bb..17ad89740b 100644 --- a/zerver/tests/frontend/node/templates.js +++ b/zerver/tests/frontend/node/templates.js @@ -388,14 +388,6 @@ function render(template_name, args) { assert.equal(title.text().trim(), 'You have a notification'); }()); -(function notification_docs() { - var html = render('notification_docs'); - global.write_test_output("notification_docs.handlebars", html); - - var title = $(html).find("li:first"); - assert.equal(title.text().trim(), 'a private message'); -}()); - (function sidebar_subject_list() { var args = { want_show_more_topics_links: true,