mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix file uploads for IE

This commit is contained in:
Robin Appelman 2011-09-22 23:24:24 +02:00
parent aad62919da
commit 917ea58a8c
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/media/js/loader.js
View File

@ -52,7 +52,7 @@ $(document).ready(function() {
var oc_current_user=OC.currentUser;
if(typeof PlayList==='undefined'){
if(typeof localStorage !== 'undefined' && localStorage){
if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
if(localStorage.getItem(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
loadPlayer();
}
}

25
files/js/files.js
View File

@ -163,8 +163,10 @@ $(document).ready(function() {
var files=this.files;
var target=form.children('iframe');
var totalSize=0;
for(var i=0;i<files.length;i++){
totalSize+=files[i].size;
if(files){
for(var i=0;i<files.length;i++){
totalSize+=files[i].size;
}
}
if(totalSize>$('#max_upload').val()){
$( "#uploadsize-message" ).dialog({
@ -192,13 +194,20 @@ $(document).ready(function() {
});
form.submit();
var date=new Date();
for(var i=0;i<files.length;i++){
if(files[i].size>0){
var size=files[i].size;
}else{
var size=t('files','Pending');
if(files){
for(var i=0;i<files.length;i++){
if(files[i].size>0){
var size=files[i].size;
}else{
var size=t('files','Pending');
}
if(files){
FileList.addFile(files[i].name,size,date,true);
}
}
FileList.addFile(files[i].name,size,date,true);
}else{
var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
FileList.addFile(filename,'Pending',date,true);
}
//clone the upload form and hide the new one to allow users to start a new upload while the old one is still uploading