Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-08-30 12:02:44 -04:00
commit ec8d5880ed
2 changed files with 253 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/public/js/airtime/library/plupload.js
View file

@ -9,7 +9,7 @@ $(document).ready(function() {
unique_names: 'true', unique_names: 'true',
multiple_queues : 'true', multiple_queues : 'true',
filters : [ filters : [
{title: "Audio Files", extensions: "ogg,mp3"} {title: "Audio Files", extensions: "ogg,mp3,oga,flac,aac,bwf"}
] ]
}); });
@ -27,7 +27,9 @@ $(document).ready(function() {
$("#plupload_error table").css("display", "inline-table"); $("#plupload_error table").css("display", "inline-table");
}else{ }else{
var tempFileName = j.tempfilepath; var tempFileName = j.tempfilepath;
$.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name)+'/tempname/'+encodeURIComponent(tempFileName), function(json){ $.get('/Plupload/copyfile/format/json/name/' +
encodeURIComponent(file.name)+'/tempname/' +
encodeURIComponent(tempFileName), function(json){
var jr = jQuery.parseJSON(json); var jr = jQuery.parseJSON(json);
if(jr.error !== undefined) { if(jr.error !== undefined) {
var row = $("<tr/>") var row = $("<tr/>")
@ -44,12 +46,8 @@ $(document).ready(function() {
var uploadProgress = false; var uploadProgress = false;
uploader.bind('QueueChanged', function(){ uploader.bind('QueueChanged', function(){
if(uploader.files.length > 0){ uploadProgress = (uploader.files.length > 0)
uploadProgress = true; });
}else{
uploadProgress = false;
}
});
uploader.bind('UploadComplete', function(){ uploader.bind('UploadComplete', function(){
uploadProgress = false; uploadProgress = false;