0x2620
/
openmedialibrary
1
0
Fork 0
Code Issues 131 Pull Requests Releases Wiki Activity

info cleanup

This commit is contained in:
Jan Gerber 2015-04-20 09:53:20 +02:00
parent 84f59ce4f3
commit 494604c0d7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.json
View File

@ -76,7 +76,7 @@
{
"id": "language",
"title": "Language",
"type": "string",
"type": ["string"],
"columnWidth": 128,
"filter": true,
"find": true,
@ -112,6 +112,7 @@
"type": "string",
"columnWidth": 80,
"format": {"type": "upper", "args": []},
"filter": true,
"sort": true
},
{

8
static/js/infoView.js
View File

@ -219,7 +219,7 @@ oml.ui.infoView = function(identifyData) {
if (data.mediastate == 'unavailable' && !ui._lists) {
setListItems();
}
var $element = data.mediastate == 'unavailable'
var $element = (data.mediastate == 'unavailable' || Ox.isUndefined(data.mediastate))
? Ox.FormElementGroup({
elements: [
Ox.Button({
@ -540,12 +540,12 @@ oml.ui.infoView = function(identifyData) {
editable: isEditable,
format: function(value) {
return key == 'language'
? formatValue(value, key)
? formatValue(value.split('; '), key)
: value;
},
placeholder: formatLight('unknown'),
tooltip: isEditable ? oml.getEditTooltip() : '',
value: data[key] || ''
value: data[key] ? key == 'language' ? data[key].join('; ') : data[key] : ''
})
.bindEvent({
submit: function(event) {
@ -648,7 +648,7 @@ oml.ui.infoView = function(identifyData) {
.text(title)
.appendTo($data);
Ox.makeArray(data[id.key]/*FIXME!*/).forEach(function(value) {
var isPrimary = data.primaryid[0] == id.key
var isPrimary = data.primaryid && data.primaryid[0] == id.key
&& data.primaryid[1] == value;
value = Ox.encodeHTMLEntities(value);
Ox.Element({