diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-05 16:20:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-05 16:20:48 +0100 |
| commit | eefca5d492d6f35dd4b063a294b6b8a0a576e83e (patch) | |
| tree | 0776e0015aaca70d5d71986846391466a12516e4 /addons/web_editor | |
| parent | 1ed7f219a59a2ff036bcaf72cb423b961a39802c (diff) | |
| parent | 73610ff99216ff31eedb6c0a587846ce9209e095 (diff) | |
[MERGE] forward port branch saas-11.1 up to 73610ff9921
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/i18n/nl.po | 6 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/editor/rte.js | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/addons/web_editor/i18n/nl.po b/addons/web_editor/i18n/nl.po index 96521ccd9ad..c54f6b21ec4 100644 --- a/addons/web_editor/i18n/nl.po +++ b/addons/web_editor/i18n/nl.po @@ -4,7 +4,7 @@ # # Translators: # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016 -# Martin Trigaux <mat@odoo.com>, 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016 # Eric Geens <ericgeens@yahoo.com>, 2016 # Cas Vissers <casvissers@brahoo.nl>, 2017 @@ -332,7 +332,7 @@ msgstr "Inhoud om te vertalen" #: code:addons/web_editor/static/src/xml/editor.xml:194 #, python-format msgid "Copy-paste your URL or embed code here" -msgstr "Kopieer uw URL of embed uw sluit uw code hier in" +msgstr "Kopieer uw URL of uw insluitcode hier" #. module: web_editor #. openerp-web @@ -683,7 +683,7 @@ msgstr "Verberg volledig-scherm knop" #: code:addons/web_editor/static/src/xml/editor.xml:210 #, python-format msgid "Hide player controls" -msgstr "Verberg player knoppen" +msgstr "Verberg afspeel knoppen" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/static/src/js/editor/rte.js b/addons/web_editor/static/src/js/editor/rte.js index 7ad20c0e614..76b1a1dd11b 100644 --- a/addons/web_editor/static/src/js/editor/rte.js +++ b/addons/web_editor/static/src/js/editor/rte.js @@ -385,7 +385,15 @@ var RTEWidget = Widget.extend({ } else { rng = $editable.data('range') || rng; } - rng.select(); + try { + // TODO this line might break for unknown reasons. I suppose that + // the created range is an invalid one. As it might be tricky to + // adapt that line and that it is not a critical one, temporary fix + // is to ignore the errors that this generates. + rng.select(); + } catch (e) { + console.log('error', e); + } history.recordUndo($editable, event, internal_history); }, /** |