summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-07-31 14:13:43 +0200
committerXavier Morel <xmo@openerp.com>2013-07-31 14:13:43 +0200
commit19eb0a33e032a6e1eb5e5881f0909b479eda67df (patch)
tree88764fe639e1079b26838235efd8a9152173ebf1 /addons/website/static/src
parent023694bcab05bd149789a9d9bc490051dd1c6bff (diff)
[ADD] images upload
bzr revid: xmo@openerp.com-20130731121343-0uy1cfga6rbilkj5
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 9a274c6b99d..ab30b19479b 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -234,6 +234,12 @@ instance.website.RTE = instance.web.Widget.extend({
[Command, "\uf0c1", 'link'],
[Command, "\uf127", 'unlink'],
[Command, "\uf10d", 'blockquote'],
+ // 'image' uses either filebrowserImageUploadUrl or
+ // filebrowserUploadUrl, and provides a `link` tab. imagebutton only
+ // uses filebrowserImageUploadUrl and does not provide a `link` tab to
+ // hotlink an image from the internets.
+ [Command, "\uf03e", 'image'],
+ // [Command, "\uf030", 'imagebutton'],
[Group, "\uf0ca", [
[Command, "\uf0ca", 'bulletedlist'],
[Command, "\uf0cb", 'numberedlist'],
@@ -336,6 +342,7 @@ instance.website.RTE = instance.web.Widget.extend({
allowedContent: true,
// Don't insert paragraphs around content in e.g. <li>
autoParagraph: false,
+ filebrowserImageUploadUrl: "/website/attach",
};
},
// TODO clean