зеркало из https://github.com/mozilla/pjs.git
Fix for bug 233791: Toolbar button jumps when marking a message as junk (or not junk)
r=neil,sr=mscott
This commit is contained in:
Родитель
e8cdecbbd6
Коммит
513708f4d5
|
@ -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()
|
||||
|
|
|
@ -1748,15 +1748,17 @@
|
|||
</toolbarbutton>
|
||||
<toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
|
||||
|
||||
<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="¬JunkButton.label;"
|
||||
notjunk_tooltiptext="¬JunkButton.tooltip;"/>
|
||||
<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 id="button-junk" class="toolbarbutton-1"
|
||||
label="¬JunkButton.label;"
|
||||
tooltiptext="¬JunkButton.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')"
|
||||
|
|
Загрузка…
Ссылка в новой задаче