From d1d0564a91812e3e58569bfa0ef413d36e130d24 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 6 Jun 2012 21:24:52 +0200
Subject: Fix js error when dropping attachment file

---
 program/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program/js/app.js b/program/js/app.js
index b3d3aed5c..7eb8c787c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6259,7 +6259,7 @@ function rcube_webmail()
       dashdash = '--', crlf = '\r\n',
       multipart = dashdash + boundary + crlf;
 
-    if (!file || !files.length)
+    if (!files || !files.length)
       return;
 
     // inline function to submit the files to the server
-- 
cgit v1.2.3


From f8c96f737c1916377e361e3fbaa8a415c4101ca4 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 7 Jun 2012 10:34:56 +0200
Subject: Enable attachments drag&drop upload for default skin

---
 skins/default/mail.css               | 8 ++++++++
 skins/default/templates/compose.html | 1 +
 2 files changed, 9 insertions(+)

diff --git a/skins/default/mail.css b/skins/default/mail.css
index c8db8e0c8..0e928f0e8 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1448,6 +1448,14 @@ input.from_address
   background-color: #F9F9F9;
 }
 
+#compose-attachments.droptarget.hover
+{
+  background-color: #F0F0EE;
+  box-shadow: 0 0 5px 0 #999;
+  -moz-box-shadow: 0 0 5px 0 #999;
+  -o-box-shadow: 0 0 5px 0 #999;
+}
+
 #compose-attachments ul
 {
   margin: 0px;
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index adb0949c1..caebf31a0 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -49,6 +49,7 @@
   <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
 </div>
 </div>
+<roundcube:object name="fileDropArea" id="compose-attachments" />
 
 <script type="text/javascript">
   var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 175});
-- 
cgit v1.2.3