Fix for bad parsing of reply with >|< chars; issue #11

kylehuff · May 12, 2013 · 4c58e54 · 4c58e54
1 parent da82a2a
commit 4c58e54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/extension/gmail.js b/extension/gmail.js
@@ -220,7 +220,8 @@ webpg.gmail = {
                     if (!send)
                         return;
                 }
-                message = webpg.utils.linkify(message).replace(/<(<.*?>)>/gim, "&lt;$1&gt;");
+                message = webpg.utils.linkify(message).replace(/<(<.*?>)>/gim, "&lt;$1&gt;").trim();
+                message += "\n\n";
                 webpg.utils.sendRequest({'msg': 'sign',
                     'signers': webpg.gmail.signers,
                     'message_event': 'gmail',

diff --git a/extension/inline.js b/extension/inline.js
@@ -390,8 +390,8 @@ webpg.inline = {
 
         var scontent = webpg.utils.getInnerText(node.parentNode);
 
-        if (scontent.search(/^\s*?(-----BEGIN PGP.*?)/gi) < 0)
-            scontent = webpg.utils.clean(str);
+//        if (scontent.search(/^\s*?(-----BEGIN PGP.*?)/gi) < 0)
+//            scontent = webpg.utils.clean(str);
 
         if (webpg.utils.detectedBrowser['product'] == 'thunderbird') {
             var tmp_scontent = str.replace(new RegExp("<[^>]+>", "gim"), "");