Distinguish "attachment-wrapper" elements from attachments.

The HTML for attachments always has the following form:

<div class="attachment-wrapper" id="something" style="display: block;">
  <actual attachment element>
</div>

The <div> element controls attachment visibility through its "display"
style attribute, which is either "block" or "none".

Problem is the <actual attachment element> was getting the same ID as
its parent <div> element.  So when either element was requested by ID,
in certain cases the wrong element was returned and caused misbehavior
and console warnings.

Solve this by adding a "wrapper" suffix to the <div> element ID.  So in
the example above, id="something" gets the <actual attachment element>,
whereas id="something.wrapper" gets the <div> element.

1 files changed, 7 insertions, 1 deletions

diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index 50fbe844f3..9e44901fce 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -316,10 +316,15 @@ emfe_attachment_format (EMailFormatterExtension *extension,
 		}
 
 		if (success) {
+			gchar *wrapper_element_id;
+
+			wrapper_element_id = g_strconcat (
+				attachment_part_id, ".wrapper", NULL);
+
 			str = g_strdup_printf (
 				"<tr><td colspan=\"2\">"
 				"<div class=\"attachment-wrapper\" id=\"%s\">",
-				attachment_part_id);
+				wrapper_element_id);
 
 			camel_stream_write_string (
 				stream, str, cancellable, NULL);
@@ -333,6 +338,7 @@ emfe_attachment_format (EMailFormatterExtension *extension,
 			camel_stream_write_string (
 				stream, "</div></td></tr>", cancellable, NULL);
 
+			g_free (wrapper_element_id);
 			g_free (str);
 		}