release version 2.2.8

Zimbra-Community · Apr 28, 2016 · f5e446c · f5e446c
1 parent 01aaff3
commit f5e446c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ The recommended method is to deploy using git. (I no longer support zmzimletctl,
     [root@myzimbra ~]# rm pgp-zimlet -Rf
     [root@myzimbra ~]# git clone https://github.com/Zimbra-Community/pgp-zimlet
     [root@myzimbra ~]# cd pgp-zimlet
-    [root@myzimbra pgp-zimlet]# git checkout 2.2.7
+    [root@myzimbra pgp-zimlet]# git checkout 2.2.8
     [root@myzimbra pgp-zimlet]# chmod +rx install-dev.sh
     [root@myzimbra pgp-zimlet]# ./install-dev.sh
     [root@myzimbra pgp-zimlet]# su zimbra

diff --git a/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.js b/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.js
@@ -1190,13 +1190,10 @@ function(arguments) {
          }    
          document.getElementById('tk_barrydegraaff_zimbra_openpgp_infobar'+myWindow.arguments['domId']).innerHTML='<img style="vertical-align:middle" src="/service/zimlet/_dev/tk_barrydegraaff_zimbra_openpgp/icon.png"> OpenPGP: <b>'+ sigStatus + '</b>';
 
-         var preOpen = '<pre style="white-space: pre-wrap;word-wrap: break-word;">';
-         var preClose = '</pre>';
-
          // Got a decrypted message that does not need further mime parsing
          if(myWindow.arguments['hasMIME']== false)
          {
-            document.getElementById('tk_barrydegraaff_zimbra_openpgp_infobar_body'+myWindow.arguments['domId']).innerHTML=preOpen + tk_barrydegraaff_zimbra_openpgp.prototype.urlify(tk_barrydegraaff_zimbra_openpgp.prototype.escapeHtml(plaintext.data)) + preClose;
+            document.getElementById('tk_barrydegraaff_zimbra_openpgp_infobar_body'+myWindow.arguments['domId']).innerHTML=tk_barrydegraaff_zimbra_openpgp.prototype.urlify(tk_barrydegraaff_zimbra_openpgp.prototype.escapeHtml(plaintext.data));
             document.getElementById('tk_barrydegraaff_zimbra_openpgp_infobar_body'+myWindow.arguments['domId']).setAttribute('data-decrypted',plaintext.data);
          }
          // Go a message that needs MIME parsing (PGP/MIME)