[Pkg-mozext-commits] [compactheader] 423/441: Temporarily disable compact header specific other action button

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 6d5b5beb01b19c06e4ed09397fb25b804b4adce4
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date:   Sun Dec 21 21:12:07 2014 +0100

    Temporarily disable compact header specific other action button
    
    --HG--
    branch : 36.0a1
---
 .../content/compactHeaderOverlay-36.xul            |  2 +
 chrome/CompactHeader/content/toolbar.js            | 70 +++++++++++-----------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-36.xul b/chrome/CompactHeader/content/compactHeaderOverlay-36.xul
index 9e3b506..b394bf1 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-36.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-36.xul
@@ -65,6 +65,7 @@
                  mode="icons"
                  minwidth="10px"
                  defaultmode="icons">
+<!--
           <toolbarpalette id="header-view-toolbar-palette">
             <toolbarbutton id="CompactHeader_hdrOtherActionsButton"
                            label="&otherActionsButton2.label;"
@@ -72,6 +73,7 @@
                            class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
                            type="menu"/>
           </toolbarpalette>
+ -->
           <toolbar id="header-view-toolbar"
                    mode="icons" defaultmode="icons"
                    defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,CompactHeader_hdrOtherActionsButton">
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index b5731f5..fead770 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -61,14 +61,14 @@ org.mozdev.compactHeader.toolbar = function() {
   ];
 
   let gOtherMenuCommands = {
-      otherActionsOpenConversation: "cmd_openConversation",
-      otherActionsOpenInNewWindow:  "cmd_openMessage",
-      otherActionsOpenInNewTab:     "cmd_openMessage",
-      viewSourceMenuItem:           "cmd_viewPageSource",
-      markAsReadMenuItem:           "cmd_markAsRead",
-      markAsUnreadMenuItem:         "cmd_markAsUnread",
-      saveAsMenuItem:               "cmd_saveAsFile",
-      otherActionsPrint:            "cmd_print"
+//      otherActionsOpenConversation: "cmd_openConversation",
+//      otherActionsOpenInNewWindow:  "cmd_openMessage",
+//      otherActionsOpenInNewTab:     "cmd_openMessage",
+//      viewSourceMenuItem:           "cmd_viewPageSource",
+//      markAsReadMenuItem:           "cmd_markAsRead",
+//      markAsUnreadMenuItem:         "cmd_markAsUnread",
+//      saveAsMenuItem:               "cmd_saveAsFile",
+//      otherActionsPrint:            "cmd_print"
     };
 
   pub.cannotMoveToolbox = function() {
@@ -170,38 +170,38 @@ org.mozdev.compactHeader.toolbar = function() {
       }
     }
 
-    var target = "CompactHeader_hdrOtherActionsButton";
-
-    var newParent = document.getElementById(target) ||
-        document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
-
-    org.mozdev.compactHeader.debug.log("looking for CompactHeader_hdrOtherActionsButton");
-
-    if (newParent != null) {
-      var myElement;
-      myElement= document.getElementById("otherActionsPopup");
-      if (myElement) {
-        newParent.appendChild(myElement);
-        for (let menu in gOtherMenuCommands) {
-          let menuEl = document.getElementById(menu);
-          org.mozdev.compactHeader.debug.log("command to " + menu);
-          if (menuEl) {
-            org.mozdev.compactHeader.debug.log("fillToolboxPalette add command to " + menu + ": " + gOtherMenuCommands[menu]);
-            menuEl.setAttribute("command", gOtherMenuCommands[menu]);
-          }
-        }
-      }
-    }
+//    var target = "otherActionsButton";
+//
+//    var newParent = document.getElementById(target) ||
+//        document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
+//
+//    org.mozdev.compactHeader.debug.log("looking for otherActionsButton");
+//
+//    if (newParent != null) {
+//      var myElement;
+//      myElement= document.getElementById("otherActionsPopup");
+//      if (myElement) {
+//        newParent.appendChild(myElement);
+//        for (let menu in gOtherMenuCommands) {
+//          let menuEl = document.getElementById(menu);
+//          org.mozdev.compactHeader.debug.log("command to " + menu);
+//          if (menuEl) {
+//            org.mozdev.compactHeader.debug.log("fillToolboxPalette add command to " + menu + ": " + gOtherMenuCommands[menu]);
+//            menuEl.setAttribute("command", gOtherMenuCommands[menu]);
+//          }
+//        }
+//      }
+//    }
     org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
   };
 
   pub.showOtherActionButtonMenu = function() {
     org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu start");
-    onShowOtherActionsPopup();
-    InitMessageMark();
-    for (let menu in gOtherMenuCommands) {
-      goUpdateCommand(gOtherMenuCommands[menu]);
-    }
+//    onShowOtherActionsPopup();
+//    InitMessageMark();
+//    for (let menu in gOtherMenuCommands) {
+//      goUpdateCommand(gOtherMenuCommands[menu]);
+//    }
     org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu stop");
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git