diff options
| author | qsm-odoo <qsm@odoo.com> | 2016-07-05 17:38:58 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-07-05 18:05:24 +0200 |
| commit | 73898ccb8bc089b13b1ad50077abc3665fcf39f4 (patch) | |
| tree | 0a574fe3c931b2a05039790f375d11b32ad148de /addons/web_editor/static/lib/summernote/src/js | |
| parent | c259b38ef593a4780256d26c08465c3640203645 (diff) | |
[IMP] web_editor: change image edition toolbar
* Move description button at the end of the toolbar
* Add an "auto" state button for the image width (alongside 100%,
50% and 25%) (when these last three are unchecked, the auto button
becomes checked).
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src/js')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/Renderer.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/Renderer.js b/addons/web_editor/static/lib/summernote/src/js/Renderer.js index 52d0975ee47..51190b58695 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -267,7 +267,7 @@ define([ return colorButton + foregroundButton + backgroundButton; function formatStr(str, values) { - return str.replace(/{(\d+)}/g, function (match, number) { + return str.replace(/{(\d+)}/g, function (match, number) { return (values[number] !== undefined)? values[number] : match; }); }; @@ -437,6 +437,10 @@ define([ }; var tplImagePopover = function () { + var autoButton = tplButton('<span class="note-fontsize-10">Auto</span>', { + event: 'resize', + value: 'auto' + }); var fullButton = tplButton('<span class="note-fontsize-10">100%</span>', { title: lang.image.resizeFull, event: 'resize', @@ -496,7 +500,7 @@ define([ value: 'none' }); - var content = (options.disableResizeImage ? '' : '<div class="btn-group">' + fullButton + halfButton + quarterButton + '</div>') + + var content = (options.disableResizeImage ? '' : '<div class="btn-group">' + autoButton + fullButton + halfButton + quarterButton + '</div>') + '<div class="btn-group">' + leftButton + rightButton + justifyButton + '</div>' + '<div class="btn-group">' + roundedButton + circleButton + thumbnailButton + noneButton + '</div>' + '<div class="btn-group">' + removeButton + '</div>'; @@ -869,7 +873,7 @@ define([ //03. create editable var isContentEditable = !$holder.is(':disabled'); var $editable = $('<div class="note-editable panel-body" contentEditable="' + isContentEditable + '"></div>').prependTo($editingArea); - + if (options.height) { $editable.height(options.height); } |
