0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:a1725a5f9257ca8d473f169832eb3cdd751e99fa
Branches Tags
0x2620:master
0x2620:stable
...
compare: 0x2620:6c7c08448dfb65953f481cbf40f95f10c51968e2
Branches Tags
0x2620:master
0x2620:stable

3 commits
a1725a5f92 ... 6c7c08448d

Author SHA1 Message Date
j
6c7c08448d don't list undefined as year 2019-11-20 15:29:41 +01:00
j
5863e7fb31 fix mixed notes 2019-11-20 13:37:16 +01:00
j
8240a9ede6 enable languages 2019-11-20 13:28:46 +01:00
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/js/idDialog.js
View file

@ -97,7 +97,7 @@ pandora.ui.idDialog = function(data) {
labelWidth: 128, labelWidth: 128,
value: Ox.decodeHTMLEntities(key == 'director' && data[key] value: Ox.decodeHTMLEntities(key == 'director' && data[key]
? data[key].join(', ') ? data[key].join(', ')
: ('' + data[key])), : ('' + (data[key] || ''))),
width: formWidth width: formWidth
}) })
.css({display: 'inline-block', margin: '3px'}) .css({display: 'inline-block', margin: '3px'})

1
static/js/importAnnotationsDialog.js
View file

@ -75,6 +75,7 @@ pandora.ui.importAnnotationsDialog = function(options) {
if (subtitlesLayer && format == 'srt' && Ox.getObjectById(layers, subtitlesLayer)) { if (subtitlesLayer && format == 'srt' && Ox.getObjectById(layers, subtitlesLayer)) {
$layerSelect.options({value: subtitlesLayer}) $layerSelect.options({value: subtitlesLayer})
} }
updateLanguageSelect();
} }
that[ that[
data.value.length ? 'enableButton' : 'disableButton' data.value.length ? 'enableButton' : 'disableButton'

2
static/js/infoView.js
View file

@ -368,7 +368,7 @@ pandora.ui.infoView = function(data, isMixed) {
.append( .append(
Ox.EditableContent({ Ox.EditableContent({
height: 128, height: 128,
placeholder: formatLight(Ox._(isMixed ? 'Mixed notes' : 'No notes')), placeholder: formatLight(Ox._(isMixed.notes ? 'Mixed notes' : 'No notes')),
tooltip: pandora.getEditTooltip(), tooltip: pandora.getEditTooltip(),
type: 'textarea', type: 'textarea',
value: data.notes || '', value: data.notes || '',