Merge pull request esamattis#150 from lfac-pt/master

Implement count without split
edtsech · Oct 16, 2012 · f7caf43 · f7caf43
2 parents 1d7d2a4 + 4a82f83
commit f7caf43
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/lib/underscore.string.js b/lib/underscore.string.js
@@ -206,7 +206,23 @@
 
     count: function(str, substr){
       if (str == null || substr == null) return 0;
-      return String(str).split(substr).length - 1;
+
+      str = String(str);
+      substr = String(substr);
+      var n = 0;
+      var pos = 0;
+      var l = substr.length;
+
+      while (true) {
+        pos = str.indexOf(substr, pos);
+        if (pos !== -1) {
+          n++;
+          pos += l;
+        } else {
+          break;
+        }
+      }
+      return n;
     },
 
     chars: function(str) {