diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-02-11 08:23:05 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-02-11 08:23:05 +0100 |
| commit | af58bb70bc3a8b30827aaada87e469651e7a1abe (patch) | |
| tree | e02375bbcfbaaf5d47859eb817d1db15f43fd14d /addons/website/static/src/js/website.editor.js | |
| parent | 9570f10c09a74a93082d592a4aae68d10dbef23b (diff) | |
| parent | 06c3efde04bfaa7f2e8bd7bab59a5c70a6fc4d17 (diff) | |
[MERGE] Merge trunk
bzr revid: rim@openerp.com-20140211072305-uzc1oocfn4jnuf8i
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 1e8246366a9..7e867dca685 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -638,7 +638,7 @@ image_dialog(editor, new CKEDITOR.dom.element(previous)); $image_button.hide(); previous = null; - }); + }, 'btn-sm'); // previous is the state of the button-trigger: it's the // currently-ish hovered element which can trigger a button showing. |