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

add support for direct video uploads with server side transcoding, ticket #1351

Browse source
This commit is contained in:
j 2013-03-26 11:54:03 +00:00
commit 9153c80844
6 changed files with 290 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,8 +81,11 @@ pandora.ui.filesView = function(options, self) {
format: function(value, data) {
return $('<img>')
.attr({
src: data.wanted ? Ox.UI.getImageURL('symbolUpload') :
Ox.UI.getImageURL('symbolCheck')
src: data.encoding
? Ox.UI.getImageURL('symbolSync')
: data.wanted
? Ox.UI.getImageURL('symbolUpload')
: Ox.UI.getImageURL('symbolCheck')
})
.css({
width: '10px',
@ -221,7 +224,7 @@ pandora.ui.filesView = function(options, self) {
query: self.filesQuery
}), callback);
},
keys: ['wanted', 'instances'],
keys: ['encoding', 'instances', 'wanted'],
scrollbarVisible: true,
sort: [{key: 'path', operator: '+'}],
unique: 'id'