Request 2376 (accepted)

Overview

Request 2376 (accepted)

Update to 95 revisions ahead of 1.4-beta

Created by vanmeeuwen over 5 years ago
In state accepted

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.4-beta86.tar.gz/CHANGELOG -> roundcubemail-1.4-beta95.tar.gz/CHANGELOG Changed

roundcubemail-1.4-beta86.tar.gz/plugins/enigma/enigma.js -> roundcubemail-1.4-beta95.tar.gz/plugins/enigma/enigma.js Changed

roundcubemail-1.4-beta86.tar.gz/program/js/app.js -> roundcubemail-1.4-beta95.tar.gz/program/js/app.js Changed

@@ -47,7 +47,7 @@
   this.group2expand = {};
   this.http_request_jobs = {};
   this.menu_stack = [];
-  this.menu_buttons = [];
+  this.menu_buttons = {};
   this.entity_selectors = [];
   this.image_style = {};
 
@@ -125,21 +125,25 @@
   // register a button with popup menu, to set its state according to the state of all commands in the menu
   this.register_menu_button = function(button, menu_id)
   {
-    var commands = [];
-
-    $('#' + menu_id).find('a').each(function() {
-      var command, link = $(this), onclick = link.attr('onclick');
-
-      if (onclick && String(onclick).match(/rcmail\.command\(\'([^']+)/))
-        command = RegExp.$1;
-      else
-        command = function() { return link.is('.active'); };
-
-      commands.push(command);
-    });
-
-    if (commands.length)
-      this.menu_buttons.push([button, commands]);
+    if (this.menu_buttons[menu_id]) {
+      this.menu_buttons[menu_id][0].push(button);
+    }
+    else {
+      var commands = [];
+      $('#' + menu_id).find('a').each(function() {
+        var command, link = $(this), onclick = link.attr('onclick');
+
+        if (onclick && String(onclick).match(/rcmail\.command\(\'([^']+)/))
+          command = RegExp.$1;
+        else
+          command = function() { return link.is('.active'); };
+
+        commands.push(command);
+      });
+
+      if (commands.length)
+        this.menu_buttons[menu_id] = [[button], commands];
+    }
 
     this.set_menu_buttons();
   };

roundcubemail-1.4-beta86.tar.gz/program/lib/Roundcube/rcube.php -> roundcubemail-1.4-beta95.tar.gz/program/lib/Roundcube/rcube.php Changed

roundcubemail-1.4-beta86.tar.gz/skins/elastic/styles/widgets/buttons.less -> roundcubemail-1.4-beta95.tar.gz/skins/elastic/styles/widgets/buttons.less Changed

roundcubemail-1.4-beta86.tar.gz/skins/elastic/styles/widgets/mail.less -> roundcubemail-1.4-beta95.tar.gz/skins/elastic/styles/widgets/mail.less Changed

roundcubemail-1.4-beta86.tar.gz/skins/elastic/templates/compose.html -> roundcubemail-1.4-beta95.tar.gz/skins/elastic/templates/compose.html Changed

roundcubemail-1.4-beta86.tar.gz/skins/elastic/ui.js -> roundcubemail-1.4-beta95.tar.gz/skins/elastic/ui.js Changed

@@ -65,6 +65,7 @@
     this.searchmenu = searchmenu;
     this.headersmenu = headersmenu;
     this.header_reset = header_reset;
+    this.compose_status = compose_status;
     this.attachmentmenu = attachmentmenu;
     this.mailtomenu = mailtomenu;
     this.recipient_selector = recipient_selector;
@@ -678,6 +679,16 @@
                         rcmail.display_message(rcmail.gettext('nocontactselected'), 'warning');
                     }
                 });
+
+                // Update compose status bar on attachments list update
+                if (window.MutationObserver) {
+                    var observer, list = $('#attachment-list'),
+                        status_callback = function() { compose_status('attach', list.children().length > 0); };
+
+                    observer = new MutationObserver(status_callback);
+                    observer.observe(list[0], {childList: true});
+                    status_callback();
+                }
             }
 
             // Append contact menu to all mailto: links
@@ -1399,7 +1410,7 @@
             case 'compose-encrypted':
                 // show the toolbar button for Mailvelope
                 if (args.status) {
-                    $('a.button.encrypt').parent().show();
+                    $('a.button.encrypt:not(.icon)').parent().show();
                 }
                 break;
 
@@ -1407,11 +1418,6 @@
                 // enable selector for encrypt and sign
                 $('#encryption-menu-button').show();
                 break;
-
-            case 'mark':
-                // show the toolbar button for Mailvelope
-                $('a.button.markmessage')[args.status ? 'removeClass' : 'addClass']('disabled');
-                break;
             }
         }
     };
@@ -2707,6 +2713,23 @@
     };
 
     /**
+     * Add/remove item to/from compose options status bar
+     */
+    function compose_status(id, status)
+    {
+        var bar = $('#composestatusbar'), ico = bar.find('a.button.icon.' + id);
+
+        if (!status) {
+            ico.remove();
+        }
+        else if (!ico.length) {
+            $('<a>').attr('class', 'button icon ' + id)
+                .on('click', function() { show_sidebar(); })
+                .appendTo(bar);
+        }
+    };
+
+    /**
      * Attachment menu
      */
     function attachmentmenu(obj, button, event)

roundcubemail-1.4-beta86.tar.gz/temp/js_cache/tinymce-langs-4.8.2.zip -> roundcubemail-1.4-beta95.tar.gz/temp/js_cache/tinymce-langs-4.8.2.zip Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2376 0

Request History

vanmeeuwen created request over 5 years ago

Update to 95 revisions ahead of 1.4-beta

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago