pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] web: normalized indentation in list_renderer

Browse Source
This commit is contained in:
Vincent Schippefilt
2018-08-23 13:10:07 +02:00
parent 62b962da0b
commit cb019bbb3b
1 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/list/list_renderer.js
+41 -43
View File
@@ -39,9 +39,9 @@ var ListRenderer = BasicRenderer.extend({
'click thead th.o_column_sortable': '_onSortColumn',
'click .o_group_header': '_onToggleGroup',
'click thead .o_list_record_selector input': '_onToggleSelection',
'keypress thead tr td' : '_onKeyPress',
'keydown tr' : '_onKeyDown',
'keydown thead tr' : '_onKeyDown',
'keypress thead tr td': '_onKeyPress',
'keydown tr': '_onKeyDown',
'keydown thead tr': '_onKeyDown',
},
/**
* @constructor
@@ -76,7 +76,7 @@ var ListRenderer = BasicRenderer.extend({
* @override
* @public
*/
giveFocus:function() {
giveFocus: function () {
this.$('tbody .o_list_record_selector input:first()').focus();
},
/**
@@ -140,7 +140,7 @@ var ListRenderer = BasicRenderer.extend({
return;
}
var func = (attrs.sum && 'sum') || (attrs.avg && 'avg') ||
(attrs.max && 'max') || (attrs.min && 'min');
(attrs.max && 'max') || (attrs.min && 'min');
if (func) {
var count = 0;
var aggregateValue = (func === 'max') ? -Infinity : (func === 'min') ? Infinity : 0;
@@ -177,7 +177,7 @@ var ListRenderer = BasicRenderer.extend({
*/
_getNumberOfCols: function () {
var n = this.columns.length;
return this.hasSelectors ? n+1 : n;
return this.hasSelectors ? n + 1 : n;
},
/**
* Removes the columns which should be invisible.
@@ -216,7 +216,7 @@ var ListRenderer = BasicRenderer.extend({
var self = this;
return _.map(this.columns, function (column, index) {
if (isHeader && index < HEADING_COLUMNS_TO_SKIP_IN_GROUPS-1 &&
if (isHeader && index < HEADING_COLUMNS_TO_SKIP_IN_GROUPS - 1 &&
self.columns.length > HEADING_COLUMNS_TO_SKIP_IN_GROUPS) {
return;
}
@@ -229,7 +229,7 @@ var ListRenderer = BasicRenderer.extend({
if (!formatFunc) {
formatFunc = field_utils.format[field.type];
}
var formattedValue = formatFunc(value, field, {escape: true});
var formattedValue = formatFunc(value, field, { escape: true });
$cell.addClass('o_list_number').attr('title', help).html(formattedValue);
}
return $cell;
@@ -282,7 +282,7 @@ var ListRenderer = BasicRenderer.extend({
tdClassName += (' o_' + node.attrs.widget + '_cell');
}
}
var $td = $('<td>', {class: tdClassName});
var $td = $('<td>', { class: tdClassName });
// We register modifiers on the <td> element so that it gets the correct
// modifiers classes (for styling)
@@ -435,32 +435,32 @@ var ListRenderer = BasicRenderer.extend({
name = name || _t('Undefined');
}
var $th = $('<th>')
.addClass('o_group_name')
.text(name + ' (' + group.count + ')');
.addClass('o_group_name')
.text(name + ' (' + group.count + ')');
if (this.columns.length >= HEADING_COLUMNS_TO_SKIP_IN_GROUPS) {
$th.attr('colspan',HEADING_COLUMNS_TO_SKIP_IN_GROUPS);
$th.attr('colspan', HEADING_COLUMNS_TO_SKIP_IN_GROUPS);
}
var $arrow = $('<span>')
.css('padding-left', (groupLevel * 20) + 'px')
.css('padding-right', '5px')
.addClass('fa');
.css('padding-left', (groupLevel * 20) + 'px')
.css('padding-right', '5px')
.addClass('fa');
if (group.count > 0) {
$arrow.toggleClass('fa-caret-right', !group.isOpen)
.toggleClass('fa-caret-down', group.isOpen);
.toggleClass('fa-caret-down', group.isOpen);
}
$th.prepend($arrow);
if (group.isOpen && !group.groupedBy.length && (group.count > group.data.length)) {
var $pager = this._renderGroupPager(group);
var $lastCell = $cells[$cells.length-1];
var $lastCell = $cells[$cells.length - 1];
$lastCell.addClass('o_group_pager').append($pager);
}
return $('<tr>')
.addClass('o_group_header')
.toggleClass('o_group_open', group.isOpen)
.toggleClass('o_group_has_content', group.count > 0)
.data('group', group)
.append($th)
.append($cells);
.addClass('o_group_header')
.toggleClass('o_group_open', group.isOpen)
.toggleClass('o_group_has_content', group.count > 0)
.data('group', group)
.append($th)
.append($cells);
},
/**
* Render all groups in the view. We assume that the view is in grouped
@@ -515,7 +515,7 @@ var ListRenderer = BasicRenderer.extend({
*/
_renderHeader: function (isGrouped) {
var $tr = $('<tr>')
.append(_.map(this.columns, this._renderHeaderCell.bind(this)));
.append(_.map(this.columns, this._renderHeaderCell.bind(this)));
if (this.hasSelectors) {
$tr.prepend(this._renderSelector('th'));
}
@@ -546,19 +546,18 @@ var ListRenderer = BasicRenderer.extend({
if (description === undefined) {
description = node.attrs.string || field.string;
}
$th
.text(description)
$th.text(description)
.data('name', name)
.toggleClass('o-sort-down', isNodeSorted ? !order[0].asc : false)
.toggleClass('o-sort-up', isNodeSorted ? order[0].asc : false)
.addClass(field.sortable && 'o_column_sortable');
if (isNodeSorted) {
$th.attr('aria-sort', order[0].asc ? 'ascending': 'descending');
$th.attr('aria-sort', order[0].asc ? 'ascending' : 'descending');
}
if (field.type === 'float' || field.type === 'integer' || field.type === 'monetary') {
$th.css({textAlign: 'right'});
$th.css({ textAlign: 'right' });
}
if (config.debug) {
@@ -584,13 +583,13 @@ var ListRenderer = BasicRenderer.extend({
var self = this;
this.defs = []; // TODO maybe wait for those somewhere ?
var $cells = _.map(this.columns, function (node, index) {
return self._renderBodyCell(record, node, index, {mode: 'readonly'});
return self._renderBodyCell(record, node, index, { mode: 'readonly' });
});
delete this.defs;
var $tr = $('<tr/>', {class: 'o_data_row'})
.data('id', record.id)
.append($cells);
var $tr = $('<tr/>', { class: 'o_data_row' })
.data('id', record.id)
.append($cells);
if (this.hasSelectors) {
$tr.prepend(this._renderSelector('td', !record.res_id));
}
@@ -626,8 +625,8 @@ var ListRenderer = BasicRenderer.extend({
$content.find("input[type='checkbox']").prop('disabled', disableInput);
}
return $('<' + tag + ' width="1">')
.addClass('o_list_record_selector')
.append($content);
.addClass('o_list_record_selector')
.append($content);
},
/**
* Main render function for the list. It is rendered as a table. For now,
@@ -656,8 +655,7 @@ var ListRenderer = BasicRenderer.extend({
}
var $table = $('<table>').addClass('o_list_view table table-sm table-hover table-striped');
this.$el
.addClass('table-responsive')
this.$el.addClass('table-responsive')
.append($table);
var is_grouped = !!this.state.groupedBy.length;
this._computeAggregates();
@@ -720,7 +718,7 @@ var ListRenderer = BasicRenderer.extend({
*/
_updateSelection: function () {
var $selectedRows = this.$('tbody .o_list_record_selector input:checked')
.closest('tr');
.closest('tr');
this.selection = _.map($selectedRows, function (row) {
return $(row).data('id');
});
@@ -739,9 +737,9 @@ var ListRenderer = BasicRenderer.extend({
* @private
* @param {KeyboardEvent} e
*/
_onKeyDown : function(e) {
_onKeyDown: function (e) {
if (!this.editable) {
switch(e.which) {
switch (e.which) {
case $.ui.keyCode.DOWN:
$(e.currentTarget).next().find('input').focus();
e.preventDefault();
@@ -754,7 +752,7 @@ var ListRenderer = BasicRenderer.extend({
e.preventDefault();
var id = $(e.currentTarget).data('id');
if (id) {
this.trigger_up('open_record', {id:id, target: e.target});
this.trigger_up('open_record', { id: id, target: e.target });
}
break;
}
@@ -770,7 +768,7 @@ var ListRenderer = BasicRenderer.extend({
if (!$(event.target).prop('special_click')) {
var id = $(event.currentTarget).data('id');
if (id) {
this.trigger_up('open_record', {id:id, target: event.target});
this.trigger_up('open_record', { id: id, target: event.target });
}
}
},
@@ -791,7 +789,7 @@ var ListRenderer = BasicRenderer.extend({
*/
_onSortColumn: function (event) {
var name = $(event.currentTarget).data('name');
this.trigger_up('toggle_column_order', {id: this.state.id, name: name});
this.trigger_up('toggle_column_order', { id: this.state.id, name: name });
},
/**
* @private
@@ -800,7 +798,7 @@ var ListRenderer = BasicRenderer.extend({
_onToggleGroup: function (event) {
var group = $(event.currentTarget).data('group');
if (group.count) {
this.trigger_up('toggle_group', {group: group});
this.trigger_up('toggle_group', { group: group });
}
},
/**