Changeset 3949 in subversion

Timestamp:

Sep 8, 2010 2:00:15 PM (3 years ago)

Author:

alec

Message:

• Re-add 'Close' button in upload form (#1486930, #1486823)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (1 diff)
• skins/default/functions.js (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -19 +19 @@
 - 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

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -995 +995 @@
       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)"))
       )

trunk/roundcubemail/skins/default/functions.js

@@ -37 +37 @@
     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 }
   };