diff options
| author | Martin Trigaux <mat@openerp.com> | 2014-05-13 12:31:57 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2014-05-13 12:31:57 +0200 |
| commit | 00a4845bc724a60e990eaf542acaf9e76bf56f12 (patch) | |
| tree | f11bf0384f9d8e807c9f4ce2e2edc2d43a34aa66 /addons | |
| parent | eed75b620d0a28bac22ee5b3fd1ce4dbe1cb54bf (diff) | |
[FIX] website_blog: fix broken change cover wizard
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_blog/static/src/js/website_blog.editor.js | 17 | ||||
| -rw-r--r-- | addons/website_blog/views/website_blog_templates.xml | 1 |
2 files changed, 10 insertions, 8 deletions
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js index 103b2bee1e7..4a18b5e406b 100644 --- a/addons/website_blog/static/src/js/website_blog.editor.js +++ b/addons/website_blog/static/src/js/website_blog.editor.js @@ -30,11 +30,12 @@ }, }), edit: function () { + var self = this; $('.popover').remove(); this._super(); var vHeight = $(window).height(); - $('body').on('click','#change_cover',_.bind(this.change_bg,{},vHeight)); - $('body').on('click', '#clear_cover',_.bind(this.clean_bg,{},vHeight)); + $('body').on('click','#change_cover',_.bind(this.change_bg, self.rte.editor, vHeight)); + $('body').on('click', '#clear_cover',_.bind(this.clean_bg, self.rte.editor, vHeight)); }, save : function() { var res = this._super(); @@ -51,12 +52,12 @@ }, change_bg : function(vHeight) { var self = this; - var editor = new website.editor.ImageDialog(); - editor.on('start', self, function (o) { - o.url = $('.js_fullheight').length ? $('.js_fullheight').css('background-image').replace(/url\(|\)|"|'/g,'') : ''; - }); - editor.on('save', self, function (o) { - $('.js_fullheight').css({"background-image": o.url && o.url !== "" ? 'url(' + o.url + ')' : "", 'min-height': vHeight}) + var element = new CKEDITOR.dom.element(self.element.find('.cover-storage').$[0]); + var editor = new website.editor.MediaDialog(self, element); + $(document.body).on('media-saved', self, function (o) { + var url = $('.cover-storage').attr('src'); + $('.js_fullheight').css({"background-image": !_.isUndefined(url) ? 'url(' + url + ')' : "", 'min-height': vHeight}); + $('.cover-storage').remove(); }); editor.appendTo('body'); }, diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 7d7bdbf86a3..20d042830e7 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -187,6 +187,7 @@ <span class="fa fa-times"/> </a> </div> + <div class="cover-storage oe_hidden"></div> <t t-call="website.publish_management"> <t t-set="object" t-value="blog_post"/> <t t-set="publish_edit" t-value="True"/> |