Minor styling fixes in the table widget. Fixed a bug where empty values in the table widget could be rendered as 'undefined' in Safari.

This commit is contained in:
Aleksey Bobkov 2017-01-25 20:15:12 -08:00
parent 6c5a83de89
commit 0d30931045
5 changed files with 42 additions and 10 deletions

View File

@ -72,16 +72,16 @@
padding: 1px;
}
.control-table table.data td.active {
border-color: #3498db !important;
border-color: #34495e !important;
}
.control-table table.data td.active .content-container {
padding: 0;
border: 1px solid #3498db;
border: 1px solid #34495e;
}
.control-table table.data td.active .content-container:before,
.control-table table.data td.active .content-container:after {
content: ' ';
background: #3498db;
background: #34495e;
position: absolute;
left: -2px;
top: -2px;
@ -220,11 +220,21 @@
border: none;
padding: 6px 10px 7px;
}
html.chrome .control-table td[data-column-type=string] input[type=text],
html.chrome .control-table td[data-column-type=autocomplete] input[type=text] {
padding: 6px 10px 7px!important;
}
html.safari .control-table td[data-column-type=string] input[type=text],
html.gecko .control-table td[data-column-type=string] input[type=text],
html.safari .control-table td[data-column-type=autocomplete] input[type=text],
html.gecko .control-table td[data-column-type=autocomplete] input[type=text] {
padding: 5px 10px 5px;
}
ul.table-widget-autocomplete {
background: white;
font-size: 13px;
margin-top: 0;
border: 1px solid #e0e0e0;
border: 1px solid #808c8d;
border-top: 1px solid #ecf0f1;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
@ -269,7 +279,7 @@ ul.table-widget-autocomplete li a {
top: -4px;
}
.control-table td[data-column-type=checkbox] div[data-checkbox-element]:focus {
border-color: #3498db;
border-color: #34495e;
outline: none;
}
/*
@ -380,6 +390,6 @@ html.cssanimations .control-table td[data-column-type=dropdown] [data-view-conta
.table-control-dropdown-list li:hover,
.table-control-dropdown-list li:focus,
.table-control-dropdown-list li.selected {
background: #3498db;
background: #34495e;
color: white;
}

View File

@ -646,7 +646,7 @@ Base.prototype.isCellFocusable=function(){return true}
Base.prototype.getCellContentContainer=function(cellElement){return cellElement.querySelector('.content-container')}
Base.prototype.createViewContainer=function(cellContentContainer,value){var viewContainer=document.createElement('div')
viewContainer.setAttribute('data-view-container','data-view-container')
viewContainer.textContent=value
viewContainer.textContent=value===undefined?'':value
cellContentContainer.appendChild(viewContainer)
return viewContainer}
Base.prototype.getViewContainer=function(cellElement){return cellElement.querySelector('[data-view-container]')}

View File

@ -137,7 +137,7 @@
var viewContainer = document.createElement('div')
viewContainer.setAttribute('data-view-container', 'data-view-container')
viewContainer.textContent = value
viewContainer.textContent = value === undefined ? '' : value
cellContentContainer.appendChild(viewContainer)

View File

@ -283,6 +283,28 @@
}
}
html.chrome {
.control-table {
td[data-column-type=string],
td[data-column-type=autocomplete] {
input[type=text] {
padding: 6px 10px 7px!important;
}
}
}
}
html.safari, html.gecko {
.control-table {
td[data-column-type=string],
td[data-column-type=autocomplete] {
input[type=text] {
padding: 5px 10px 5px;
}
}
}
}
ul.table-widget-autocomplete {
background: white;
font-size: 13px;

View File

@ -3898,10 +3898,10 @@ if(prefix===undefined)
prefix=''
if($el.val().length&&$el.val()!=prefix)
return
$el.val(prefix)
$el.val(prefix).trigger('oc.inputPreset.afterUpdate')
this.$src=$(options.inputPreset,parent),this.$src.on('keyup',function(){if(self.cancelled)
return
$el.val(prefix+self.formatValue())})
$el.val(prefix+self.formatValue()).trigger('oc.inputPreset.afterUpdate')})
this.$el.on('change',function(){self.cancelled=true})}
InputPreset.prototype.formatNamespace=function(){var value=toCamel(this.$src.val())
return value.substr(0,1).toUpperCase()+value.substr(1)}