Changeset 15830

Timestamp:

04/19/2006 06:20:24 AM (3 years ago)

Author:

evands

Message:

Fixed an edge case with smiley parsing: If a smiley is at the beginning or end of the line after trimming whitespace it should be displayed graphically. This check is done last because -[NSString stringByTrimmingCharactersInSet:] is more expensive than other things done for the emoticon.

Files:

• trunk/Source/AIEmoticonController.m (modified) (1 diff)

trunk/Source/AIEmoticonController.m

@@ -281 +281 @@
-                                         (nextCharacter == '\"') || (nextCharacter == '\''))) {
-                                        acceptable = YES;
+                                }
+                        }
+                        if (!acceptable) {
+                                /* If the emoticon would end the string except for whitespace or newlines at the end, or it begins the string after removing
+                                 * whitespace or newlines at the beginning, it is acceptable even if the previous conditions weren't met.
+                                 */
+                                NSString        *trimmedString = [messageString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+                                unsigned int trimmedLength = [trimmedString length];
+                                if ([trimmedString length] == (originalEmoticonLocation + textLength)) {
+                                        acceptable = YES;
+                                } else if ((originalEmoticonLocation - (messageStringLength - trimmedLength)) == 0) {
+                                        acceptable = YES;                                       
-                                }
-                        }