]> source.dussan.org Git - nextcloud-server.git/commitdiff
remove duplicate code
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 21 Aug 2013 22:09:43 +0000 (00:09 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 21 Aug 2013 22:09:43 +0000 (00:09 +0200)
apps/files/js/file-upload.js
apps/files/js/files.js

index 49e464b810a7cbaa3dab8173ed0bad4e013bad0d..f262f11f06539a112f3a13f6656127f1c743a63a 100644 (file)
@@ -205,6 +205,13 @@ $(document).ready(function() {
                        }
                });
        });
+       $('#new').click(function(event){
+               event.stopPropagation();
+       });
+       $('#new>a').click(function(){
+               $('#new>ul').toggle();
+               $('#new').toggleClass('active');
+       });
        $('#new li').click(function(){
                if($(this).children('p').length==0){
                        return;
index 4eb949c2eefff4faa854115b2501c85fe12c7f7c..87311237e36cf6c9300c0c4415457f95c8b2b02c 100644 (file)
@@ -265,204 +265,6 @@ $(document).ready(function() {
                        e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
        });
 
-       $.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.');
-       });
-
-       //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')
-       }
-
-       //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);
-       }
-
-       $(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').click(function(event){
-               event.stopPropagation();
-       });
-       $('#new>a').click(function(){
-               $('#new>ul').toggle();
-               $('#new').toggleClass('active');
-       });
-       $('#new li').click(function(){
-               if($(this).children('p').length==0){
-                       return;
-               }
-
-               $('#new li').each(function(i,element){
-                       if($(element).children('p').length==0){
-                               $(element).children('form').remove();
-                               $(element).append('<p>'+$(element).data('text')+'</p>');
-                       }
-               });
-
-               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-size',result.data.size);
-                                                               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 {
-                                               $('#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) {
-                                               } else {
-                                                       $('#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();
-               });
-       });
-
        //do a background scan if needed
        scanFiles();