Merge branch 'master' of git://anongit.kde.org/owncloud

2 files changed, 8 insertions, 15 deletions

diff --git a/files/js/filelist.js b/files/js/filelist.js
index 260ca00b977..c3a2522fb6a 100644
--- 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');
 		});
 	}
 }
diff --git a/files/js/files.js b/files/js/files.js
index 4e1de1b04a4..be7e48aeeeb 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -5,6 +5,7 @@ $(document).ready(function() {
 	$('#fileList tr td.filename').draggable(dragOptions);
 	$('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
+	$('#plugins>ul>li:first-child').data('dir','');
 	$('#plugins>ul>li:first-child').droppable(crumbDropOptions);
 	
 	// Sets the file-action buttons behaviour :