Changeset 3614
- Timestamp:
- 03/11/07 01:34:41 (2 years ago)
- Files:
-
- trunk/Panels/JVDirectChatPanel.m (modified) (1 diff)
- trunk/Preferences/JVNotificationPreferences.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Panels/JVDirectChatPanel.m
r3597 r3614 812 812 regex = [AGRegex regexWithPattern:[name substringWithRange:NSMakeRange( 1, [name length] - 2 )] options:AGRegexCaseInsensitive]; 813 813 } else { 814 name = [name stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\"'"]]; 814 815 NSString *pattern = [NSString stringWithFormat:@"\\b%@\\b", [name stringByEscapingCharactersInSet:escapeSet]]; 815 816 regex = [AGRegex regexWithPattern:pattern options:AGRegexCaseInsensitive]; trunk/Preferences/JVNotificationPreferences.m
r3418 r3614 62 62 63 63 - (void) saveHighlightWords:(id) sender { 64 // We want to be able to let Regex's contain spaces, so lets split intelligently64 // We want to be able to let highlights contain spaces, so lets split intelligently 65 65 NSMutableArray *components = [NSMutableArray array]; 66 66 NSString *words = [highlightWords stringValue]; 67 AGRegex *regex = [AGRegex regexWithPattern:@"(?:\\s|^)(/.*?/)(?:\\s|$)"]; 67 68 AGRegex *regex = [AGRegex regexWithPattern:@"(?<=\\s|^)([/\"'].*?[/\"'])(?=\\s|$)"]; 68 69 NSArray *matches = [regex findAllInString:words]; 69 70 NSEnumerator *e = [matches objectEnumerator]; 71 70 72 AGRegexMatch *match = nil; 71 73 while( ( match = [e nextObject] ) ) 72 74 [components addObject:[match groupAtIndex:1]]; 75 73 76 words = [regex replaceWithString:@"" inString:words]; 77 74 78 [components addObjectsFromArray:[words componentsSeparatedByString:@" "]]; 75 79 [components removeObject:@""]; 80 76 81 [[NSUserDefaults standardUserDefaults] setObject:components forKey:@"MVChatHighlightNames"]; 77 82 }
