diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js index eb44b3fe28..02d7f1bb92 100644 --- a/static/js/feature_flags.js +++ b/static/js/feature_flags.js @@ -28,10 +28,6 @@ exports.is_og_zulip_user = _.contains(og_zuliper_emails, page_params.email); exports.twenty_four_hour_time = special_24_hour_people || iceland; exports.left_side_userlist = _.contains(['customer7.invalid'], page_params.domain); -//This was set as a page_params variable already, because it's also used in -//the settings.html django template. See zerver/views/__init__.py:home(request). -exports.show_autoscroll_forever_option = page_params.show_autoscroll_forever_option; - exports.enable_new_user_app_alerts = ! _.contains(['employees.customer16.invalid'], page_params.domain); // Still very beta: diff --git a/static/js/settings.js b/static/js/settings.js index 5d702f2817..3304254d8c 100644 --- a/static/js/settings.js +++ b/static/js/settings.js @@ -650,8 +650,7 @@ exports.setup_page = function () { success: function (resp, statusText, xhr, form) { var message = "Updated " + page_params.product_name + " Labs settings!"; var result = $.parseJSON(xhr.responseText); - var ui_settings_status = feature_flags.show_autoscroll_forever_option && - $('#ui-settings-status').expectOne(); + var ui_settings_status = $('#ui-settings-status').expectOne(); if (result.autoscroll_forever !== undefined) { page_params.autoscroll_forever = result.autoscroll_forever; @@ -664,8 +663,7 @@ exports.setup_page = function () { }, error: function (xhr, error_type, xhn) { var response = "Error changing settings"; - var ui_settings_status = feature_flags.show_autoscroll_forever_option && - $('#ui-settings-status').expectOne(); + var ui_settings_status = $('#ui-settings-status').expectOne(); if (xhr.status.toString().charAt(0) === "4") { // Only display the error response for 4XX, where we've crafted diff --git a/static/templates/settings_tab.handlebars b/static/templates/settings_tab.handlebars index c090fbd783..9079f248e5 100644 --- a/static/templates/settings_tab.handlebars +++ b/static/templates/settings_tab.handlebars @@ -311,18 +311,15 @@ -{{#if_or page_params.show_autoscroll_forever_option page_params.show_default_desktop_notifications_option}}
{{ page_params.product_name }} Labs

- {{ page_params.product_name }} Labs is where you can try out some experimental new - features we're working on. Let us know what you think! + Warning: the below features are experimental features and may not work as well as you would like.

- {{#if page_params.show_autoscroll_forever_option}}
Always auto-scroll to new messages - {{/if}} - {{#if page_params.show_default_desktop_notifications_option}}
Enable desktop notifications for new streams - {{/if}}
@@ -355,4 +349,4 @@
-{{/if_or}} + diff --git a/zerver/tests/frontend/node/templates.js b/zerver/tests/frontend/node/templates.js index 833f107f2d..00628e0714 100644 --- a/zerver/tests/frontend/node/templates.js +++ b/zerver/tests/frontend/node/templates.js @@ -695,8 +695,7 @@ function render(template_name, args) { var page_params = $.extend(page_param_checkbox_options, { fullname: "Alyssa P. Hacker", password_auth_enabled: true, avatar_url: "https://google.com", - domain: "zulip.com", show_autoscroll_forever_option: true, - show_default_desktop_notifications_option: true + domain: "zulip.com" }); var checkbox_ids = ["enable_stream_desktop_notifications", diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 172afe164f..4f222557be 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -1088,9 +1088,7 @@ def home(request): name_changes_disabled = name_changes_disabled(user_profile.realm), has_mobile_devices = num_push_devices_for_user(user_profile) > 0, autoscroll_forever = user_profile.autoscroll_forever, - show_autoscroll_forever_option = user_profile.realm.domain in ("customer28.invalid", "zulip.com", "customer31.invalid"), default_desktop_notifications = user_profile.default_desktop_notifications, - show_default_desktop_notifications_option = user_profile.realm.domain in ("customer13.invalid", "zulip.com",), avatar_url = avatar_url(user_profile), mandatory_topics = user_profile.realm.mandatory_topics, )