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

[FIX]: More TravisCI LINT errors 

[FIX]: Replace eval() function in web_widget_timepicker.js
[FIX]: Change options to data-options in field record defintion
12.0
docmfried 2016-05-18 22:55:09 +02:00 committed by David Alonso
parent 5493ea3e12
commit d0b733c3ec
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_widget_timepicker/README.rst
View File

@ -30,7 +30,7 @@ Set the attribute ``widget=timepicker`` in a ``field`` tag in a form view.
You can pass all options through the "timepicker" field in the options:: You can pass all options through the "timepicker" field in the options::
... ...
<field name="mytimefieldname" `widget=timepicker`` options="{'step': '15', 'disableTextInput': false}"/> <field name="mytimefieldname" `widget=timepicker`` data-options="{'step': '30', 'disableTextInput': false}"/>
... ...
See the available options at https://github.com/jonthornton/jquery-timepicker#timepicker-plugin-for-jquery See the available options at https://github.com/jonthornton/jquery-timepicker#timepicker-plugin-for-jquery

48
web_widget_timepicker/static/src/js/web_widget_timepicker.js
View File

@ -5,6 +5,15 @@ odoo.define('web_widget_timepicker.form_widgets', function (require) {
var formats = require('web.formats'); var formats = require('web.formats');
var common = require('web.form_common'); var common = require('web.form_common');
// Snippet from http://stackoverflow.com/questions/9036429/convert-object-string-to-json
function cleanup_str2json(str) {
return (str.length > 0 && str !== undefined) ? str
// wrap keys without quote with valid double quote
.replace(/([\$\w]+)\s*:/g, function(_, $1){return '"'+$1+'":'})
// replacing single quote wrapped ones to double quote
.replace(/'([^']+)'/g, function(_, $1){return '"'+$1+'"'}) : undefined;
};
var TimePicker = common.AbstractField.extend(common.ReinitializeFieldMixin, { var TimePicker = common.AbstractField.extend(common.ReinitializeFieldMixin, {
is_field_number: true, is_field_number: true,
template: "TimePickerField", template: "TimePickerField",
@ -29,39 +38,24 @@ odoo.define('web_widget_timepicker.form_widgets', function (require) {
}, },
initialize_content: function() { initialize_content: function() {
if(!this.get("effective_readonly")) { if(!this.get("effective_readonly")) {
this.$input = this.$el.find('input'); var custom_options;
var effective_options = this.options; if( this.node.attrs['data-options'] !== undefined && this.node.attrs['data-options'].length > 0) {
// First try to use jquery data function to create object
custom_options = $(this.node).data('options');
if(typeof this.node.attrs.options !== 'undefined' && this.node.attrs.options.length > 0 ) { if(typeof custom_options !== 'object') {
// No garantee that the input data-options string is valid JSON format so try to cleanup
var custom_options = eval('('+ this.node.attrs.options +')'); custom_options = JSON.parse(cleanup_str2json(this.node.attrs['data-options']));
}
// for(var key in custom_options) { }
// console.log('attr key : ' + key);
// console.log('attr value : ' + custom_options[key] );
// }
// if(typeof effective_options === 'object') {
// for(var key in effective_options) {
// console.log('def key : ' + key);
// console.log('def value : ' + effective_options[key] );
// }
// }
if(typeof custom_options === 'object') { if(typeof custom_options === 'object') {
effective_options = $.extend({}, this.options, custom_options ); this.$el.find('input').timepicker($.extend({}, this.options, custom_options ));
} else {
this.$el.find('input').timepicker(this.options);
} }
// if(typeof effective_options === 'object') {
// for(var key in effective_options) {
// console.log('merge key : ' + key);
// console.log('merge value : ' + effective_options[key] );
// }
// }
}
this.$input.timepicker(effective_options);
this.setupFocus(this.$('input')); this.setupFocus(this.$('input'));
} }
}, },