decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
rolux 2011-10-24 10:05:10 +00:00
commit 57308697ec
7 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
static/js/pandora/filesView.js
View file

@ -33,15 +33,27 @@ pandora.ui.filesView = function(options, self) {
})
.appendTo(self.$toolbar);
self.$moveButton = Ox.Button({
self.$ignoreButton = Ox.Button({
disabled: 'true',
title: 'Move Selected Files...'
title: 'Ignore Selected Files...'
})
.css({
float: 'right',
margin: '4px'
})
.appendTo(self.$toolbar);
.appendTo(self.$toolbar)
.bindEvent({
click: function() {
var data = {
ids: self.selected,
ignore: true
};
pandora.api.editFiles(data, function(result) {
Ox.Request.clearCache();
self.$filesList.reloadList();
});
}
});
self.$filesList = Ox.TextList({
columns: [
@ -417,6 +429,9 @@ pandora.ui.filesView = function(options, self) {
self.$moveButton.options({
disabled: self.selected.length === 0
});
self.$ignoreButton.options({
disabled: self.selected.length === 0
});
}
return that;

7
static/js/pandora/info.js
View file

@ -66,8 +66,11 @@ pandora.ui.info = function() {
previousView == 'video' && resizeInfo();
});
} else if (view == 'video') {
pandora.api.get({id: id, keys: ['duration', 'videoRatio']}, function(result) {
if (result.data) {
pandora.api.get({
id: id,
keys: ['duration', 'rendered', 'videoRatio']
}, function(result) {
if (result.data && result.data.rendered) {
pandora.$ui.videoPreview && pandora.$ui.videoPreview.removeElement();
pandora.$ui.videoPreview = pandora.ui.videoPreview({
duration: result.data.duration,