From d447a4f2296e5e9afc9d79cede0e49b2d6210f9f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 07 Jun 2012 12:28:14 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
skins/default/mail.css | 8 ++++++++
skins/default/templates/compose.html | 1 +
program/js/app.js | 2 +-
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index c256fa3..cc4b8c2 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6259,7 +6259,7 @@
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
diff --git a/skins/default/mail.css b/skins/default/mail.css
index c8db8e0..0e928f0 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1448,6 +1448,14 @@
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 adb0949..caebf31 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});
--
Gitblit v1.9.1