Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_widget_text_markdown : use lexer on text field only (#942) 

Fixes #937
pull/2136/head
Nicolas JEUDY 2018-10-02 08:13:19 +02:00 committed by Olga Marco
parent 52a8a108a6
commit 812cda7834
10 changed files with 108 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_widget_text_markdown/i18n/ar.po
View File

@ -22,7 +22,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "مارك داون"

2
web_widget_text_markdown/i18n/de.po
View File

@ -21,7 +21,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "Abschlag"

2
web_widget_text_markdown/i18n/es.po
View File

@ -21,7 +21,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "MarkDown"

2
web_widget_text_markdown/i18n/fi.po
View File

@ -21,7 +21,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "Markdown"

2
web_widget_text_markdown/i18n/fr.po
View File

@ -21,7 +21,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "MarkDown"

2
web_widget_text_markdown/i18n/pt_BR.po
View File

@ -21,7 +21,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "MarkDown"

2
web_widget_text_markdown/i18n/sl.po
View File

@ -22,7 +22,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "MarkDown"

2
web_widget_text_markdown/i18n/tr.po
View File

@ -21,7 +21,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr "MarkDown"

2
web_widget_text_markdown/i18n/web_widget_text_markdown.pot
View File

@ -15,7 +15,7 @@ msgstr ""
#. module: web_widget_text_markdown
#. openerp-web
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:21
#: code:addons/web_widget_text_markdown/static/src/js/web_widget_text_markdown.js:20
#, python-format
msgid "MarkDown"
msgstr ""

9
web_widget_text_markdown/static/src/js/web_widget_text_markdown.js
View File

@ -14,8 +14,7 @@ odoo.define("web_widget_text_markdown.bootstrap_markdown",
var list_widget_registry = core.list_widget_registry;
var FieldTextMarkDown = form_common.AbstractField.extend(
form_common.ReinitializeFieldMixin,
{
form_common.ReinitializeFieldMixin, {
template: 'FieldMarkDown',
display_name: _lt('MarkDown'),
@ -70,8 +69,9 @@ odoo.define("web_widget_text_markdown.bootstrap_markdown",
},
_get_raw_value: function() {
if (this.$txt === false)
if (this.$txt === false) {
return '';
}
return this.$txt.val();
},
@ -121,6 +121,7 @@ odoo.define("web_widget_text_markdown.bootstrap_markdown",
},
_format: function(row_data, options) {
if (this.type === "text") {
options = options || {};
var markdown_text = marked(
formats.format_value(
@ -129,6 +130,8 @@ odoo.define("web_widget_text_markdown.bootstrap_markdown",
);
return markdown_text;
}
return this._super(row_data, options)
}
});
list_widget_registry.add('field.bootstrap_markdown', ListView.Column);