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

basic annotation based clips view

Browse source
This commit is contained in:
j 2011-06-16 22:00:10 +02:00
commit 1a075b6cb0
6 changed files with 174 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

79
static/js/pandora/pandora.js
View file

@ -1,4 +1,5 @@
// vim: et:ts=4:sw=4:sts=4:ft=js
pandora.enterFullscreen = function() {
pandora.$ui.appPanel.size(0, 0);
pandora.user.ui.showSidebar && pandora.$ui.mainPanel.size(0, 0);
@ -10,8 +11,8 @@ pandora.enterFullscreen = function() {
pandora.$ui.player.options({
height: pandora.$document.height() - 2,
width: pandora.$document.width() - 2
})
}
});
};
pandora.exitFullscreen = function() {
pandora.$ui.appPanel.size(0, 20);
@ -21,14 +22,15 @@ pandora.exitFullscreen = function() {
top: 24 + (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser
});
pandora.user.ui.showMovies && pandora.$ui.contentPanel.size(0, 112 + Ox.UI.SCROLLBAR_SIZE);
}
};
pandora.getFoldersHeight = function() {
var height = 48;
pandora.site.sectionFolders[pandora.user.ui.section].forEach(function(folder, i) {
height += pandora.user.ui.showFolder[pandora.user.ui.section][folder.id] * (
!!folder.showBrowser * 40 + folder.items * 16
);
Ox.print('h', height)
Ox.print('h', height);
});
/*
$.each(pandora.user.ui.showFolder[pandora.user.ui.section], function(id, show) {
@ -40,53 +42,80 @@ pandora.getFoldersHeight = function() {
});
*/
return height;
}
};
pandora.getFoldersWidth = function() {
var width = pandora.user.ui.sidebarSize;
// fixme: don't use height(), look up in splitpanels
Ox.print(pandora.getFoldersHeight(), '>', pandora.$ui.leftPanel.height() - 24 - 1 - pandora.$ui.info.height())
Ox.print(pandora.getFoldersHeight(), '>', pandora.$ui.leftPanel.height() - 24 - 1 - pandora.$ui.info.height());
if (pandora.getFoldersHeight() > pandora.$ui.leftPanel.height() - 24 - 1 - pandora.$ui.info.height()) {
width -= Ox.UI.SCROLLBAR_SIZE;
}
return width;
}
};
pandora.getGroupWidth = function(pos, panelWidth) { // fixme: don't pass panelWidth
var width = {};
width.list = Math.floor(panelWidth / 5) + (panelWidth % 5 > pos);
width.column = width.list - 40 - Ox.UI.SCROLLBAR_SIZE;
return width;
}
};
pandora.getSortOperator = function(key) { // fixme: make static
var type = Ox.getObjectById(pandora.site.itemKeys, key).type;
return ['hue', 'string', 'text'].indexOf(
Ox.isArray(type) ? type[0] : type
) > -1 ? '+' : '-';
}
};
pandora.login = function(data) {
pandora.user = data.user;
Ox.Theme(pandora.user.ui.theme);
pandora.$ui.appPanel.reload();
}
};
pandora.logout = function(data) {
pandora.user = data.user;
Ox.Theme(pandora.site.user.ui.theme);
pandora.$ui.appPanel.reload();
}
};
pandora.reloadGroups = function(i) {
var query = pandora.Query.toObject();
pandora.$ui.list.options({
items: function(data, callback) {
return pandora.api.find($.extend(data, {
query: query
}), callback);
}
});
var query = pandora.Query.toObject(),
view = pandora.user.ui.lists[pandora.user.ui.list].listView;
if(view == 'clip') {
pandora.$ui.list.options({
items: function(data, callback) {
return pandora.api.findAnnotations($.extend(data, {
itemQuery: query
}), callback);
}
});
} else if (view == 'map') {
pandora.$ui.list.options({
items: function(data, callback) {
return pandora.api.findPlaces($.extend(data, {
itemQuery: query
}), callback);
}
});
} else if (view == 'calendar') {
pandora.$ui.list.options({
items: function(data, callback) {
return pandora.api.findEvents($.extend(data, {
itemQuery: query
}), callback);
}
});
} else {
pandora.$ui.list.options({
items: function(data, callback) {
return pandora.api.find($.extend(data, {
query: query
}), callback);
}
});
}
$.each(pandora.user.queryGroups, function(i_, group_) {
if (i_ != i) {
//Ox.print('setting groups request', i, i_)
@ -135,7 +164,7 @@ pandora.reloadList = function() {
}
})
.reloadList();
}
};
pandora.resizeGroups = function(width) {
var widths = $.map(pandora.user.queryGroups, function(v, i) {
@ -147,7 +176,7 @@ pandora.resizeGroups = function(width) {
$.each(pandora.$ui.groups, function(i, list) {
list.resizeColumn('name', widths[i].column);
});
}
};
pandora.resizeFolders = function() {
var width = pandora.getFoldersWidth(),
@ -178,11 +207,11 @@ pandora.resizeFolders = function() {
pandora.$ui.folder[i].update();
}
});
}
};
pandora.saveVideoPosition = function() {
//alert(JSON.stringify(['videoPosition|' + old.user.ui.item, pandora.$ui[old.user.ui.itemView == 'player' ? 'player' : 'editor'].options('position')]));
}
};
pandora.selectList = function() {
if (pandora.user.ui.list) {
@ -208,7 +237,7 @@ pandora.selectList = function() {
//pandora.user.ui.listQuery.conditions = []; // fixme: Query should read from pandora.ui.list, and not need pandora.ui.listQuery to be reset
//pandora.URL.set(pandora.Query.toString());
}
})
});
}
}
};

