]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fix_jslint_kondou
authorkondou <kondou@ts.unde.re>
Sat, 17 Aug 2013 22:38:52 +0000 (00:38 +0200)
committerkondou <kondou@ts.unde.re>
Sat, 17 Aug 2013 22:38:52 +0000 (00:38 +0200)
Conflicts:
apps/files/js/file-upload.js

1  2 
apps/files/js/file-upload.js
apps/files/js/fileactions.js
apps/files_versions/js/versions.js
core/js/oc-dialogs.js
core/js/share.js
settings/js/apps.js

index 87d8b353b68fbfccf9c137ecc24f8b41dacc2308,0eddd7e9cd7179a117fe8a7489ff4cbfc9a2a3c9..49e464b810a7cbaa3dab8173ed0bad4e013bad0d
  $(document).ready(function() {
  
-   var file_upload_param = {
-       dropZone: $('#content'), // restrict dropZone to content div
-       //singleFileUploads is on by default, so the data.files array will always have length 1
-       add: function(e, data) {
 -      file_upload_param = {
++      var file_upload_param = {
+               dropZone: $('#content'), // restrict dropZone to content div
+               //singleFileUploads is on by default, so the data.files array will always have length 1
+               add: function(e, data) {
  
-         if(data.files[0].type === '' && data.files[0].size == 4096)
-         {
-               data.textStatus = 'dirorzero';
-               data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
-               var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-               fu._trigger('fail', e, data);
-               return true; //don't upload this file but go on with next in queue
-         }
-         var totalSize=0;
-         $.each(data.originalFiles, function(i,file){
-               totalSize+=file.size;
-         });
+                       if(data.files[0].type === '' && data.files[0].size == 4096)
+                       {
+                               data.textStatus = 'dirorzero';
+                               data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
+                               var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+                               fu._trigger('fail', e, data);
+                               return true; //don't upload this file but go on with next in queue
+                       }
  
-         if(totalSize>$('#max_upload').val()){
-               data.textStatus = 'notenoughspace';
-               data.errorThrown = t('files','Not enough space available');
-               var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-               fu._trigger('fail', e, data);
-               return false; //don't upload anything
-         }
+                       var totalSize=0;
+                       $.each(data.originalFiles, function(i,file){
+                               totalSize+=file.size;
+                       });
  
-         // start the actual file upload
-         var jqXHR = data.submit();
+                       if(totalSize>$('#max_upload').val()){
+                               data.textStatus = 'notenoughspace';
+                               data.errorThrown = t('files','Not enough space available');
+                               var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+                               fu._trigger('fail', e, data);
+                               return false; //don't upload anything
+                       }
  
-         // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
-         if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-               var dirName = data.context.data('file');
-               if(typeof uploadingFiles[dirName] === 'undefined') {
-         uploadingFiles[dirName] = {};
-               }
-               uploadingFiles[dirName][data.files[0].name] = jqXHR;
-         } else {
-               uploadingFiles[data.files[0].name] = jqXHR;
-         }
+                       // start the actual file upload
+                       var jqXHR = data.submit();
  
-         //show cancel button
-         if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
-               $('#uploadprogresswrapper input.stop').show();
-         }
-       },
-       /**
-        * called after the first add, does NOT have the data param
-        * @param e
-        */
-       start: function(e) {
-         //IE < 10 does not fire the necessary events for the progress bar.
-         if($('html.lte9').length > 0) {
-               return;
-         }
-         $('#uploadprogressbar').progressbar({value:0});
-         $('#uploadprogressbar').fadeIn();
-       },
-       fail: function(e, data) {
-         if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
-               if (data.textStatus === 'abort') {
-         $('#notification').text(t('files', 'Upload cancelled.'));
-               } else {
-         // HTTP connection problem
-         $('#notification').text(data.errorThrown);
-               }
-               $('#notification').fadeIn();
-               //hide notification after 5 sec
-               setTimeout(function() {
-         $('#notification').fadeOut();
-               }, 5000);
-         }
-         delete uploadingFiles[data.files[0].name];
-       },
-       progress: function(e, data) {
-         // TODO: show nice progress bar in file row
-       },
-       progressall: function(e, data) {
-         //IE < 10 does not fire the necessary events for the progress bar.
-         if($('html.lte9').length > 0) {
-               return;
-         }
-         var progress = (data.loaded/data.total)*100;
-         $('#uploadprogressbar').progressbar('value',progress);
-       },
-       /**
-        * called for every successful upload
-        * @param e
-        * @param data
-        */
-       done:function(e, data) {
-         // handle different responses (json or body from iframe for ie)
-         var response;
-         if (typeof data.result === 'string') {
-               response = data.result;
-         } else {
-               //fetch response from iframe
-               response = data.result[0].body.innerText;
-         }
-         var result=$.parseJSON(response);
+                       // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
+                       if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+                               var dirName = data.context.data('file');
+                               if(typeof uploadingFiles[dirName] === 'undefined') {
+                                       uploadingFiles[dirName] = {};
+                               }
+                               uploadingFiles[dirName][data.files[0].name] = jqXHR;
+                       } else {
+                               uploadingFiles[data.files[0].name] = jqXHR;
+                       }
  
-         if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
-               var file = result[0];
-         } else {
-               data.textStatus = 'servererror';
-               data.errorThrown = t('files', result.data.message);
-               var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-               fu._trigger('fail', e, data);
-         }
+                       //show cancel button
+                       if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
+                               $('#uploadprogresswrapper input.stop').show();
+                       }
+               },
+               /**
+                * called after the first add, does NOT have the data param
+                * @param e
+                */
+               start: function(e) {
+                       //IE < 10 does not fire the necessary events for the progress bar.
+                       if($('html.lte9').length > 0) {
+                               return;
+                       }
+                       $('#uploadprogressbar').progressbar({value:0});
+                       $('#uploadprogressbar').fadeIn();
+               },
+               fail: function(e, data) {
+                       if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+                               if (data.textStatus === 'abort') {
+                                       $('#notification').text(t('files', 'Upload cancelled.'));
+                               } else {
+                                       // HTTP connection problem
+                                       $('#notification').text(data.errorThrown);
+                               }
+                               $('#notification').fadeIn();
+                               //hide notification after 5 sec
+                               setTimeout(function() {
+                                       $('#notification').fadeOut();
+                               }, 5000);
+                       }
+                       delete uploadingFiles[data.files[0].name];
+               },
+               progress: function(e, data) {
+                       // TODO: show nice progress bar in file row
+               },
+               progressall: function(e, data) {
+                       //IE < 10 does not fire the necessary events for the progress bar.
+                       if($('html.lte9').length > 0) {
+                               return;
+                       }
+                       var progress = (data.loaded/data.total)*100;
+                       $('#uploadprogressbar').progressbar('value',progress);
+               },
+               /**
+                * called for every successful upload
+                * @param e
+                * @param data
+                */
+               done:function(e, data) {
+                       // handle different responses (json or body from iframe for ie)
+                       var response;
+                       if (typeof data.result === 'string') {
+                               response = data.result;
+                       } else {
+                               //fetch response from iframe
+                               response = data.result[0].body.innerText;
+                       }
+                       var result=$.parseJSON(response);
  
-         var filename = result[0].originalname;
+                       if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+                               var file = result[0];
+                       } else {
+                               data.textStatus = 'servererror';
+                               data.errorThrown = t('files', result.data.message);
+                               var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+                               fu._trigger('fail', e, data);
+                       }
  
