From 6b7509b18a0a38accc68ad94e17cd55e59621be1 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 25 Jan 2014 21:00:07 +0100
Subject: [PATCH] Attachments: implement browsing & deleting using fineuploader

---
 webcit/static/t/edit/message.html                | 16 ----------------
 .../static/t/edit/message/attachments_pane.html  | 11 +++++++----
 webcit/static/t/edit/message/json_attlist.js     |  3 +++
 .../static/t/edit/message/section_attach_list.js |  5 +++++
 .../t/edit/message/section_attach_select.html    |  5 -----
 5 files changed, 15 insertions(+), 25 deletions(-)
 create mode 100644 webcit/static/t/edit/message/json_attlist.js
 create mode 100644 webcit/static/t/edit/message/section_attach_list.js
 delete mode 100644 webcit/static/t/edit/message/section_attach_select.html

diff --git a/webcit/static/t/edit/message.html b/webcit/static/t/edit/message.html
index 23b964340..f803f3762 100644
--- a/webcit/static/t/edit/message.html
+++ b/webcit/static/t/edit/message.html
@@ -176,22 +176,6 @@
 		);
 	}
 
-	function remove_attachment(which_one) {
-		p = 'which_attachment=' + which_one + '&r=' + CtdlRandomString();
-		new Ajax.Updater(
-			'gonna_upload_this',
-			'remove_attachment',
-			{
-				method: 'get',
-				parameters: p,
-				onComplete: function(){
-					show_attachments_form();
-					update_attachment_count();
-				}
-			}
-		);
-	}
-
 </script>
 </div>
 </div>
diff --git a/webcit/static/t/edit/message/attachments_pane.html b/webcit/static/t/edit/message/attachments_pane.html
index b74ce3509..c2dc3a0f3 100644
--- a/webcit/static/t/edit/message/attachments_pane.html
+++ b/webcit/static/t/edit/message/attachments_pane.html
@@ -5,7 +5,6 @@
     <?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></div>
 </a>
 <h2><img src="static/webcit_icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
-<ul><?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")></ul>
 
 <!-- Fine Uploader JS
 ====================================================================== -->
@@ -15,9 +14,13 @@ function createUploader()
 {
     var uploader = new qq.FineUploader(
 	{
+	    session: {
+		endpoint: "do_template?template=edit_message_json_attlist"
+	    },
 	    callbacks: {
-		"onComplete": update_attachment_count,
-		"delete": update_attachment_count
+		onComplete: update_attachment_count,
+		delete: update_attachment_count,
+		deleteComplete: update_attachment_count
 	    },
 	    element: document.getElementById('fine-uploader'),
 	    request: {
@@ -26,7 +29,7 @@ function createUploader()
 	    deleteFile: {
 		enabled: true,
 		forceConfirm: true,
-		endpoint: 'remove_attachment?nonce=<?NONCE>&template=edit_message_upl_att'
+		endpoint: 'remove_attachment?nonce=<?NONCE>&template=edit_message_upl_att&which_attachment='
 	    }
 	});
 }
diff --git a/webcit/static/t/edit/message/json_attlist.js b/webcit/static/t/edit/message/json_attlist.js
new file mode 100644
index 000000000..2260ab302
--- /dev/null
+++ b/webcit/static/t/edit/message/json_attlist.js
@@ -0,0 +1,3 @@
+[
+<?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_list")>
+]
\ No newline at end of file
diff --git a/webcit/static/t/edit/message/section_attach_list.js b/webcit/static/t/edit/message/section_attach_list.js
new file mode 100644
index 000000000..4ea3b6ec5
--- /dev/null
+++ b/webcit/static/t/edit/message/section_attach_list.js
@@ -0,0 +1,5 @@
+{
+    "name":"<?MAIL:MIME:FILENAME("J")>",
+    "uuid":"<?MAIL:MIME:PARTNUM("J")>",
+    "size": <?MAIL:MIME:LENGTH>
+}<?%("COND:ITERATE:LASTN", 1, 0, 0, "", ",")>
diff --git a/webcit/static/t/edit/message/section_attach_select.html b/webcit/static/t/edit/message/section_attach_select.html
deleted file mode 100644
index aa29038cc..000000000
--- a/webcit/static/t/edit/message/section_attach_select.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<li>
-	<?MAIL:MIME:FILENAME("X")> (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes)
-	&nbsp;
-	<a href="javascript:remove_attachment('<?MAIL:MIME:FILENAME("J")>');"><?_("Remove")></a>
-</li>
-- 
2.30.2