33
static/js/pandora/ui/item.js
View file

@ -9,7 +9,38 @@ pandora.ui.item = function() {
} else if (pandora.user.ui.itemView == 'calendar') {
pandora.$ui.contentPanel.replaceElement(1, Ox.Element().html('Calendar'));
} else if (pandora.user.ui.itemView == 'clips') {
pandora.$ui.contentPanel.replaceElement(1, Ox.Element().html('Clips'));
pandora.$ui.contentPanel.replaceElement(1, new Ox.IconList({
item: function(data, sort, size) {
size = size || 128;
var ratio = result.data.stream.aspectRatio,
width = ratio>1?size:size*ratio,
height = ratio>1?size/ratio:size,
url = '/' + pandora.user.ui.item + '/frame/' + size + '/' + data['in'] + '.jpg';
return {
height: height,
id: data['id'],
info: Ox.formatDuration(data['in'], 'short') +' - '+ Ox.formatDuration(data['out'], 'short'),
title: data.value,
url: url,
width: width
};
},
items: function(data, callback) {
pandora.api.findAnnotations($.extend(data, {
itemQuery: {
conditions:[{
key: 'id',
value: pandora.user.ui.item,
operator: '='
}]
}
}), callback);
},
keys: ['id', 'value', 'in', 'out'],
size: 128,
sort: pandora.user.ui.lists[pandora.user.ui.list].sort,
unique: 'id'
}));
} else if (pandora.user.ui.itemView == 'info') {
//Ox.print('result.data', result.data)
if (pandora.user.level == 'admin') {

31
static/js/pandora/ui/list.js
View file

@ -94,7 +94,34 @@ pandora.ui.list = function(view) { // fixme: remove view argument
size: 128,
sort: pandora.user.ui.lists[pandora.user.ui.list].sort,
unique: 'id'
})
});
} else if (view == 'clip') {
that = new Ox.IconList({
item: function(data, sort, size) {
size = size || 128;
var ratio = data.aspectRatio,
width = size,
height = size/ratio,
url = '/' + data.item + '/frame/' + size + '/'+data['in'] + '.jpg';
return {
height: height,
id: data['id'],
info: Ox.formatDuration(data['in'], 'short') +' - '+ Ox.formatDuration(data['out'], 'short'),
title: data.value,
url: url,
width: width
};
},
items: function(data, callback) {
pandora.api.findAnnotations($.extend(data, {
itemQuery: pandora.Query.toObject()
}), callback);
},
keys: ['id', 'value', 'in', 'out', 'aspectRatio', 'item'],
size: 128,
sort: pandora.user.ui.lists[pandora.user.ui.list].sort,
unique: 'id'
});
} else if (view == 'map') {
that = new Ox.SplitPanel({
elements: [
@ -178,7 +205,7 @@ pandora.ui.list = function(view) { // fixme: remove view argument
pandora.$ui.folderList.forEach(function($list, i) {
$list.removeClass('OxDrop');
});
},
}
}).bindEvent({
closepreview: function(event, data) {
pandora.$ui.previewDialog.close();