Merge pull request #5 from drvic10k/pull-2

only one hyphen was replaced
adamlukaszczyk · Jun 9, 2014 · 9cd29ae · 9cd29ae
2 parents d612944 + 9325442
commit 9cd29ae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/js/jquery.FastEllipsis.js b/js/jquery.FastEllipsis.js
@@ -117,7 +117,7 @@ function FastEllipsis(cssStyle) {
   ellipseIt = function(myString, maxLine, lineWidth) {
     var lineNo = 1,
         wordsInLineWidth = 0,
-        wordArr = myString.trim().strip_tags().replace("-", "- ").split(/\s+/g), // trim string, remove HTML tags, remove space duplicates, detect dash word breaking
+        wordArr = myString.trim().strip_tags().replace(/-/g, "- ").split(/\s+/g), // trim string, remove HTML tags, remove space duplicates, detect dash word breaking
         spaceWidth = getCharWidth(" "),
         threeDotsWidth = getWordWidth("...");
 
@@ -140,7 +140,7 @@ function FastEllipsis(cssStyle) {
 
         // When you reached the end of maxLine parameter break the loop and return the result
         else if (lineNo > maxLine) {
-          return wordArr.slice(0, i).join(" ").replace("- ", "-") + "..."; // replace to reverse dash word breaking
+          return wordArr.slice(0, i).join(" ").replace(/-\s/g, "-") + "..."; // replace to reverse dash word breaking
         }
 
         // If the words width was bigger than line width go back in the loop to take last word for use in the beggining of next line
@@ -179,4 +179,4 @@ if (typeof String.prototype.strip_tags !== "function") {
   String.prototype.strip_tags = function() {
     return this.replace(/<\/?[^>]+(>|$)/g, "");
   };
-};
+};