diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-05 13:17:59 +0200 |
|---|---|---|
| committer | Quentin Smetz (qsm) <qsm@odoo.com> | 2018-07-09 11:59:30 +0200 |
| commit | 2c966909e2c0b5e45912a6ff85577f0b19a5f4c9 (patch) | |
| tree | 71d294f0a0577c13561bf079aa58fd2395653f11 /addons/web_editor/static/lib/summernote/src/js | |
| parent | 49a905321a5b94df6d87355c57c4c1a02d349502 (diff) | |
[FIX] *: fix some side-effects of https://github.com/odoo/odoo/commit/9de1bc0eef6f5bfaa2a8d745431caa361ae91548
- JS Modals were not correctly built anymore, their .modal-body element
was duplicated and many without-effect JS lines were introduced (as a
side effect, the form view design was broken when inside modals)
- Tests were changed to make bugs go unnoticed. For example, the media
dialog functionnality was entirely broken because the .modal-dialog
element was not receiving the correct class anymore.
- The JS translation function is _t, not _
- Do not use the <title/> tag as a regular DOM element, it is meant to
be unique, in the <head/> section
- CSS rules were added to the utils.scss file, which is meant to contain
functions and mixins, otherwise, the rule is duplicated in every asset
- Some icons were still broken, as missed by https://github.com/odoo/odoo/commit/f90cf060a3cfeb37a67bec83264c0aaab8892b56
- Tests were changed to use [role="dialog"]/footer/header in their
selectors without any reason, this commit restores some of that to
avoid rebase conflicts with the BS4 work.
- ...
Note: other elements should still be discussed, like the direct use of
the 'o_form_label' class in views definition... but those do not cause
direct problems.
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src/js')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/Renderer.js | 4 |
1 files changed, 2 insertions, 2 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 c6142333d30..7fa1afe3adc 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -817,7 +817,7 @@ define([ $dialog.addClass('note-air-layout'); $dialog.attr('id', 'note-dialog-' + id); $dialog.find('button.close, a.modal-close').click(function () { - $(this).closest('[role="dialog"]').modal('hide'); + $(this).closest('.modal').modal('hide'); }); $dialog.appendTo($container); }; @@ -905,7 +905,7 @@ define([ var $dialogContainer = options.dialogsInBody ? $(document.body) : $editor; var $dialog = $(tplDialogs(langInfo, options)).prependTo($dialogContainer); $dialog.find('button.close, a.modal-close').click(function () { - $(this).closest('[role="dialog"]').modal('hide'); + $(this).closest('.modal').modal('hide'); }); //09. Editor/Holder switch |
