[FIX] web_editor, mass_mailing: summernote oversight and video

* some oversight when updating summernote with d33086c,
* fix style when replacing image with video
This commit is contained in:
Nicolas Lempereur
2015-10-02 12:24:05 +02:00
parent 20bab327d4
commit cbb8799b6f
4 changed files with 8 additions and 6 deletions
@@ -123,8 +123,8 @@ options.registry["width-x"] = options.Class.extend({
});
var fn_popover_update = $.summernote.eventHandler.popover.update;
$.summernote.eventHandler.popover.update = function ($popover, oStyle, isAirMode) {
var fn_popover_update = $.summernote.eventHandler.modules.popover.update;
$.summernote.eventHandler.modules.popover.update = function ($popover, oStyle, isAirMode) {
fn_popover_update.call(this, $popover, oStyle, isAirMode);
$("span.o_table_handler, div.note-table").remove();
};
@@ -629,7 +629,11 @@ define([
}
var anchors = [];
if (isTextChanged) {
// ODOO: adding this branch to modify existing anchor
var ancestor_anchor = dom.ancestor(rng.sc, dom.isAnchor);
if(ancestor_anchor) {
anchors.push($(ancestor_anchor).html(linkText).get(0));
} else if (isTextChanged) {
// Create a new link when text changed.
var anchor = rng.insertNode($('<A>' + linkText + '</A>')[0]);
anchors.push(anchor);
@@ -15,7 +15,7 @@ var range = $.summernote.core.range;
var list = $.summernote.core.list;
var key = $.summernote.core.key;
var eventHandler = $.summernote.eventHandler;
var editor = eventHandler.editor;
var editor = eventHandler.modules.editor;
var renderer = $.summernote.renderer;
var options = $.summernote.options;
@@ -855,8 +855,6 @@ var VideoDialog = Widget.extend({
var src = $media.data('src');
this.$("input#urlvideo").val(src);
this.get_video();
} else {
this.add_class = "pull-left";
}
return this._super();
},