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

Compare commits

base: 0x2620:aaa9a4a5386a48b76b8f3ccd5ac457fa8f748a40
Branches Tags
0x2620:master
..
compare: 0x2620:3111b94792ef981fe3351064b4a036f902eb4d02
Branches Tags
0x2620:master

No commits in common. "aaa9a4a5386a48b76b8f3ccd5ac457fa8f748a40" and "3111b94792ef981fe3351064b4a036f902eb4d02" have entirely different histories.
aaa9a4a538 ... 3111b94792

2 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
static/js/editDialog.js
View file

@ -77,16 +77,15 @@ oml.ui.editDialog = function() {
oml.api.find({ oml.api.find({
keys: keys, keys: keys,
query: { query: {
conditions: [ conditions: ids.map(function(id) {
{ return {
key: 'id', key: 'id',
operator: '&', operator: '==',
value: ids value: id
};
}),
operator: '|'
} }
],
operator: '&'
},
range: [0, ids.length]
}, function(result) { }, function(result) {
var data = {}, var data = {},
isMixed = {}, isMixed = {},

25
static/js/infoView.js
View file

@ -8,8 +8,6 @@ oml.ui.infoView = function(externalData, isMixed) {
arrayKeys = ['author', 'place', 'publisher', 'language', 'categories'], arrayKeys = ['author', 'place', 'publisher', 'language', 'categories'],
editables = {},
iconSize = externalData ? 256 : ui.iconSize, iconSize = externalData ? 256 : ui.iconSize,
isMultiple = arguments.length == 2, isMultiple = arguments.length == 2,
@ -486,7 +484,7 @@ oml.ui.infoView = function(externalData, isMixed) {
marginTop: '-2px' marginTop: '-2px'
}) })
.append( .append(
editables['title'] = Ox.EditableContent({ Ox.EditableContent({
clickLink: oml.clickLink, clickLink: oml.clickLink,
editable: isEditable, editable: isEditable,
placeholder: formatLight(Ox._( placeholder: formatLight(Ox._(
@ -514,7 +512,7 @@ oml.ui.infoView = function(externalData, isMixed) {
marginTop: '2px' marginTop: '2px'
}) })
.append( .append(
editables['author'] = Ox.EditableContent({ Ox.EditableContent({
clickLink: oml.clickLink, clickLink: oml.clickLink,
editable: isEditable, editable: isEditable,
format: function(value) { format: function(value) {
@ -559,7 +557,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>') $('<span>')
.html(formatKey(key)) .html(formatKey(key))
.appendTo($div); .appendTo($div);
editables[key] = Ox.EditableContent({ Ox.EditableContent({
clickLink: oml.clickLink, clickLink: oml.clickLink,
editable: isEditable, editable: isEditable,
format: function(value) { format: function(value) {
@ -601,7 +599,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>') $('<span>')
.html(formatKey(key)) .html(formatKey(key))
.appendTo($div); .appendTo($div);
editables[key] = Ox.EditableContent({ Ox.EditableContent({
clickLink: oml.clickLink, clickLink: oml.clickLink,
editable: isEditable, editable: isEditable,
format: function(value) { format: function(value) {
@ -643,7 +641,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>') $('<span>')
.html(formatKey('categories')) .html(formatKey('categories'))
.appendTo($div); .appendTo($div);
editables['categories'] = Ox.EditableContent({ Ox.EditableContent({
clickLink: oml.clickLink, clickLink: oml.clickLink,
editable: isEditable, editable: isEditable,
format: function(value) { format: function(value) {
@ -674,7 +672,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>') $('<span>')
.html(formatKey('isbn')) .html(formatKey('isbn'))
.appendTo($div); .appendTo($div);
editables['isbn'] = Ox.EditableContent({ Ox.EditableContent({
editable: isEditable, editable: isEditable,
format: function(value) { format: function(value) {
return (value ? [ return (value ? [
@ -711,7 +709,7 @@ oml.ui.infoView = function(externalData, isMixed) {
textAlign: 'justify' textAlign: 'justify'
}) })
.append( .append(
editables[key] = Ox.EditableContent({ Ox.EditableContent({
clickLink: oml.clickLink, clickLink: oml.clickLink,
editable: isEditable, editable: isEditable,
format: function(value) { format: function(value) {
@ -800,13 +798,6 @@ oml.ui.infoView = function(externalData, isMixed) {
if (!Ox.isEqual(edit[key], data[key])) { if (!Ox.isEqual(edit[key], data[key])) {
data[key] = edit[key]; data[key] = edit[key];
oml.api.edit(edit, function(result) { oml.api.edit(edit, function(result) {
if (isMixed[key]) {
isMixed[key] = false
var placeholder = editables[key].options('placeholder').replace('Mixed', 'Unknown').replace('mixed', 'unknown')
editables[key].options({
placeholder: placeholder
})
}
if (!isMultiple || ui.updateResults) { if (!isMultiple || ui.updateResults) {
Ox.Request.clearCache(); Ox.Request.clearCache();
if (Ox.contains(['title', 'author', 'description'], key)) { if (Ox.contains(['title', 'author', 'description'], key)) {
@ -824,7 +815,7 @@ oml.ui.infoView = function(externalData, isMixed) {
result.data.id, key, result.data[key] result.data.id, key, result.data[key]
); );
} }
$data && that.updateElement(result.data, [$data]); that.updateElement(result.data, [$data]);
that.triggerEvent('change', Ox.extend({}, key, value)); that.triggerEvent('change', Ox.extend({}, key, value));
}); });
} }