diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-22 16:49:33 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-22 16:49:33 +0200 |
| commit | 618fbde36f2dc4797f68906ab105f8c0ecd59169 (patch) | |
| tree | 6d303e31e96a49e1fc9f515cdf4618b70b9ad2ed /addons/website/static/src/js/website.snippets.editor.js | |
| parent | b97ac5b559f63159abb6fbf53a35f753b7e6b525 (diff) | |
| parent | 12beacda08dd023c1590ecbedcb76f305695e251 (diff) | |
[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
Diffstat (limited to 'addons/website/static/src/js/website.snippets.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index f59f2cf07ca..bae014029e1 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -161,6 +161,7 @@ return this._super.apply(this, arguments); }, save: function () { + website.snippet.clean_for_save = true; this.snippets.clean_for_save(); this._super(); }, @@ -1518,6 +1519,9 @@ }); }, onFocus : function () { + // don't open media editor before clean for save + if (website.snippet.clean_for_save) return; + var self = this; if (this.$target.parent().data("oe-field") === "image") { this.$overlay.addClass("hidden"); |