fix file uploads for IE

diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index ef8647eeca5c18dcbaa5a3f23ea9dcbf8d493dd6..c6c834d3a31007ac500c7ce987730a60d2d0aa27 100644 (file)
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -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();
                        }
                }

diff --git a/files/js/files.js b/files/js/files.js
index 7b37837d9ccd69ef81b4cf834b5ed969568be871..8289d418e6927429a2d9b3b03e7308db8c16b561 100644 (file)
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -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