diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-06-07 18:28:14 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-06-07 18:28:14 +0200 |
| commit | d447a4f2296e5e9afc9d79cede0e49b2d6210f9f (patch) | |
| tree | ba59d9261c16c8ba71b0a7aa29300c194f13476e | |
| parent | 9df79d82b3e7b57f3b338d2036e0beb0029798f9 (diff) | |
| parent | f8c96f737c1916377e361e3fbaa8a415c4101ca4 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | skins/default/mail.css | 8 | ||||
| -rw-r--r-- | skins/default/templates/compose.html | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js index c256fa3bd..cc4b8c25f 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 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}); |