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

some improvements to advanced find

This commit is contained in:
rlx 2016-01-14 14:11:52 +05:30
parent 7b5d587a21
commit b10a710a63
4 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/findDialog.js
View File

@ -20,7 +20,7 @@ oml.ui.findDialog = function() {
query: list.query
});
}
that.close()
that.close();
}
})
],
@ -31,6 +31,11 @@ oml.ui.findDialog = function() {
removeOnClose: true,
title: Ox._('Advanced Find'),
width: 648 + Ox.UI.SCROLLBAR_SIZE
})
.bindEvent({
close: function() {
// ...
}
}),
$updateCheckbox = Ox.Checkbox({

15
static/js/findForm.js
View File

@ -41,22 +41,17 @@ oml.ui.findForm = function(list) {
query: data.value
} : {}, function(result) {
if (list || ui.updateResults) {
updateResults();
if (!list) {
oml.UI.set({find: Ox.clone(data.value, true)});
oml.$ui.findElement.updateElement();
}
oml.reloadLists();
}
});
}
})
.appendTo(that);
function updateResults() {
if (list || ui.updateResults) {
oml.reloadLists();
} else {
oml.UI.set({find: Ox.clone($filter.options('value'), true)});
oml.$ui.findElement.updateElement();
}
}
that.getList = $filter.getList;
that.value = $filter.value;

9
static/js/mainMenu.js
View File

@ -478,7 +478,10 @@ oml.ui.mainMenu = function() {
(oml.$ui.titlesDialog || (
oml.$ui.titlesDialog = oml.ui.titlesDialog()
)).open();
} else if (id == 'advancedfind') {
oml.$ui.findDialog = oml.ui.findDialog().open();
} else if (id == 'download') {
// FIXME: what is this??
if (oml.user.ui.item) {
document.location.href = '/' + oml.user.ui.item + '/get/';
} else {
@ -568,7 +571,7 @@ oml.ui.mainMenu = function() {
oml.$ui.findInput.focusInput(true);
});
} else {
oml.$ui.filterDialog = oml.ui.filterDialog().open();
oml.$ui.findDialog = oml.ui.findDialog().open();
}
}
},
@ -578,7 +581,9 @@ oml.ui.mainMenu = function() {
}
},
key_control_shift_f: function() {
Ox.print('FIXME: NOT IMPLEMENTED')
if (!oml.hasDialogOrScreen()) {
oml.$ui.findDialog = oml.ui.findDialog().open();
}
},
key_control_shift_w: function() {
if (!oml.hasDialogOrScreen()) {