summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/compose.inc2
-rw-r--r--skins/default/functions.js3
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fe99086f8..4ce835ee7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ CHANGELOG RoundCube Webmail
- Fix timezone string in sent mail (#1486961)
- Show disabled checkboxes for protected folders instead of dots (#1485498)
- Added fieldsets in Identity form, added 'identity_form' hook
+- Re-added 'Close' button in upload form (#1486930, #1486823)
RELEASE 0.4
-----------
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index a788840a7..6150fffac 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -994,7 +994,7 @@ function rcmail_compose_attachment_form($attrib)
html::div(null, rcmail_compose_attachment_field(array('size' => $attrib[attachmentfieldsize]))) .
html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
html::div('buttons',
-// $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
+ $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
$button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
)
)
diff --git a/skins/default/functions.js b/skins/default/functions.js
index 873c7f710..45c47c605 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -36,7 +36,8 @@ function rcube_mail_ui()
groupmenu: {id:'groupoptionsmenu', above:1},
mailboxmenu: {id:'mailboxoptionsmenu', above:1},
composemenu: {id:'composeoptionsmenu', editable:1},
- uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:bw.safari&&bw.win }
+ // toggle: #1486823, #1486930
+ uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux }
};
var obj;