fancyfying file upload, part I

1 files changed, 23 insertions, 2 deletions

diff --git a/files/js/files.js b/files/js/files.js
index f1cb200817b..edb57fc2c0e 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -74,6 +74,12 @@ $(document).ready(function() {
 		$('#file_upload_target').load(uploadFinished);
 	});
 	
+	$('#file_upload_cancel').click(function() {
+		$('#file_action_panel').attr('activeAction', 'false');
+		$('#file_upload_form').hide();
+		$('p.actions a.upload:first').show();
+	});
+	
 	$('#file_new_dir_submit').click(function() {
 		$.ajax({
 			url: 'ajax/newfolder.php',
@@ -86,8 +92,16 @@ $(document).ready(function() {
 		if($('#file_action_panel').attr('activeAction') != 'upload') {
 			$('#file_action_panel').attr('activeAction', 'upload');
 			$('#fileSelector').replaceWith('<input type="file" name="file" id="fileSelector">');
+			$('#fileSelector').change(function() {
+				$('#file_upload_start').val('Upload ' + $('#fileSelector').val());
+				$('p.actions a.upload:first').after($('#file_upload_form'));
+				$('#file_upload_form').css('display', 'inline');
+				$('p.actions a.upload:first').hide();
+				$('#fileSelector').hide();
+			});
 			$('#file_action_panel form').slideUp(250);
-			$('#file_upload_form').slideDown(250);
+// 			$('#file_upload_form').slideDown(250);
+			$('#fileSelector').click();
 		} else {
 			$('#file_action_panel').attr('activeAction', 'false');
 			$('#file_upload_form').slideUp(250);
@@ -95,6 +109,8 @@ $(document).ready(function() {
 		return false;
 	});
 	
+	
+	
 	$('.new-dir').click(function(){
 		if($('#file_action_panel').attr('activeAction') != 'new-dir') {
 			$('#file_action_panel').attr('activeAction', 'new-dir');
@@ -151,7 +167,12 @@ function uploadFinished() {
 		$.ajax({
 			url: 'ajax/list.php',
 			data: "dir="+dir,
-			complete: refreshContents
+			complete: function(data) {
+				refreshContents(data);
+				$('#file_action_panel').prepend($('#file_upload_form'));
+				$('#file_upload_form').css('display', 'block').hide();
+				$('p.actions a.upload:first').show();
+			}
 		});
 	}
 }