some tweaks for renaming

diff --git a/files/js/filelist.js b/files/js/filelist.js
index 260ca00b9773f86457e8fdbc2f1db3bda2400aab..c3a2522fb6a165d9abd86da594e0736bb6152e3b 100644 (file)
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -114,10 +114,10 @@ FileList={
                td.children('a.name').append(form)
                input.focus();
                form.submit(function(event){
-                       var newname=input.val();
-                       tr.data('renaming',false);
                        event.stopPropagation();
                        event.preventDefault();
+                       var newname=input.val();
+                       tr.data('renaming',false);
                        tr.attr('data-file',newname);
                        td.children('a.name').empty();
                        if(newname.indexOf('.')>0){
@@ -125,9 +125,11 @@ FileList={
                        }else{
                                basename=newname;
                        }
-                       td.children('a.name').text(basename);
+                       var span=$('<span class="nametext"></span>');
+                       span.text(basename);
+                       td.children('a.name').append(span);
                        if(newname.indexOf('.')>0){
-                               td.children('a.name').append($('<span class="extention">'+newname.substr(newname.indexOf('.'))+'</span>'));
+                               span.append($('<span class="extention">'+newname.substr(newname.indexOf('.'))+'</span>'));
                        }
                        $.ajax({
                                url: 'ajax/rename.php',
@@ -139,17 +141,7 @@ FileList={
                        event.preventDefault();
                });
                input.blur(function(){
-                       tr.data('renaming',false);
-                       td.children('a.name').empty();
-                       if(name.indexOf('.')>0){
-                               basename=name.substr(0,name.indexOf('.'));
-                       }else{
-                               basename=name;
-                       }
-                       td.children('a.name').text(basename);
-                       if(name.indexOf('.')>0){
-                               td.children('a.name').append($('<span class="extention">'+name.substr(name.indexOf('.'))+'</span>'));
-                       }
+                       form.trigger('submit');
                });
        }
 }