From ef86f6d12ae12c3d450bb6feba1f40f9d7fa3b54 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 7 Nov 2013 10:42:56 +0100 Subject: [PATCH] [FIX] website snippet: the 'insert block' button is loaded before the editor widget -> confusing in slow connectivity bzr revid: chm@openerp.com-20131107094256-nqp5coey0fy732pl --- addons/website/static/src/js/website.snippets.js | 13 ++++++++++--- addons/website/static/src/xml/website.snippets.xml | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index 16dab3af262..6a9c4039e97 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -17,9 +17,15 @@ return this._super(); }, edit: function () { + var self = this; $("body").off('click'); window.snippets = this.snippets = new website.snippet.BuildingBlock(this); this.snippets.appendTo(this.$el); + + this.rte.on('rte:ready', this, function () { + self.snippets.$button.removeClass("hidden"); + }); + return this._super.apply(this, arguments); }, save: function () { @@ -118,10 +124,11 @@ start: function() { var self = this; - var $ul = this.parent.$("#website-top-edit ul"); + this.$button = $(openerp.qweb.render('website.snippets_button')) + .prependTo(this.parent.$("#website-top-edit ul")) + .find("button"); - var $button = $(openerp.qweb.render('website.snippets_button')).prependTo($ul); - $button.find('button').click(function () { + this.$button.click(function () { self.make_active(false); self.$el.toggleClass("hidden"); }); diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 103392a23b7..587c36a71bc 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -3,7 +3,7 @@ - +