3
0
Fork 0

Merge PR #1342 into 11.0

Signed-off-by sbidoul
11.0
OCA-git-bot 2019-07-29 16:36:36 +00:00
commit e48e370cd0
5 changed files with 18 additions and 48 deletions

View File

@ -39,13 +39,6 @@ if the popup is always wanted.
.. contents::
:local:
Known issues / Roadmap
======================
* 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.
Bug Tracker
===========

View File

@ -2,7 +2,7 @@
# License AGPL-3.0 or later (http://gnu.org/licenses/agpl).
{
'name': 'Web Send Message as Popup',
'version': '11.0.1.0.0',
'version': '11.0.1.0.1',
'author': "Camptocamp, Odoo Community Association (OCA)",
'maintainer': 'Camptocamp',
'license': 'AGPL-3',

View File

@ -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.

View File

@ -378,26 +378,17 @@ if the popup is always wanted.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#known-issues-roadmap" id="id1">Known issues / Roadmap</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="known-issues-roadmap">
<h1><a class="toc-backref" href="#id1">Known issues / Roadmap</a></h1>
<ul class="simple">
<li>works even if bit flickering as it renders 1st the std widget and then shows the
other one. &#64;simahawk checked the code and unfortunately seems theres no good
way to hook if not overriding whole big functions.</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
@ -405,15 +396,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
<h1><a class="toc-backref" href="#id2">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<h2><a class="toc-backref" href="#id3">Authors</a></h2>
<ul class="simple">
<li>Camptocamp</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
<ul class="simple">
<li>Guewen Baconnier &lt;<a class="reference external" href="mailto:guewen.baconnier&#64;camptocamp.com">guewen.baconnier&#64;camptocamp.com</a>&gt;</li>
<li>Yannick Vaucher &lt;<a class="reference external" href="mailto:yannick.vaucher&#64;camptocamp.com">yannick.vaucher&#64;camptocamp.com</a>&gt;</li>
@ -422,7 +413,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose

View File

@ -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.on_open_full_composer();
}, this));
},
});
});