diff options
| author | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-09-24 12:19:13 +0530 |
|---|---|---|
| committer | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-09-24 12:19:13 +0530 |
| commit | ce9a7ccccee2b668307bcef75f39478835e16505 (patch) | |
| tree | aa1e37df388a1e190c51b2bbaa56858f5fce0d18 /addons/website/static/src/js/website.editor.js | |
| parent | 8fc38776462d912e1103a66e4eee839f325d0db0 (diff) | |
| parent | 3862a4e83da1c1bda2711d17d55148a41a3ee504 (diff) | |
[MERGE] Merged trunk-website-al
bzr revid: psa@tinyerp.com-20130924064913-fgr3btfwwbtb68xn
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 0c32cf40fb2..b82f665c838 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -406,6 +406,9 @@ allowedContent: true, // Don't insert paragraphs around content in e.g. <li> autoParagraph: false, + // Don't automatically add or <br> in empty block-level + // elements when edition starts + fillEmptyBlocks: false, filebrowserImageUploadUrl: "/website/attach", // Support for sharedSpaces in 4.x extraPlugins: 'sharedspace,customdialogs,tablebutton,oeref', @@ -646,7 +649,7 @@ return openerp.jsonRpc('/web/dataset/call_kw', 'call', { model: 'website', method: 'list_pages', - args: [], + args: [null], kwargs: { context: website.get_context() }, |