-         // delete jqXHR reference
-         if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-               var dirName = data.context.data('file');
-               delete uploadingFiles[dirName][filename];
-               if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
-         delete uploadingFiles[dirName];
-               }
-         } else {
-               delete uploadingFiles[filename];
-         }
+                       var filename = result[0].originalname;
  
-       },
-       /**
-        * called after last upload
-        * @param e
-        * @param data
-        */
-       stop: function(e, data) {
-         if(data.dataType !== 'iframe') {
-               $('#uploadprogresswrapper input.stop').hide();
-         }
+                       // delete jqXHR reference
+                       if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+                               var dirName = data.context.data('file');
+                               delete uploadingFiles[dirName][filename];
+                               if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+                                       delete uploadingFiles[dirName];
+                               }
+                       } else {
+                               delete uploadingFiles[filename];
+                       }
  
-         //IE < 10 does not fire the necessary events for the progress bar.
-         if($('html.lte9').length > 0) {
-               return;
-         }
+               },
+               /**
+                * called after last upload
+                * @param e
+                * @param data
+                */
+               stop: function(e, data) {
+                       if(data.dataType !== 'iframe') {
+                               $('#uploadprogresswrapper input.stop').hide();
+                       }
  
-         $('#uploadprogressbar').progressbar('value',100);
-         $('#uploadprogressbar').fadeOut();
-       }
-   };
-   var file_upload_handler = function() {
-       $('#file_upload_start').fileupload(file_upload_param);
-   };
+                       //IE < 10 does not fire the necessary events for the progress bar.
+                       if($('html.lte9').length > 0) {
+                               return;
+                       }
  
 -      }
