From 320eddcf6e69579ad170e8551616a3a0ca4bd575 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Mon, 9 Sep 2013 13:06:10 -0400 Subject: [PATCH] Remove feature_flags.edit_appears_on_hover. (imported from commit ff8b820d8f5c1bfe25ccb6856b5f206bd03663e0) --- static/js/feature_flags.js | 2 -- static/js/ui.js | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js index 3ff85f6ab0..4af0c5a04f 100644 --- a/static/js/feature_flags.js +++ b/static/js/feature_flags.js @@ -10,8 +10,6 @@ exports.twenty_four_hour_time = _.contains([], exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain); exports.email_forwarding = page_params.staging || _.contains(['customer6.invalid'], page_params.domain); -exports.edit_appears_on_hover = true; - exports.mandatory_topics = _.contains([ 'customer7.invalid' diff --git a/static/js/ui.js b/static/js/ui.js index def10315d2..841c0f6007 100644 --- a/static/js/ui.js +++ b/static/js/ui.js @@ -244,7 +244,7 @@ function message_unhover() { return; } message = current_msg_list.get(rows.id(current_message_hover)); - if (feature_flags.edit_appears_on_hover && message && message.sent_by_me) { + if (message && message.sent_by_me) { current_message_hover.find('.message_content').find('span.edit_content').remove(); } current_message_hover.removeClass('message_hovered'); @@ -260,7 +260,7 @@ function message_hover(message_row) { message = current_msg_list.get(rows.id(message_row)); message_unhover(); message_row.addClass('message_hovered'); - if (feature_flags.edit_appears_on_hover && message && message.sent_by_me) { + if (message && message.sent_by_me) { message_row.find('.message_content').find('p:last').append(edit_content_button); } current_message_hover = message_row;