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

allow for selecting more than one item in group

Browse source
This commit is contained in:
rolux 2010-07-11 00:35:06 +02:00
parent 0964485900
commit 2bb866f1f2
1 changed files with 67 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
pandora/static/js/pandora.js
View file

@ -681,67 +681,74 @@ $ui.statusbar = new Ox.Bar({
$ui.mainMenu.disableItem("openmovie"); $ui.mainMenu.disableItem("openmovie");
} }
if (data.ids.length == 1) { if (data.ids.length == 1) {
$still = $("<img>") setTimeout(function() {
.attr({ if (data.ids[0] != ui.selectedMovies[0]) {
src: "http://0xdb.org/" + data.ids[0] + "/still.jpg" Ox.print("cancel after timeout...")
}) return;
.one("load", function() { }
if (data.ids[0] != ui.selectedMovies[0]) { $still = $("<img>")
return; .attr({
} src: "http://0xdb.org/" + data.ids[0] + "/still.jpg"
var image = $still[0], })
imageWidth = image.width, .one("load", function() {
imageHeight = image.height, if (data.ids[0] != ui.selectedMovies[0]) {
width = $ui.info.width(), Ox.print("cancel after load...")
height = imageHeight * width / imageWidth; return;
ui.infoRatio = width / height; }
$still.css({ var image = $still[0],
position: "absolute", imageWidth = image.width,
left: 0, imageHeight = image.height,
top: 0, width = $ui.info.width(),
//width: width + "px", height = imageHeight * width / imageWidth;
//height: height + "px", ui.infoRatio = width / height;
width: "100%", $still.css({
position: "absolute",
left: 0,
top: 0,
//width: width + "px",
//height: height + "px",
width: "100%",
opacity: 0
})
.appendTo($ui.info.$element)
.animate({
opacity: 1
});
$ui.infoStill.animate({
opacity: 0 opacity: 0
}) }, 250);
.appendTo($ui.info.$element) $ui.info.animate({
.animate({ height: (height + 16) + "px"
opacity: 1 }, 250, function() {
$ui.infoStill.remove();
$ui.infoStill = $still;
}); });
$ui.infoStill.animate({
opacity: 0
}, 250);
$ui.info.animate({
height: (height + 16) + "px"
}, 250, function() {
$ui.infoStill.remove();
$ui.infoStill = $still;
}); });
}); /*
/* $timeline = $("<img>")
$timeline = $("<img>") .attr({
.attr({ src: "http://0xdb.org/" + data.ids[0] + "/timeline/timeline.png"
src: "http://0xdb.org/" + data.ids[0] + "/timeline/timeline.png" })
}) .one("load", function() {
.one("load", function() { $timeline.css({
$timeline.css({ position: "absolute",
position: "absolute", left: 0,
left: 0, bottom: "16px",
bottom: "16px", opacity: 0
})
.appendTo($ui.info.$element)
.animate({
opacity: 1
});
$ui.infoTimeline.animate({
opacity: 0 opacity: 0
}) }, 250, function() {
.appendTo($ui.info.$element) $ui.infoTimeline.remove();
.animate({ $ui.infoTimeline = $timeline;
opacity: 1
}); });
$ui.infoTimeline.animate({
opacity: 0
}, 250, function() {
$ui.infoTimeline.remove();
$ui.infoTimeline = $timeline;
}); });
}); */
*/ }, 100);
} }
app.request("find", { app.request("find", {
query: { query: {
@ -850,8 +857,11 @@ $ui.statusbar = new Ox.Bar({
function constructQuery(groupId) { function constructQuery(groupId) {
var conditions = $.merge(!Ox.isUndefined(user.ui.find.key) ? [user.ui.find] : [], groups ? $.map(groups, function(v, i) { var conditions = $.merge(!Ox.isUndefined(user.ui.find.key) ? [user.ui.find] : [], groups ? $.map(groups, function(v, i) {
if (v.id != groupId) { if (v.id != groupId && v.conditions.length) {
return v.conditions; return v.conditions.length == 1 ? v.conditions : {
conditions: v.conditions,
operator: "|"
};
} }
}) : []); }) : []);
return { return {