[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 279/483: Show alternative command keys when the command is invoked as well

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus-element-hiding-helper.

commit 5933c11e0c8b71a8bc9edd7386f639d3ad660c57
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Sat Oct 30 16:45:18 2010 +0200

    Show alternative command keys when the command is invoked as well
---
 chrome/content/overlay.xul | 1 +
 chrome/skin/overlay.css    | 2 +-
 modules/Aardvark.jsm       | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index 57dbf59..dff1715 100644
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -46,6 +46,7 @@
     </tooltip>
     <tooltip id="ehh-commandlabel" noautohide="true" orient="horizontal">
       <description id="ehh-commandlabel-key"/>
+      <description id="ehh-commandlabel-alternativeKey"/>
       <description id="ehh-commandlabel-label"/>
     </tooltip>
     <tooltip id="ehh-viewsource" noautohide="true" orient="vertical"/>
diff --git a/chrome/skin/overlay.css b/chrome/skin/overlay.css
index f3254e6..25c100e 100644
--- a/chrome/skin/overlay.css
+++ b/chrome/skin/overlay.css
@@ -47,7 +47,7 @@
   font-size: 200%;
 }
 
-#ehh-commandlabel-key
+#ehh-commandlabel-key, #ehh-commandlabel-alternativeKey
 {
   font-weight: bold;
 }
diff --git a/modules/Aardvark.jsm b/modules/Aardvark.jsm
index 98cd816..fee4414 100644
--- a/modules/Aardvark.jsm
+++ b/modules/Aardvark.jsm
@@ -128,7 +128,7 @@ var Aardvark =
   {
     if (this[command](this.selectedElem))
     {
-      this.showCommandLabel(this.commands[command + "_key"], this.commands[command + "_label"]);
+      this.showCommandLabel(this.commands[command + "_key"], this.commands[command + "_altkey"], this.commands[command + "_label"]);
       if (event)
         event.stopPropagation();
     }
@@ -136,12 +136,13 @@ var Aardvark =
       event.preventDefault();
   },
 
-  showCommandLabel: function(key, label)
+  showCommandLabel: function(key, alternativeKey, label)
   {
     if (this.commandLabelTimer)
       this.commandLabelTimer.cancel();
   
     E("ehh-commandlabel-key").setAttribute("value", key);
+    E("ehh-commandlabel-alternativeKey").setAttribute("value", alternativeKey);
     E("ehh-commandlabel-label").setAttribute("value", label);
   
     var commandLabel = E("ehh-commandlabel");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus-element-hiding-helper.git