[evolution/wip/webkit2] EHTMLEditorView - Improve tables handling in composer

[Tomas Popela <tpopela src gnome org>]

commit 47b9ebd4b39a406c625ef6152d6a26f72c48b8b6
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Apr 22 14:12:03 2015 +0200

    EHTMLEditorView - Improve tables handling in composer
    
    When switching mode to plain text mode hide the borders, and set width
    according to word wrap width. When hovering over the cell show red
    outline around it.

 e-util/e-html-editor-view.c                       |   29 +++++++++--
 web-extensions/e-html-editor-view-dom-functions.c |   53 ++++++++++++++++++++-
 2 files changed, 76 insertions(+), 6 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 9417e7e..81dd55f 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -207,10 +207,6 @@ e_html_editor_view_redo (EHTMLEditorView *view)
 static void
 html_editor_view_user_changed_contents_cb (EHTMLEditorView *view)
 {
-       WebKitWebView *web_view;
-
-       web_view = WEBKIT_WEB_VIEW (view);
-
        e_html_editor_view_set_changed (view, TRUE);
 }
 
@@ -2486,7 +2482,7 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view)
         * unicode zero width space before each cell. */
        g_string_append (
                stylesheet,
-               "td::before {\n"
+               "td:before {\n"
                " content: \"\xe2\x80\x8b\";"
                "}\n");
 
@@ -2510,6 +2506,29 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view)
 
        g_string_append (
                stylesheet,
+               "td:hover "
+               "{\n"
+               "  outline: 1px dotted red;\n"
+               "}\n");
+
+       g_string_append_printf (
+               stylesheet,
+               ".-x-evo-plaintext-table "
+               "{\n"
+               "  border-collapse: collapse;\n"
+               "  width: %dch;\n"
+               "}\n",
+               g_settings_get_int (view->priv->mail_settings, "composer-word-wrap-length"));
+
+       g_string_append (
+               stylesheet,
+               ".-x-evo-plaintext-table td"
+               "{\n"
+               "  vertical-align: top;\n"
+               "}\n");
+
+       g_string_append (
+               stylesheet,
                "td > *"
                "{\n"
                "  display : inline-block;\n"
diff --git a/web-extensions/e-html-editor-view-dom-functions.c 
b/web-extensions/e-html-editor-view-dom-functions.c
index 73009ef..8a3f437 100644
--- a/web-extensions/e-html-editor-view-dom-functions.c
+++ b/web-extensions/e-html-editor-view-dom-functions.c
@@ -1633,6 +1633,8 @@ surround_text_with_paragraph_if_needed (WebKitDOMDocument *document,
            (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent) ||
             WEBKIT_DOM_IS_HTML_TABLE_CELL_ELEMENT (parent))) {
                element = dom_put_node_into_paragraph (document, extension, node, TRUE);
+               if (WEBKIT_DOM_IS_HTML_TABLE_CELL_ELEMENT (parent))
+                       webkit_dom_element_remove_attribute (element, "style");
 
                if (WEBKIT_DOM_IS_HTML_BR_ELEMENT (next_sibling))
                        remove_node (next_sibling);
@@ -5771,7 +5773,7 @@ toggle_paragraphs_style_in_element (WebKitDOMDocument *document,
        WebKitDOMNodeList *paragraphs;
 
        paragraphs = webkit_dom_element_query_selector_all (
-               element, ".-x-evo-paragraph", NULL);
+               element, ":not(td) > .-x-evo-paragraph", NULL);
 
        length = webkit_dom_node_list_get_length (paragraphs);
 
@@ -7330,6 +7332,53 @@ dom_check_if_conversion_needed (WebKitDOMDocument *document)
        return convert;
 }
 
+static void
+rename_attribute (WebKitDOMElement *element,
+                  const gchar *from,
+                  const gchar *to)
+{
+       gchar *value;
+
+       value = webkit_dom_element_get_attribute (element, from);
+       if (value)
+               webkit_dom_element_set_attribute (element, to, value, NULL);
+       webkit_dom_element_remove_attribute (element, from);
+}
+
+static void
+toggle_tables (WebKitDOMDocument *document,
+               gboolean html_mode)
+{
+       WebKitDOMNodeList *list;
+       gint ii, length;
+
+       list = webkit_dom_document_query_selector_all (document, "table", NULL);
+       length = webkit_dom_node_list_get_length (list);
+
+       for (ii = 0; ii < length; ii++) {
+               WebKitDOMNode *table = webkit_dom_node_list_item (list, ii);
+
+               if (html_mode) {
+                       element_remove_class (WEBKIT_DOM_ELEMENT (table), "-x-evo-plaintext-table");
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "data-width", "width");
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "data-cellspacing", "cellspacing");
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "data-cellpadding", "cellpadding");
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "data-border", "border");
+               } else {
+                       element_add_class (WEBKIT_DOM_ELEMENT (table), "-x-evo-plaintext-table");
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "width", "data-width");
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "cellspacing", "data-cellspacing");
+                       webkit_dom_element_set_attribute (WEBKIT_DOM_ELEMENT (table), "cellspacing", "0", 
NULL);
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "cellpadding", "data-cellpadding");
+                       webkit_dom_element_set_attribute (WEBKIT_DOM_ELEMENT (table), "cellpadding", "0", 
NULL);
+                       rename_attribute (WEBKIT_DOM_ELEMENT (table), "border", "data-border");
+                       webkit_dom_element_set_attribute (WEBKIT_DOM_ELEMENT (table), "border", "0", NULL);
+               }
+               g_object_unref (table);
+       }
+       g_object_unref (list);
+}
+
 void
 dom_process_content_after_mode_change (WebKitDOMDocument *document,
                                        EHTMLEditorWebExtension *extension)
@@ -7349,6 +7398,7 @@ dom_process_content_after_mode_change (WebKitDOMDocument *document,
 
                toggle_paragraphs_style (document, extension);
                toggle_smileys (document, extension);
+               toggle_tables (document, html_mode);
                remove_wrapping_from_document (document);
        } else {
                gchar *plain;
@@ -7363,6 +7413,7 @@ dom_process_content_after_mode_change (WebKitDOMDocument *document,
 
                toggle_paragraphs_style (document, extension);
                toggle_smileys (document, extension);
+               toggle_tables (document, html_mode);
                remove_images (document);
                remove_background_images_in_document (document);