Merge pull request twitter-archive#4 from sayrer/master

Just some small fixes.
keitaf · Jul 25, 2011 · 155c979 · 155c979
2 parents a6cb67a + defa61f
commit 155c979
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/test/tests.js b/test/tests.js
@@ -6,7 +6,7 @@ test("twttr.txt.htmlEscape", function() {
     [">", "&gt;"],
     ["<", "&lt;"],
     ["\"", "&quot;"],
-    ["'", "&#32;"],
+    ["'", "&#39;"],
     ["&<>\"", "&amp;&lt;&gt;&quot;"],
     ["<div>", "&lt;div&gt;"],
     ["a&b", "a&amp;b"],

diff --git a/twitter-text.js b/twitter-text.js
@@ -122,7 +122,6 @@ if (!window.twttr) {
   twttr.txt.regexen.nonLatinHashtagChars = regexSupplant(nonLatinHashtagChars.join(""));
   // Latin accented characters (subtracted 0xD7 from the range, it's a confusable multiplication sign. Looks like "x")
   twttr.txt.regexen.latinAccentChars = regexSupplant("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ\\303\\277");
-  twttr.txt.regexen.latenAccents = regexSupplant(/[#{latinAccentChars}]+/);
 
   twttr.txt.regexen.endScreenNameMatch = regexSupplant(/^(?:#{atSigns}|[#{latinAccentChars}]|:\/\/)/);
 
@@ -727,7 +726,7 @@ if (!window.twttr) {
       }
     }
 
-    return false
+    return false;
   };
 
   twttr.txt.isValidTweetText = function(text) {