diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-02-08 20:16:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 20:16:33 +0100 |
| commit | f4dc2af71a662a3089ee12e52e2ccdaea6bd6587 (patch) | |
| tree | 81b9a7ec93ff9ee3c6f456b39b26c7682eac7719 /addons/web_editor/static/src/js/common/ace.js | |
| parent | e6e206b14e3c3f0274b9d8e723ab1f40c53efe68 (diff) | |
| parent | 52b27c4c6b38fec21872c7a5d6aa155da0827d11 (diff) | |
[MERGE] website, *: improve customize dialog + add logo sizing
* portal, web, web_editor
See sub-commits for details.
- Many improvements to the customize dialog 'framework'
(toggle switches, new widgets, ...)
- Optimization of RPCs (including ace editor which shares the same code)
- Move navbar options of the customize menu to the customize dialog
- Add the possibility to control the header logo size
- Add the possibility to control the header font size
task-1904244
closes odoo/odoo#29624
Diffstat (limited to 'addons/web_editor/static/src/js/common/ace.js')
| -rw-r--r-- | addons/web_editor/static/src/js/common/ace.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/common/ace.js b/addons/web_editor/static/src/js/common/ace.js index f231bb0aac6..f242129c4a8 100644 --- a/addons/web_editor/static/src/js/common/ace.js +++ b/addons/web_editor/static/src/js/common/ace.js @@ -535,7 +535,7 @@ var ViewEditor = Widget.extend({ } else { var resource = type === 'scss' ? this.scss[resID] : this.js[resID]; return this._rpc({ - route: '/web_editor/reset_scss_or_js', + route: '/web_editor/reset_asset', params: { url: resID, bundle_xmlid: resource.bundle_xmlid, @@ -560,7 +560,7 @@ var ViewEditor = Widget.extend({ var bundleXmlID = sessionIdEndsWithJS ? this.js[session.id].bundle_xmlid : this.scss[session.id].bundle_xmlid; var fileType = sessionIdEndsWithJS ? 'js' : 'scss'; self._rpc({ - route: '/web_editor/save_scss_or_js', + route: '/web_editor/save_asset', params: { url: session.id, bundle_xmlid: bundleXmlID, |
