From 18e7ea06a64aed357739eea67f91aed4caa7f229 Mon Sep 17 00:00:00 2001 From: Iryna Vyshnevska Date: Fri, 26 Jul 2019 15:26:10 +0300 Subject: [PATCH] [12.0][MIG] web_send_message_popup: migrate --- web_send_message_popup/__manifest__.py | 4 +-- .../i18n/web_send_message_popup.pot | 14 ----------- web_send_message_popup/readme/ROADMAP.rst | 3 --- .../static/src/js/chatter.js | 25 ++++++------------- 4 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 web_send_message_popup/i18n/web_send_message_popup.pot delete mode 100644 web_send_message_popup/readme/ROADMAP.rst diff --git a/web_send_message_popup/__manifest__.py b/web_send_message_popup/__manifest__.py index 5d3de4331..7912ca0ff 100644 --- a/web_send_message_popup/__manifest__.py +++ b/web_send_message_popup/__manifest__.py @@ -1,8 +1,8 @@ -# Copyright 2014-2018 Camptocamp SA +# Copyright 2014-2019 Camptocamp SA # License AGPL-3.0 or later (http://gnu.org/licenses/agpl). { 'name': 'Web Send Message as Popup', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'author': "Camptocamp, Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', 'license': 'AGPL-3', diff --git a/web_send_message_popup/i18n/web_send_message_popup.pot b/web_send_message_popup/i18n/web_send_message_popup.pot deleted file mode 100644 index 447d3bb3c..000000000 --- a/web_send_message_popup/i18n/web_send_message_popup.pot +++ /dev/null @@ -1,14 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - diff --git a/web_send_message_popup/readme/ROADMAP.rst b/web_send_message_popup/readme/ROADMAP.rst deleted file mode 100644 index ca2a85a28..000000000 --- a/web_send_message_popup/readme/ROADMAP.rst +++ /dev/null @@ -1,3 +0,0 @@ -* works even if bit flickering as it renders 1st the std widget and then shows the - other one. @simahawk checked the code and unfortunately seems there's no good - way to hook if not overriding whole big functions. diff --git a/web_send_message_popup/static/src/js/chatter.js b/web_send_message_popup/static/src/js/chatter.js index 89f88544b..441da7ce0 100644 --- a/web_send_message_popup/static/src/js/chatter.js +++ b/web_send_message_popup/static/src/js/chatter.js @@ -1,4 +1,4 @@ -/* Copyright 2018 Camptocamp SA +/* Copyright 2019 Camptocamp SA * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ odoo.define('web_send_message_popup.Chatter', function (require) { "use strict"; @@ -7,22 +7,11 @@ odoo.define('web_send_message_popup.Chatter', function (require) { Chatter.include({ _onOpenComposerMessage: function () { - // wait for composer input to be initialized - // taken from http://stackoverflow.com/questions/7307983/while-variable-is-not-defined-wait - var self = this; - $.when(this._super.apply(this, arguments)).then(function () { - function checkVariable() { - if (typeof self.composer !== 'undefined' && typeof self.composer.$input !== 'undefined') { - self.composer.on_open_full_composer(); - } - else { - setTimeout(function () { - checkVariable(); - }, 50); - } - } - checkVariable(); - }); - } + this._super.apply(this, arguments); + this.suggested_partners_def.done($.proxy(function () { + this._closeComposer(true); + this._composer._onOpenFullComposer(); + }, this)); + }, }); });