diff options
| author | Nicolas Lempereur <nle@odoo.com> | 2015-10-02 10:41:29 +0200 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2015-10-02 12:24:05 +0200 |
| commit | cbb8799b6fef8d7da050e294b18dbb4cd4ccffa9 (patch) | |
| tree | 093825d658958967fc0bad6b550e5cf1659628da /addons/web_editor | |
| parent | 20bab327d478cfe8c7cdf95f74d4e1598b21e7b7 (diff) | |
[FIX] web_editor, mass_mailing: summernote oversight and video
* some oversight when updating summernote with d33086c,
* fix style when replacing image with video
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/module/Editor.js | 6 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/summernote.js | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/widgets.js | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js index 732072b5d24..a30ee9c18c8 100644 --- a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js +++ b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js @@ -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); diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index 280a91cd1fd..569d769f801 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -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; diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index bd047254740..76e4d58067b 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -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(); }, |
