Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 233791: Toolbar button jumps when marking a message as junk (or not junk)

Browse Source 
r=neil,sr=mscott


git-svn-id: svn://10.0.0.236/trunk@159985 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Stefan.Borggraefe%gmx.de
2004-07-28 20:44:22 +00:00
parent 6444effb01
commit 87e2cbf7c6
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/mailnews/base/resources/content/mailWindowOverlay.js
View File

@@ -588,21 +588,8 @@ function InitMessageMark()
function UpdateJunkToolbarButton()
{
try
{
var junkButton = document.getElementById("button-junk");
if (SelectedMessagesAreJunk())
{
junkButton.label = junkButton.getAttribute('notjunk_label');
junkButton.setAttribute('tooltiptext', junkButton.getAttribute('notjunk_tooltiptext'));
}
else
{
junkButton.label = junkButton.getAttribute('junk_label');
junkButton.setAttribute('tooltiptext', junkButton.getAttribute('junk_tooltiptext'));
}
}
catch(e) {}
var junkButtonDeck = document.getElementById("deck-junk");
junkButtonDeck.selectedIndex = SelectedMessagesAreJunk() ? 1 : 0;
}
function UpdateDeleteCommand()

20
mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
View File

@@ -1747,16 +1747,18 @@
<menupopup/>
</toolbarbutton>
<toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
<deck id="deck-junk" oncommand="goDoCommand('button_junk')">
<toolbarbutton id="button-junk" class="toolbarbutton-1"
label="&junkButton.label;"
tooltiptext="&junkButton.tooltip;"
observes="button_junk"/>
<toolbarbutton class="toolbarbutton-1"
id="button-junk" label="&junkButton.label;"
tooltiptext="&junkButton.tooltip;"
observes="button_junk"
oncommand="goDoCommand('button_junk')"
junk_label="&junkButton.label;"
junk_tooltiptext="&junkButton.tooltip;"
notjunk_label="&notJunkButton.label;"
notjunk_tooltiptext="&notJunkButton.tooltip;"/>
<toolbarbutton id="button-junk" class="toolbarbutton-1"
label="&notJunkButton.label;"
tooltiptext="&notJunkButton.tooltip;"
observes="button_junk"/>
</deck>
<toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
<toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"