зеркало из https://github.com/mozilla/pjs.git
Bug #134288 --> hide extra hash marks caused by the smime code in the 3-pane and compose window when you
are viewing/sending a message with no security information. r=kai sr=sspitzer
This commit is contained in:
Родитель
a3d303fa29
Коммит
1401374810
|
@ -232,21 +232,25 @@ function doSecurityButton()
|
|||
function setNoSignatureUI()
|
||||
{
|
||||
top.document.getElementById("securityStatus").removeAttribute("signing");
|
||||
top.document.getElementById("signing-status").collapsed = true;
|
||||
}
|
||||
|
||||
function setSignatureUI()
|
||||
{
|
||||
top.document.getElementById("securityStatus").setAttribute("signing", "ok");
|
||||
top.document.getElementById("signing-status").collapsed = false;
|
||||
}
|
||||
|
||||
function setNoEncryptionUI()
|
||||
{
|
||||
top.document.getElementById("securityStatus").removeAttribute("crypto");
|
||||
top.document.getElementById("encryption-status").collapsed = true;
|
||||
}
|
||||
|
||||
function setEncryptionUI()
|
||||
{
|
||||
top.document.getElementById("securityStatus").setAttribute("crypto", "ok");
|
||||
top.document.getElementById("encryption-status").collapsed = false;
|
||||
}
|
||||
|
||||
function showMessageComposeSecurityStatus()
|
||||
|
|
|
@ -76,9 +76,9 @@
|
|||
</hbox>
|
||||
|
||||
<statusbar id="status-bar">
|
||||
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
|
||||
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic" collapsed="true"
|
||||
id="signing-status" oncommand="showMessageComposeSecurityStatus();"/>
|
||||
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
|
||||
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic" collapsed="true"
|
||||
id="encryption-status" oncommand="showMessageComposeSecurityStatus();"/>
|
||||
</statusbar>
|
||||
|
||||
|
|
|
@ -23,6 +23,8 @@ var gSignedUINode = null;
|
|||
var gEncryptedUINode = null;
|
||||
var gSMIMEContainer = null;
|
||||
var gStatusBar = null;
|
||||
var gSignedStatusPanel = null;
|
||||
var gEncryptedStatusPanel = null;
|
||||
|
||||
// manipulates some globals from msgReadSMIMEOverlay.js
|
||||
|
||||
|
@ -47,11 +49,12 @@ var smimeHeaderSink =
|
|||
|
||||
gSMIMEContainer.collapsed = false;
|
||||
gSignedUINode.collapsed = false;
|
||||
|
||||
gSignedStatusPanel.collapsed = false;
|
||||
|
||||
if (nsICMSMessageErrors.SUCCESS == aSignatureStatus)
|
||||
{
|
||||
gSignedUINode.setAttribute("signed", "ok");
|
||||
gStatusBar.setAttribute("signed", "ok");
|
||||
gStatusBar.setAttribute("signed", "ok");
|
||||
}
|
||||
else if(nsICMSMessageErrors.VERIFY_NOT_YET_ATTEMPTED == aSignatureStatus)
|
||||
{
|
||||
|
@ -77,6 +80,7 @@ var smimeHeaderSink =
|
|||
|
||||
gSMIMEContainer.collapsed = false;
|
||||
gEncryptedUINode.collapsed = false;
|
||||
gEncryptedStatusPanel.collapsed = false;
|
||||
|
||||
if (nsICMSMessageErrors.SUCCESS == aEncryptionStatus)
|
||||
{
|
||||
|
@ -110,6 +114,10 @@ function onSMIMEStartHeaders()
|
|||
gSignedUINode.collapsed = true;
|
||||
gSignedUINode.removeAttribute("signed");
|
||||
gStatusBar.removeAttribute("signed");
|
||||
|
||||
gSignedStatusPanel.collapsed = true;
|
||||
gEncryptedStatusPanel.collapsed = true;
|
||||
|
||||
gEncryptedUINode.collapsed = true;
|
||||
gEncryptedUINode.removeAttribute("encrypted");
|
||||
gStatusBar.removeAttribute("encrypted");
|
||||
|
@ -128,6 +136,8 @@ function msgHdrViewSMIMEOnLoad(event)
|
|||
gEncryptedUINode = document.getElementById('encryptedHdrIcon');
|
||||
gSMIMEContainer = document.getElementById('smimeBox');
|
||||
gStatusBar = document.getElementById('status-bar');
|
||||
gSignedStatusPanel = document.getElementById('signed-status');
|
||||
gEncryptedStatusPanel = document.getElementById('encrypted-status');
|
||||
|
||||
// add ourself to the list of message display listeners so we get notified when we are about to display a
|
||||
// message.
|
||||
|
|
|
@ -54,9 +54,9 @@
|
|||
|
||||
<hbox id="status-bar-end-box">
|
||||
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
|
||||
id="signed-status" oncommand="showMessageReadSecurityInfo();"/>
|
||||
id="signed-status" collapsed="true" oncommand="showMessageReadSecurityInfo();"/>
|
||||
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
|
||||
id="encrypted-status" oncommand="showMessageReadSecurityInfo();"/>
|
||||
id="encrypted-status" collapsed="true" oncommand="showMessageReadSecurityInfo();"/>
|
||||
</hbox>
|
||||
|
||||
</overlay>
|
||||
|
|
Загрузка…
Ссылка в новой задаче