more encoding fun

This commit is contained in:
Rolux 2016-01-08 15:29:02 +05:30
commit 214e6a7e36
2 changed files with 37 additions and 47 deletions

View file

@ -46,10 +46,9 @@ oml.ui.editDialog = function() {
function editMetadata(key, value) {
var edit = {id: ids};
if (Ox.contains(arrayKeys, key)) {
edit[key] = value
? Ox.decodeHTMLEntities(value).split(separator) : [];
edit[key] = value ? value.split(separator) : [];
} else {
edit[key] = Ox.decodeHTMLEntities(value);
edit[key] = value;
}
oml.api.edit(edit, function(result) {
Ox.Request.clearCache();
@ -81,9 +80,7 @@ oml.ui.editDialog = function() {
: key == 'description' ? 'Mixed Description'
: 'mixed'
)) : value ? (Ox.isArray(value) ? value : [value]).map(function(value) {
return Ox.encodeHTMLEntities(
key == 'date' && value ? value.slice(0, 4) : value
);
return key == 'date' && value ? value.slice(0, 4) : value;
}).join(separator) : '';
}
@ -139,7 +136,7 @@ oml.ui.editDialog = function() {
},
placeholder: formatLight(Ox._('No Title')),
tooltip: tooltip,
value: data.title || ''
value: data.title ? Ox.encodeHTMLEntities(data.title) : ''
})
.css({
fontWeight: 'bold',
@ -147,7 +144,7 @@ oml.ui.editDialog = function() {
})
.bindEvent({
submit: function(event) {
editMetadata('title', event.value);
editMetadata('title', Ox.decodeHTMLEntities(event.value));
}
})
)
@ -167,7 +164,7 @@ oml.ui.editDialog = function() {
},
placeholder: formatLight(Ox._('Unknown Author')),
tooltip: tooltip,
value: data.author ? data.author.join(separator) : ''
value: data.author ? Ox.encodeHTMLEntities(data.author.join(separator)) : ''
})
.css({
marginBottom: '-3px',
@ -176,7 +173,7 @@ oml.ui.editDialog = function() {
})
.bindEvent({
submit: function(event) {
editMetadata('author', event.value);
editMetadata('author', Ox.decodeHTMLEntities(event.value));
}
})
)
@ -206,14 +203,14 @@ oml.ui.editDialog = function() {
},
placeholder: formatLight(Ox._('unknown')),
tooltip: tooltip,
value: data[key] ? (
value: data[key] ? Ox.encodeHTMLEntities(
Ox.contains(arrayKeys, key) && Ox.isArray(data[key])
? data[key].join('; ') : data[key]
) : ''
})
.bindEvent({
submit: function(event) {
editMetadata(key, event.value);
editMetadata(key, Ox.decodeHTMLEntities(event.value));
}
})
.appendTo($div);
@ -243,14 +240,14 @@ oml.ui.editDialog = function() {
},
placeholder: formatLight(Ox._('unknown')),
tooltip: tooltip,
value: data[key] ? (
value: data[key] ? Ox.encodeHTMLEntities(
Ox.contains(arrayKeys, key) && Ox.isArray(data[key])
? data[key].join(separator) : data[key]
) : ''
})
.bindEvent({
submit: function(event) {
editMetadata(key, event.value);
editMetadata(key, Ox.decodeHTMLEntities(event.value));
}
})
.appendTo($div);
@ -265,17 +262,17 @@ oml.ui.editDialog = function() {
}).append(
Ox.EditableContent({
editable: true,
format: function(value) {
return formatValue(value, 'description');
},
placeholder: formatLight('No Description'),
tooltip: tooltip,
type: 'textarea',
value: data.description || ''
value: data.description ? Ox.encodeHTMLEntities(data.description) : ''
})
.bindEvent({
submit: function(event) {
editMetadata('description', event.value);
editMetadata(
'description',
Ox.decodeHTMLEntities(event.value).replace(/<br>/g, '\n')
);
}
})
).appendTo($info);