+                       $('#uploadprogressbar').progressbar('value',100);
+                       $('#uploadprogressbar').fadeOut();
+               }
++      };
+       var file_upload_handler = function() {
+               $('#file_upload_start').fileupload(file_upload_param);
+       };
  
  
-   if ( document.getElementById('data-upload-form') ) {
-       $(file_upload_handler);
-   }
-   $.assocArraySize = function(obj) {
-       // http://stackoverflow.com/a/6700/11236
-       var size = 0, key;
-       for (key in obj) {
-         if (obj.hasOwnProperty(key)) {
-               size++;
-         }
-       }
-       return size;
-   };
  
-   // warn user not to leave the page while upload is in progress
-   $(window).bind('beforeunload', function(e) {
-       if ($.assocArraySize(uploadingFiles) > 0) {
-         return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+       if ( document.getElementById('data-upload-form') ) {
+               $(file_upload_handler);
        }
-   });
+       $.assocArraySize = function(obj) {
+               // http://stackoverflow.com/a/6700/11236
+               var size = 0, key;
+               for (key in obj) {
+                       if (obj.hasOwnProperty(key)) size++;
+               }
+               return size;
+       };
  
-   //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
-   if(navigator.userAgent.search(/konqueror/i)==-1){
-       $('#file_upload_start').attr('multiple','multiple');
-   }
+       // warn user not to leave the page while upload is in progress
+       $(window).bind('beforeunload', function(e) {
 -              if ($.assocArraySize(uploadingFiles) > 0)
++              if ($.assocArraySize(uploadingFiles) > 0) {
+                       return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
++              }
+       });
  
-   //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
-   var crumb=$('div.crumb').first();
-   while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
-       crumb.children('a').text('...');
-       crumb=crumb.next('div.crumb');
-   }
-   //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
-   crumb=$('div.crumb').first();
-   var next=crumb.next('div.crumb');
-   while($('div.controls').height()>40 && next.next('div.crumb').length>0){
-       crumb.remove();
-       crumb=next;
-       next=crumb.next('div.crumb');
-   }
-   //still not enough, start shorting down the current folder name
-   var crumb=$('div.crumb>a').last();
-   while($('div.controls').height()>40 && crumb.text().length>6){
-       var text=crumb.text();
-       text=text.substr(0,text.length-6)+'...';
-       crumb.text(text);
-   }
+       //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+       if(navigator.userAgent.search(/konqueror/i)==-1){
 -              $('#file_upload_start').attr('multiple','multiple')
++              $('#file_upload_start').attr('multiple','multiple');
+       }
  
