Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[FIX + ADD] fix markdown update condition on form view, add markdown support on list view

15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
Tran Quang Tri 2015-10-30 18:00:30 +00:00 committed by bobrador
parent 1c8946eac7
commit cb396dad2d
1 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,16 +39,17 @@ openerp.web_widget_text_markdown = function (oe) {
store_dom_value: function () { store_dom_value: function () {
if (!this.get('effective_readonly') && if (!this.get('effective_readonly') &&
this._get_raw_value() !== '' &&
this.is_syntax_valid()) { this.is_syntax_valid()) {
// We use internal_set_value because we were called by // We use internal_set_value because we were called by
// ``.commit_value()`` which is called by a ``.set_value()`` // ``.commit_value()`` which is called by a ``.set_value()``
// itself called because of a ``onchange`` event // itself called because of a ``onchange`` event
this.internal_set_value( this.internal_set_value(
this.parse_value( this.parse_value(
this._get_raw_value())); this._get_raw_value()
} )
}, );
}
},
commit_value: function () { commit_value: function () {
this.store_dom_value(); this.store_dom_value();
@ -58,7 +59,7 @@ openerp.web_widget_text_markdown = function (oe) {
_get_raw_value: function() { _get_raw_value: function() {
if (this.$txt === false) if (this.$txt === false)
return ''; return '';
return this.$txt.val(); return this.$txt.val();
}, },
render_value: function () { render_value: function () {
@ -86,4 +87,35 @@ openerp.web_widget_text_markdown = function (oe) {
} }
} }
); );
/**
* bootstrap_markdown support on list view
**/
oe.web_widget_text_markdown.FieldTextMarkDownList = oe.web.list.Char.extend({
init: function(){
this._super.apply(this, arguments);
hljs.initHighlightingOnLoad();
marked.setOptions({
sanitize: true,
highlight: function (code) {
return hljs.highlightAuto(code).value;
}
});
},
_format: function(row_data, options){
options = options || {};
var markdown_text = marked(
oe.web.format_value(
row_data[this.id].value, this, options.value_if_empty
)
);
return markdown_text;
}
});
oe.web.list.columns.add(
"field.bootstrap_markdown", "oe.web_widget_text_markdown.FieldTextMarkDownList"
);
}; };