CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "Show a button for editing messages when the user hovers over them."

Browse Source 
This reverts commit 782e76210ac835d0617d91679933eccff0caad98.

(imported from commit 24889d0e0e38cc46d4b2d06c12a5737a4772fd6c)
This commit is contained in:
Jeff Arnold 2013-08-16 11:44:07 -04:00
parent 66c9c7efee
commit b166accc33
3 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/feature_flags.js
View File

@ -8,7 +8,6 @@ exports.twenty_four_hour_time = _.contains([],
page_params.email);
exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain);
exports.email_forwarding = page_params.staging;
exports.edit_appears_on_hover = page_params.staging || _.contains(['customer7.invalid'], page_params.domain);
exports.mandatory_topics = _.contains([

27
static/js/ui.js
View File

@ -239,30 +239,16 @@ $(function () {
var current_message_hover;
function message_unhover() {
var message;
if (current_message_hover === undefined) {
return;
}
message = current_msg_list.get(rows.id(current_message_hover));
if (feature_flags.edit_appears_on_hover && message.sent_by_me) {
current_message_hover.find('.message_content').find('span.edit_content').remove();
}
current_message_hover.removeClass('message_hovered');
current_message_hover = undefined;
}
function message_hover(message_row) {
var message;
var edit_content_button = '<span class="edit_content">&nbsp;&nbsp;&nbsp;<i class="icon-vector-pencil edit_content"></i></span>';
if (current_message_hover && message_row && current_message_hover.attr("zid") === message_row.attr("zid")) {
return;
}
message = current_msg_list.get(rows.id(message_row));
message_unhover();
message_row.addClass('message_hovered');
if (feature_flags.edit_appears_on_hover && message.sent_by_me) {
message_row.find('.message_content').find('p').append(edit_content_button);
}
current_message_hover = message_row;
}
@ -1003,8 +989,7 @@ $(function () {
$("#main_div").on("click", ".messagebox", function (e) {
var target = $(e.target);
if (target.is("a") || target.is("img.message_inline_image") || target.is("img.twitter-avatar") ||
target.is("div.message_length_controller") || target.is("textarea") || target.is("input") ||
target.is("i.edit_content")) {
target.is("div.message_length_controller") || target.is("textarea") || target.is("input")) {
// If this click came from a hyperlink, don't trigger the
// reply action. The simple way of doing this is simply
// to call e.stopPropagation() from within the link's
@ -1038,11 +1023,11 @@ $(function () {
$("#main_div").on("mousedown", ".messagebox", mousedown);
$("#main_div").on("mousemove", ".messagebox", mousemove);
$("#main_div").on("mouseover", ".message_row", function (e) {
var row = $(this).closest(".message_row");
var row = $(this);
message_hover(row);
});
$("#main_div").on("mouseleave", ".message_row", function (e) {
$("#main_div").on("mouseout", ".message_row", function (e) {
message_unhover();
});
@ -1299,12 +1284,6 @@ $(function () {
e.stopPropagation();
});
$('body').on('click', '.edit_content', function (e) {
var row = current_msg_list.get_row(rows.id($(this).closest(".message_row")));
message_edit.start(row);
e.stopPropagation();
popovers.hide_all();
});
$('body').on('click', '.edit_subject', function (e) {
var row = current_msg_list.get_row(rows.id($(this).closest(".recipient_row")));
message_edit.start(row);

9
static/styles/zulip.css
View File

@ -896,15 +896,6 @@ td.pointer {
opacity: 1.0;
}
.edit_content {
opacity: .5;
}
.edit_content:hover {
cursor: pointer;
opacity: 1.0;
}
/* Brighten text because of the dark background */
.dark_background {
color: #ffffff;