Merge pull request #103 from bAmpT/patch-2

Remove the 3 glyphs limit for the Custom Type
optonaut · Aug 25, 2016 · a353f91 · a353f91
2 parents 162f8f8 + c590f41
commit a353f91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ActiveLabel.podspec b/ActiveLabel.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name    = 'ActiveLabel'
-	s.version = '0.6.0'
+	s.version = '0.6.1'
 
 	s.author      = { 'Optonaut' => '[email protected]' }
 	s.homepage    = 'https://github.com/optonaut/ActiveLabel.swift'

diff --git a/ActiveLabel/ActiveType.swift b/ActiveLabel/ActiveType.swift
@@ -69,20 +69,23 @@ struct ActiveBuilder {
         switch type {
         case .Mention, .Hashtag:
             return createElementsIgnoringFirstCharacter(from: text, for: type, range: range, filterPredicate: filterPredicate)
-        case .URL, .Custom:
+        case .URL:
             return createElements(from: text, for: type, range: range, filterPredicate: filterPredicate)
+        case .Custom:
+            return createElements(from: text, for: type, range: range, minLength: 1, filterPredicate: filterPredicate)
         }
     }
 
     private static func createElements(from text: String,
                                     for type: ActiveType,
                                           range: NSRange,
+                                          minLength: Int = 2,
                                           filterPredicate: ActiveFilterPredicate?) -> [ElementTuple] {
         let matches = RegexParser.getElements(from: text, with: type.pattern, range: range)
         let nsstring = text as NSString
         var elements: [ElementTuple] = []
 
-        for match in matches where match.range.length > 2 {
+        for match in matches where match.range.length > minLength {
             let word = nsstring.substringWithRange(match.range)
                 .stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
             if filterPredicate?(word) ?? true {