-   $(document).click(function(){
-       $('#new>ul').hide();
-       $('#new').removeClass('active');
-       $('#new li').each(function(i,element){
-         if($(element).children('p').length==0){
-               $(element).children('form').remove();
-               $(element).append('<p>'+$(element).data('text')+'</p>');
-         }
-       });
-   });
-   $('#new li').click(function(){
-       if($(this).children('p').length==0){
-         return;
+       //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
+       var crumb=$('div.crumb').first();
+       while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
+               crumb.children('a').text('...');
+               crumb=crumb.next('div.crumb');
+       }
+       //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
+       var crumb=$('div.crumb').first();
+       var next=crumb.next('div.crumb');
+       while($('div.controls').height()>40 && next.next('div.crumb').length>0){
+               crumb.remove();
+               crumb=next;
+               next=crumb.next('div.crumb');
+       }
+       //still not enough, start shorting down the current folder name
+       var crumb=$('div.crumb>a').last();
+       while($('div.controls').height()>40 && crumb.text().length>6){
+               var text=crumb.text()
+               text=text.substr(0,text.length-6)+'...';
+               crumb.text(text);
        }
  
-       $('#new li').each(function(i,element){
-         if($(element).children('p').length==0){
-               $(element).children('form').remove();
-               $(element).append('<p>'+$(element).data('text')+'</p>');
-         }
+       $(document).click(function(){
+               $('#new>ul').hide();
+               $('#new').removeClass('active');
+               $('#new li').each(function(i,element){
+                       if($(element).children('p').length==0){
+                               $(element).children('form').remove();
+                               $(element).append('<p>'+$(element).data('text')+'</p>');
+                       }
+               });
        });
+       $('#new li').click(function(){
+               if($(this).children('p').length==0){
+                       return;
+               }
  
-       var type=$(this).data('type');
-       var text=$(this).children('p').text();
-       $(this).data('text',text);
-       $(this).children('p').remove();
-       var form=$('<form></form>');
-       var input=$('<input>');
-       form.append(input);
-       $(this).append(form);
-       input.focus();
-       form.submit(function(event){
-         event.stopPropagation();
-         event.preventDefault();
-         var newname=input.val();
-         if(type == 'web' && newname.length == 0) {
-               OC.Notification.show(t('files', 'URL cannot be empty.'));
-               return false;
-         } else if (type != 'web' && !Files.isFileNameValid(newname)) {
-               return false;
-         } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
-               OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
-               return false;
-         }
-         if (FileList.lastAction) {
-               FileList.lastAction();
-         }
-         var name = getUniqueName(newname);
-         if (newname != name) {
-               FileList.checkName(name, newname, true);
-               var hidden = true;
-         } else {
-               var hidden = false;
-         }
-         switch(type){
-         case 'file':
-               $.post(
-                 OC.filePath('files','ajax','newfile.php'),
-                 {dir:$('#dir').val(),filename:name},
-                 function(result){
-                       if (result.status == 'success') {
-                         var date=new Date();
-                         FileList.addFile(name,0,date,false,hidden);
-                         var tr=$('tr').filterAttr('data-file',name);
-                         tr.attr('data-mime',result.data.mime);
-                         tr.attr('data-id', result.data.id);
-                         getMimeIcon(result.data.mime,function(path){
-                       tr.find('td.filename').attr('style','background-image:url('+path+')');
-                         });
-                       } else {
-                         OC.dialogs.alert(result.data.message, t('core', 'Error'));
+               $('#new li').each(function(i,element){
+                       if($(element).children('p').length==0){
+                               $(element).children('form').remove();
+                               $(element).append('<p>'+$(element).data('text')+'</p>');
                        }
-                 }
-               );
-               break;
-         case 'folder':
-               $.post(
-                 OC.filePath('files','ajax','newfolder.php'),
-                 {dir:$('#dir').val(),foldername:name},
-                 function(result){
-                       if (result.status == 'success') {
-                         var date=new Date();
-                         FileList.addDir(name,0,date,hidden);
-                         var tr=$('tr').filterAttr('data-file',name);
-                         tr.attr('data-id', result.data.id);
+               });
+               var type=$(this).data('type');
+               var text=$(this).children('p').text();
+               $(this).data('text',text);
+               $(this).children('p').remove();
+               var form=$('<form></form>');
+               var input=$('<input>');
+               form.append(input);
+               $(this).append(form);
+               input.focus();
+               form.submit(function(event){
+                       event.stopPropagation();
+                       event.preventDefault();
+                       var newname=input.val();
+                       if(type == 'web' && newname.length == 0) {
+                               OC.Notification.show(t('files', 'URL cannot be empty.'));
+                               return false;
+                       } else if (type != 'web' && !Files.isFileNameValid(newname)) {
+                               return false;
+                       } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
+                               OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
+                               return false;
+                       }
+                       if (FileList.lastAction) {
+                               FileList.lastAction();
+                       }
+                       var name = getUniqueName(newname);
+                       if (newname != name) {
+                               FileList.checkName(name, newname, true);
+                               var hidden = true;
                        } else {
-                         OC.dialogs.alert(result.data.message, t('core', 'Error'));
+                               var hidden = false;
                        }
-                 }
-               );
-               break;
-         case 'web':
-               if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
-                 name='http://'+name;
-               }
-               var localName=name;
-               if(localName.substr(localName.length-1,1)=='/'){//strip /
-                 localName=localName.substr(0,localName.length-1);
-               }
-               if(localName.indexOf('/')){//use last part of url
-                 localName=localName.split('/').pop();
-               } else { //or the domain
-                 localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
-               }
-               localName = getUniqueName(localName);
-               //IE < 10 does not fire the necessary events for the progress bar.
-               if($('html.lte9').length === 0) {
-                 $('#uploadprogressbar').progressbar({value:0});
-                 $('#uploadprogressbar').fadeIn();
-               }
+                       switch(type){
+                               case 'file':
+                                       $.post(
+                                               OC.filePath('files','ajax','newfile.php'),
+                                               {dir:$('#dir').val(),filename:name},
+                                               function(result){
+                                                       if (result.status == 'success') {
+                                                               var date=new Date();
+                                                               FileList.addFile(name,0,date,false,hidden);
+                                                               var tr=$('tr').filterAttr('data-file',name);
+                                                               tr.attr('data-size',result.data.size);
+                                                               tr.attr('data-mime',result.data.mime);
+                                                               tr.attr('data-id', result.data.id);
+                                                               tr.find('.filesize').text(humanFileSize(result.data.size));
+                                                               getMimeIcon(result.data.mime,function(path){
+                                                                       tr.find('td.filename').attr('style','background-image:url('+path+')');
+                                                               });
+                                                       } else {
+                                                               OC.dialogs.alert(result.data.message, t('core', 'Error'));
+                                                       }
+                                               }
+                                       );
+                                       break;
+                               case 'folder':
+                                       $.post(
+                                               OC.filePath('files','ajax','newfolder.php'),
+                                               {dir:$('#dir').val(),foldername:name},
+                                               function(result){
+                                                       if (result.status == 'success') {
+                                                               var date=new Date();
+                                                               FileList.addDir(name,0,date,hidden);
+                                                               var tr=$('tr').filterAttr('data-file',name);
+                                                               tr.attr('data-id', result.data.id);
+                                                       } else {
+                                                               OC.dialogs.alert(result.data.message, t('core', 'Error'));
+                                                       }
+                                               }
+                                       );
+                                       break;
+                               case 'web':
+                                       if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
+                                               name='http://'+name;
+                                       }
+                                       var localName=name;
+                                       if(localName.substr(localName.length-1,1)=='/'){//strip /
+                                               localName=localName.substr(0,localName.length-1)
+                                       }
+                                       if(localName.indexOf('/')){//use last part of url
+                                               localName=localName.split('/').pop();
+                                       } else { //or the domain
+                                               localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+                                       }
+                                       localName = getUniqueName(localName);
+                                       //IE < 10 does not fire the necessary events for the progress bar.
 -                                      if($('html.lte9').length > 0) {
 -                                      } else {
++                                      if($('html.lte9').length === 0) {
+                                               $('#uploadprogressbar').progressbar({value:0});
+                                               $('#uploadprogressbar').fadeIn();
+                                       }
  
-               var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
-               eventSource.listen('progress',function(progress){
-                 //IE < 10 does not fire the necessary events for the progress bar.
-                 if($('html.lte9').length === 0) {
-                       $('#uploadprogressbar').progressbar('value',progress);
-                 }
-               });
-               eventSource.listen('success',function(data){
-                 var mime=data.mime;
-                 var size=data.size;
-                 var id=data.id;
-                 $('#uploadprogressbar').fadeOut();
-                 var date=new Date();
-                 FileList.addFile(localName,size,date,false,hidden);
-                 var tr=$('tr').filterAttr('data-file',localName);
-                 tr.data('mime',mime).data('id',id);
-                 tr.attr('data-id', id);
-                 getMimeIcon(mime,function(path){
-                       tr.find('td.filename').attr('style','background-image:url('+path+')');
-                 });
-               });
-               eventSource.listen('error',function(error){
-                 $('#uploadprogressbar').fadeOut();
-                 alert(error);
+                                       var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+                                       eventSource.listen('progress',function(progress){
+                                               //IE < 10 does not fire the necessary events for the progress bar.
 -                                              if($('html.lte9').length > 0) {
 -                                              } else {
++                                              if($('html.lte9').length === 0) {
+                                                       $('#uploadprogressbar').progressbar('value',progress);
+                                               }
+                                       });
+                                       eventSource.listen('success',function(data){
+                                               var mime=data.mime;
+                                               var size=data.size;
+                                               var id=data.id;
+                                               $('#uploadprogressbar').fadeOut();
+                                               var date=new Date();
+                                               FileList.addFile(localName,size,date,false,hidden);
+                                               var tr=$('tr').filterAttr('data-file',localName);
+                                               tr.data('mime',mime).data('id',id);
+                                               tr.attr('data-id', id);
+                                               getMimeIcon(mime,function(path){
+                                                       tr.find('td.filename').attr('style','background-image:url('+path+')');
+                                               });
+                                       });
+                                       eventSource.listen('error',function(error){
+                                               $('#uploadprogressbar').fadeOut();
+                                               alert(error);
+                                       });
+                                       break;
+                       }
+                       var li=form.parent();
+                       form.remove();
+                       li.append('<p>'+li.data('text')+'</p>');
+                       $('#new>a').click();
                });
-               break;
-         }
-         var li=form.parent();
-         form.remove();
-         li.append('<p>'+li.data('text')+'</p>');
-         $('#new>a').click();
        });
-   });
  });
Simple merge
index 9c3c74721f08845c1f54211fc1a90a42fdfd6031,a14de7dbee2640153434db028ac7a878a821c4e0..f57e931bad9aa328dd2d6c504ee86f82567e61bc
@@@ -124,16 -124,14 +124,14 @@@ function createVersionsDropdown(filenam
        }
  
        function addVersion( revision ) {
 -              title = formatDate(revision.version*1000);
 -              name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
 +              var title = formatDate(revision.version*1000);
 +              var name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
  
 -              path = OC.filePath('files_versions', '', 'download.php');
 +              var path = OC.filePath('files_versions', '', 'download.php');
  
 -              download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
 +              var download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
                download+='<img';
                download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
-               download+=' id="' + revision.version + '"';
-               download+=' value="' + files + '"';
                download+=' name="downloadVersion" />';
                download+=name;
                download+='</a>';
Simple merge
Simple merge
Simple merge