diff options
| author | Sébastien Theys <seb@odoo.com> | 2020-06-15 18:12:21 +0000 |
|---|---|---|
| committer | Sébastien Theys <seb@odoo.com> | 2020-06-15 18:12:21 +0000 |
| commit | 3fea5b2136627c1d7e83b2a5e111952fe3eb10a1 (patch) | |
| tree | 5eefad07972a87ce4689b83260f981bc87aadad4 /addons/mail/static/src/js/utils.js | |
| parent | 0a82848606151ef60eb6523e9c4c161171f214e7 (diff) | |
[REF] mail, *: refactor messaging with OWL
This commit is a significant rewriting of client-side discuss, chatter,
chat window, and messaging menu using OWL. The behavior should be broadly
the same, with some slight functional changes here and there.
From a technical standpoint, the code of messaging is mainly organized in 2
main groups of modules:
- models, which are logical entities that depict the client-side state of
messaging as a whole.
- components, which are in charge of displaying information from models.
This refactoring also introduces new JS guidelines regarding folder structure
(/static) and naming rules for JS modules.
Community PR: https://github.com/odoo/odoo/pull/39023
Enterprise PR: https://github.com/odoo/enterprise/pull/6249
Task-1914207
This PR is a collaborative work by Alexandre, Julien, Sébastien and Xavier,
with the precious help of Lucas to speed it up towards the end.
closes odoo/odoo#39023
Related: odoo/enterprise#6249
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Co-authored-by: Alexandre Kühn <aku@odoo.com>
Co-authored-by: Julien Giannone <jgi@odoo.com>
Co-authored-by: Lucas Perais <lpe@odoo.com>
Co-authored-by: Sébastien Theys <seb@odoo.com>
Co-authored-by: Xavier Dubuc <xdu@odoo.com>
Diffstat (limited to 'addons/mail/static/src/js/utils.js')
| -rw-r--r-- | addons/mail/static/src/js/utils.js | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js index d4b7d8e7875..d54f5932619 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -5,6 +5,15 @@ var core = require('web.core'); var _t = core._t; +/** + * WARNING: this is not enough to unescape potential XSS contained in htmlString, transformFunction + * should handle it or it should be handled after/before calling parseAndTransform. So if the result + * of this function is used in a t-raw, be very careful. + * + * @param {string} htmlString + * @param {function} transformFunction + * @returns {string} + */ function parseAndTransform(htmlString, transformFunction) { var openToken = "OPEN" + Date.now(); var string = htmlString.replace(/</g, openToken); @@ -17,6 +26,7 @@ function parseAndTransform(htmlString, transformFunction) { return _parseAndTransform(children, transformFunction) .replace(new RegExp(openToken, "g"), "<"); } + /** * @param {Node[]} nodes * @param {function} transformFunction with: @@ -127,6 +137,23 @@ function parseEmail(text) { } } +/** + * Returns an escaped conversion of a content. + * + * @param {string} content + * @returns {string} + */ +function escapeAndCompactTextContent(content) { + //Removing unwanted extra spaces from message + let value = _.escape(content).trim(); + value = value.replace(/(\r|\n){2,}/g, '<br/><br/>'); + value = value.replace(/(\r|\n)/g, '<br/>'); + + // prevent html space collapsing + value = value.replace(/ /g, ' ').replace(/([^>]) ([^<])/g, '$1 $2'); + return value; +} + // Replaces textarea text into html text (add <p>, <a>) // TDE note : should be done server-side, in Python -> use mail.compose.message ? function getTextToHTML(text) { @@ -142,14 +169,6 @@ function timeFromNow(date) { return date.fromNow(); } -function o_clearTimeout(id) { - return clearTimeout(id); -} - -function o_setTimeout(func, delay) { - return setTimeout(func, delay); -} - return { addLink: addLink, getTextToHTML: getTextToHTML, @@ -160,8 +179,7 @@ return { parseEmail: parseEmail, stripHTML: stripHTML, timeFromNow: timeFromNow, - clearTimeout: o_clearTimeout, - setTimeout: o_setTimeout, + escapeAndCompactTextContent, }; }); |
