diff options
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/discuss.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/addons/mail/static/src/js/discuss.js b/addons/mail/static/src/js/discuss.js index d3ed2b06a1d..ede167aa6a5 100644 --- a/addons/mail/static/src/js/discuss.js +++ b/addons/mail/static/src/js/discuss.js @@ -196,10 +196,10 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, { /** * @override * @param {Object} [options] - // * @param {boolean} [options.phantomjs=false] if set, rendering of non-empty - // * thread will use 'block' display instead of 'flex', because phantomjs - // * sucks with flexbox... TODO: remove this option when we no longer use - // * phantomJS + * @param {boolean} [options.phantomjs=false] if set, rendering of non-empty + * thread will use 'block' display instead of 'flex', because phantomjs + * sucks with flexbox... TODO: remove this option when we no longer use + * phantomJS */ init: function (parent, action, options) { this._super.apply(this, arguments); @@ -223,6 +223,9 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, { this._selectedMessage = null; this._throttledUpdateThreads = _.throttle( this._updateThreads.bind(this), 100, { leading: false }); + + // TODO: remove this option when we no longer use phantomJS + this._withPhantomJS = this.options.phantomjs || false; }, /** * @override @@ -456,6 +459,7 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, { displayEmailIcons: false, displayReplyIcons: true, displayBottomThreadFreeSpace: true, + withPhantomJS: this._withPhantomJS, // TODO: remove this option when we no longer use phantomJS }; }, /** |