diff options
| author | qsm-odoo <qsm@odoo.com> | 2016-02-24 13:13:12 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-02-24 13:47:36 +0100 |
| commit | 6610d05549e347fbb548e606fa66cfb113df9e67 (patch) | |
| tree | fc750ca544b5caa135791c0eaeb10dfee17eefa3 /addons/mass_mailing/static/src/js/mass_mailing_editor.js | |
| parent | 58c5ff1d4f64f16d43106e6b00f0b94fe63506c2 (diff) | |
[REF] web_editor,website,mass_mailing: JS/XML update
* Adapt DOM selectors
* Refactore dialog XMLs to have odoo styling
* New editor options (background-position, ...)
* Various improvements
Diffstat (limited to 'addons/mass_mailing/static/src/js/mass_mailing_editor.js')
| -rw-r--r-- | addons/mass_mailing/static/src/js/mass_mailing_editor.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js index 7b312373e8d..7e84ff62594 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js @@ -165,7 +165,7 @@ web_editor.Class.include({ } var $editable = $("#editable_area"); $(".o_table_handler").remove(); - $editable.parent().add("#oe_snippets, #templates, .note-popover").toggleClass("hidden"); + $editable.add("#oe_snippets, #templates, .note-popover").toggleClass("hidden"); $("#choose_template").children().toggleClass("hidden"); $("body").trigger("resize"); $(window.top).trigger('resize'); @@ -177,7 +177,7 @@ web_editor.Class.include({ var $editable = $("#editable_area"); this.rte.historyRecordUndo($editable); $editable.html( $(event.target).closest(".theme_thumbnail").find(".js_content").html() ); - $editable.parent().add("#oe_snippets, #templates, .note-popover").toggleClass("hidden"); + $editable.add("#oe_snippets, #templates, .note-popover").toggleClass("hidden"); $("#choose_template").children().toggleClass("hidden"); setTimeout(function () { $("body").trigger("resize"); @@ -191,8 +191,8 @@ web_editor.Class.include({ event.preventDefault(); }, set_snippet_theme: function (theme) { - $("#o_left_bar .o_panel_body > div").addClass("hidden"); - $("#o_left_bar .o_panel_body > div."+theme).removeClass("hidden"); + $("#oe_snippets .o_panel_body > div").addClass("hidden"); + $("#oe_snippets .o_panel_body > div."+theme).removeClass("hidden"); $("#editable_area").trigger("content_changed"); }, get_snippet_template: function (mailing_model) { @@ -225,7 +225,7 @@ snippets_editor.Class.include({ clean_for_save: function () { this._super(); var $editable = $("#editable_area"); - var theme = ($("#o_left_bar .o_panel_body > div:not(.hidden)").attr("class") || "").replace(/^\s*|\s*o_mail_block[^\s]+\s*|\s*oe_snippet\s*|\s*ui-draggable\s*|\s*$/g, ''); + var theme = ($("#oe_snippets .o_panel_body > div:not(.hidden)").attr("class") || "").replace(/^\s*|\s*o_mail_block[^\s]+\s*|\s*oe_snippet\s*|\s*ui-draggable\s*|\s*$/g, ''); var $theme = $("#editable_area [data-snippet-theme]").removeAttr("data-snippet-theme").removeData("snippet-theme"); $editable.children().first().attr("data-snippet-theme", theme); $editable.find(":not(br):hidden").remove(); |
