Changeset 3152

Timestamp:

03/11/06 22:32:26 (2 years ago)

Author:

timothy

Message:

Much better way to handle styles. We no longer use a overflow div and now use an iframe, this is a lot faster and avoides a few webkit bugs. This also adds prelimenary banner support, the only banner we have now is the topic banner. The topic banner still has the bug described in #500, i have an idea how to fix that though.

Files:

• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (7 diffs)
• trunk/Controllers/MVApplicationController.m (modified) (2 diffs)
• trunk/Panels/JVChatRoomPanel.m (modified) (1 diff)
• trunk/Resources/base.html (added)
• trunk/Resources/chatRoomTemplate.html (deleted)
• trunk/Resources/roomTopicBanner.html (added)
• trunk/Resources/roomTopicBanner.js (added)
• trunk/Settings/Common Settings.xcconfig (modified) (1 diff)
• trunk/Views/JVMarkedScroller.h (modified) (3 diffs)
• trunk/Views/JVMarkedScroller.m (modified) (32 diffs)
• trunk/Views/JVStyleView.h (modified) (2 diffs)
• trunk/Views/JVStyleView.m (modified) (24 diffs)

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -34 +34 @@
-                1C1ACFB805344FCC00F71D4E /* JVConnectionInspector.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1ACFB605344FCC00F71D4E /* JVConnectionInspector.m */; };
-                1C1AD00B053487ED00F71D4E /* JVConnectionInspector.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AD009053487ED00F71D4E /* JVConnectionInspector.nib */; };
+                1C1AFB3D09C295D900BF3E2A /* base.html in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AFB3C09C295D900BF3E2A /* base.html */; };
+                1C1AFDAB09C3BC5000BF3E2A /* roomTopicBanner.html in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AFDAA09C3BC4F00BF3E2A /* roomTopicBanner.html */; };
+                1C1AFE8E09C3D92E00BF3E2A /* roomTopicBanner.js in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AFE8109C3D8C900BF3E2A /* roomTopicBanner.js */; };
-                1C238F050677B5E5000E89A7 /* JVTabbedChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1C238F040677B5E5000E89A7 /* JVTabbedChatWindow.nib */; };
-                1C2391AA0677E6B7000E89A7 /* JVChatTabItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C2391A80677E6B7000E89A7 /* JVChatTabItem.m */; };
@@ -75 +78 @@
-                1C7780DE08FA1D82006AD8E5 /* JVSpeechController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C7780DC08FA1D81006AD8E5 /* JVSpeechController.m */; };
-                1C77822908FA4104006AD8E5 /* topicBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C77822808FA4101006AD8E5 /* topicBackground.png */; };
-                1C77822B08FA415B006AD8E5 /* chatRoomTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = 1C77822A08FA415B006AD8E5 /* chatRoomTemplate.html */; };
-                1C77830708FA4BD3006AD8E5 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F5394C070378E44D01A35792 /* Credits.rtf */; };
-                1C77831208FA4EA2006AD8E5 /* topicToggleDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C77831008FA4EA2006AD8E5 /* topicToggleDown.png */; };
@@ -480 +482 @@
-                1C1ACFB605344FCC00F71D4E /* JVConnectionInspector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JVConnectionInspector.m; path = Inspectors/JVConnectionInspector.m; sourceTree = "<group>"; };
-                1C1AD00A053487ED00F71D4E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Languages/English.lproj/JVConnectionInspector.nib; sourceTree = "<group>"; };
+                1C1AFB3C09C295D900BF3E2A /* base.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = base.html; path = Resources/base.html; sourceTree = "<group>"; };
+                1C1AFDAA09C3BC4F00BF3E2A /* roomTopicBanner.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = roomTopicBanner.html; path = Resources/roomTopicBanner.html; sourceTree = "<group>"; };
+                1C1AFE8109C3D8C900BF3E2A /* roomTopicBanner.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = roomTopicBanner.js; path = Resources/roomTopicBanner.js; sourceTree = "<group>"; };
-                1C1D19F105992D80000BB31A /* ChatCore.scriptSuite */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = ChatCore.scriptSuite; path = Resources/ChatCore.scriptSuite; sourceTree = "<group>"; };
-                1C1D19F205992D80000BB31A /* ChatCore.scriptTerminology */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = ChatCore.scriptTerminology; path = Resources/ChatCore.scriptTerminology; sourceTree = "<group>"; };
@@ -557 +562 @@
-                1C7780DC08FA1D81006AD8E5 /* JVSpeechController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JVSpeechController.m; path = Controllers/JVSpeechController.m; sourceTree = "<group>"; };
-                1C77822808FA4101006AD8E5 /* topicBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = topicBackground.png; path = Resources/topicBackground.png; sourceTree = "<group>"; };
-                1C77822A08FA415B006AD8E5 /* chatRoomTemplate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = chatRoomTemplate.html; path = Resources/chatRoomTemplate.html; sourceTree = "<group>"; };
-                1C77831008FA4EA2006AD8E5 /* topicToggleDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = topicToggleDown.png; path = Resources/topicToggleDown.png; sourceTree = "<group>"; };
-                1C77831108FA4EA2006AD8E5 /* topicToggleUp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = topicToggleUp.png; path = Resources/topicToggleUp.png; sourceTree = "<group>"; };
@@ -1523 +1527 @@
-                                0A5B683E0810EC9700398D5A /* default.css */,
-                                0AA811220826DB8800A3BF2D /* default.js */,
+                                1C1AFB3C09C295D900BF3E2A /* base.html */,
-                                1C3C116005029DE1000001C8 /* template.html */,
-
+
+
-                                1C746A95050CF86B000001C8 /* emoticons.plist */,
-                                F5675B8601DB767601EE70DE /* verbs.plist */,
@@ -2023 +2029 @@
-                        buildActionMask = 2147483647;
-                        files = (
+                                1C1AFE8E09C3D92E00BF3E2A /* roomTopicBanner.js in Resources */,
-                                1CB2CD11052DDC560094AAA4 /* op.tif in Resources */,
-                                1CB2CD12052DDC560094AAA4 /* person.tif in Resources */,
@@ -2188 +2195 @@
-                                1CE6917008B183C8006D9CA0 /* NSTextSuite.scriptSuite in Resources */,
-                                1C77822908FA4104006AD8E5 /* topicBackground.png in Resources */,
-                                1C77822B08FA415B006AD8E5 /* chatRoomTemplate.html in Resources */,
-                                1C77830708FA4BD3006AD8E5 /* Credits.rtf in Resources */,
-                                1C77831208FA4EA2006AD8E5 /* topicToggleDown.png in Resources */,
-                                1C77831308FA4EA2006AD8E5 /* topicToggleUp.png in Resources */,
-                                1C6E43C40955EFD7002D22E7 /* serverWindow.png in Resources */,
+                                1C1AFB3D09C295D900BF3E2A /* base.html in Resources */,
+                                1C1AFDAB09C3BC5000BF3E2A /* roomTopicBanner.html in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Controllers/MVApplicationController.m

@@ -23 +23 @@
-#import "JVDirectChatPanel.h"
-#import "JVChatTranscriptBrowserPanel.h"
-#import "JVMarkedScroller.h"
-
-#import <Foundation/NSDebug.h>
@@ -372 +371 @@
-
-- (void) applicationWillFinishLaunching:(NSNotification *) notification {
-        [JVMarkedScroller poseAsClass:[NSScroller class]];
-        [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:[[NSBundle mainBundle] bundleIdentifier] ofType:@"plist"]]];
-        [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self andSelector:@selector( handleURLEvent:withReplyEvent: ) forEventClass:kInternetEventClass andEventID:kAEGetURL];

trunk/Panels/JVChatRoomPanel.m

@@ -72 +72 @@
-
-        [display setBodyTemplate:@"chatRoom"];
+        [display addBanner:@"roomTopicBanner"];
-
-        NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"irc://%@/%@", [[self connection] server], _target]];

trunk/Settings/Common Settings.xcconfig

@@ -17 +17 @@
-GCC_OPTIMIZATION_LEVEL = s
-GCC_MODEL_TUNING = G5
-YES
+NO
-ZERO_LINK = NO
-DSTROOT = /

trunk/Views/JVMarkedScroller.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
-- (void) setLocationOfCurrentMark:(unsigned long long) location;
-- (unsigned long long) locationOfCurrentMark;
-
-unsigned long long) locationOfPreviousMark
-unsigned long long) locationOfNextMark
-unsigned long long) locationOf
+IBAction) jumpToPreviousMark:(id) sender
+IBAction) jumpToNextMark:(id) sender
+void) jumpTo
-
-- (void) shiftMarksAndShadedAreasBy:(long long) displacement;
@@ -13 +21 @@
-- (void) addMarkAt:(unsigned long long) location withColor:(NSColor *) color;
-- (void) addMarkAt:(unsigned long long) location withIdentifier:(NSString *) identifier withColor:(NSColor *) color;
+
-- (void) removeMarkAt:(unsigned long long) location;
-- (void) removeMarkAt:(unsigned long long) location withIdentifier:(NSString *) identifier;
@@ -33 +42 @@
-- (unsigned long long) contentViewLength;
-- (float) scaleToContentView;
-long
+float
-@end

trunk/Views/JVMarkedScroller.m

@@ -1 +1 @@
-#import "JVMarkedScroller.h"
-
-static NSMapTable *scrollers = NULL;
-
-struct _instanceVars {
-        NSMutableSet *marks;
-        NSMutableArray *shades;
-        unsigned long long nearestPreviousMark;
-        unsigned long long nearestNextMark;
-        unsigned long long currentMark;
-};
-
-struct _mark {
@@ -18 +8 @@
-
-@implementation JVMarkedScroller
-+ (void) initialize {
-        static BOOL tooLate = NO;
-        if( ! tooLate ) {
-                // setup our global NSMapTable to hold our instance variables. This is so we can poseAsClass:
-                // no need for the callbacks, we don't want to retain/release anything we add, etc
-                NSMapTableKeyCallBacks keyCallbacks = { NULL, NULL, NULL, NULL, NULL, NULL };
-                NSMapTableValueCallBacks valueCallbacks = { NULL, NULL, NULL };
-                scrollers = NSCreateMapTable( keyCallbacks, valueCallbacks, 100 );
-                tooLate = YES;
-        }
-}
-
-- (id) initWithFrame:(NSRect) frame {
-        if( ( self = [super initWithFrame:frame] ) ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        return self;
@@ -51 +20 @@
-
-- (void) dealloc {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        [super dealloc];
@@ -75 +34 @@
-        [super drawRect:rect];
-
-        struct _instanceVars *vars = NSMapGet( scrollers, self );
-        if( ! vars || ( ! [vars -> marks count] && ! [vars -> shades count] ) ) return;
-
-        NSAffineTransform *transform = [NSAffineTransform transform];
-        float width = [[self class] scrollerWidthForControlSize:[self controlSize]];
@@ -88 +44 @@
-
-        NSBezierPath *shades = [NSBezierPath bezierPath];
-vars -> 
+_
-        NSNumber *startNum = nil;
-        NSNumber *stopNum = nil;
@@ -106 +62 @@
-        }
-
-vars -> 
+_
-                NSRect rect = NSZeroRect;
-vars -> 
-( NSHeight( [self frame] ) / [self knobProportion] )
+_
+[self contentViewLength]
-
-                if( sFlags.isHoriz ) rect = NSMakeRect( start, 0., ( stop - start ), width );
@@ -129 +85 @@
-        NSBezierPath *lines = [NSBezierPath bezierPath];
-        NSMutableArray *lineArray = [NSMutableArray array];
+        enumerator = [_marks objectEnumerator];
-        NSValue *currentMark = nil;
-
-
-
+
+
-        BOOL foundNext = NO, foundPrevious = NO;
-        NSRect knobRect = [self rectForPart:NSScrollerKnob];
@@ -141 +97 @@
-                unsigned long long value = mark.location;
-
-vars -> 
-vars -> 
+_
+_
-                        foundPrevious = YES;
-                }
-
-vars -> 
-vars -> 
+_
+_
-                        foundNext = YES;
-                }
@@ -174 +130 @@
-        }
-
-vars -> 
-vars -> 
+_
+_
-
-        if( ! [lines isEmpty] ) {
@@ -195 +151 @@
-
-- (void) setFloatValue:(float) position knobProportion:(float) percent {
-
-
-
+
+
-                [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-        [super setFloatValue:position knobProportion:percent];
-}
-
-
-
-
-
+
-        NSMenu *menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
-        NSMenuItem *item = nil;
@@ -242 +194 @@
-
-        return menu;
- */
+
-
-#pragma mark -
-
-- (void) updateNextAndPreviousMarks {
-
-
-
-
+
-        NSValue *currentMark = nil;
-
-vars -> currentMark != NSNotFound ? vars -> 
+_currentMark != NSNotFound ? _
-        BOOL foundNext = NO, foundPrevious = NO;
-
@@ -261 +210 @@
-                unsigned long long value = mark.location;
-
-vars -> 
-vars -> 
+_
+_
-                        foundPrevious = YES;
-                }
-
-vars -> 
-vars -> 
+_
+_
-                        foundNext = YES;
-                }
-        }
-
-vars -> 
-vars -> 
+_
+_
-}
-
@@ -297 +246 @@
-
-- (void) setLocationOfCurrentMark:(unsigned long long) location {
-
-
-
-
+
+
-                [self updateNextAndPreviousMarks];
-        }
@@ -306 +253 @@
-
-- (unsigned long long) locationOfCurrentMark {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        NSValue *obj = nil;
-
-
+
+
+
-                struct _mark mark;
-                [obj getValue:&mark];
-                if( [mark.identifier isEqualToString:identifier] ) {
-
+
+
-                        break;
-                }
-        }
-
-
+
+
+
+
+
+
+
-}
-
@@ -352 +310 @@
-        NSValue *location = nil;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        while( ( location = [enumerator nextObject] ) ) {
-                struct _mark mark;
@@ -374 +329 @@
-        }
-
-vars -> 
+_
-
-        NSMutableArray *shiftedShades = [NSMutableArray array];
@@ -380 +335 @@
-        NSNumber *stop = nil;
-
-vars -> 
+_
-        while( ( start = [enumerator nextObject] ) && ( ( stop = [enumerator nextObject] ) || YES ) ) {
-                unsigned long long shiftedStart = [start unsignedLongLongValue];
@@ -395 +350 @@
-        }
-
-vars -> 
+_
-
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
@@ -415 +370 @@
-
-- (void) addMarkAt:(unsigned long long) location withIdentifier:(NSString *) identifier withColor:(NSColor *) color {
-
-
-
-
-
+
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}
@@ -436 +388 @@
-
-- (void) removeMarkAt:(unsigned long long) location withIdentifier:(NSString *) identifier withColor:(NSColor *) color {
-
-
-
-
-
+
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}
-
-- (void) removeMarkWithIdentifier:(NSString *) identifier {
-
-
-
-
+
-        NSValue *obj = nil;
-
-        while( obj = [e nextObject] ) {
-                struct _mark mark;
-                [obj getValue:&mark];
-                if( [mark.identifier isEqualToString:identifier] ) {
-vars -> 
+_
-                }
-        }
@@ -463 +408 @@
-
-- (void) removeMarksGreaterThan:(unsigned long long) location {
-
-
-
-
+
-        NSValue *obj = nil;
-
@@ -473 +415 @@
-                [obj getValue:&mark];
-                if( mark.location > location )
-vars -> 
+_
-        }
-
@@ -480 +422 @@
-
-- (void) removeMarksLessThan:(unsigned long long) location {
-
-
-
-
+
-        NSValue *obj = nil;
-
@@ -490 +429 @@
-                [obj getValue:&mark];
-                if( mark.location < location )
-vars -> 
+_
-        }
-
@@ -497 +436 @@
-
-- (void) removeMarksInRange:(NSRange) range {
-
-
-
-
+
-        NSValue *obj = nil;
-
@@ -507 +443 @@
-                [obj getValue:&mark];
-                if( NSLocationInRange( (unsigned int)mark.location, range ) )
-vars -> 
+_
-        }
-
@@ -514 +450 @@
-
-- (void) removeAllMarks {
-
-
-
-
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}
@@ -524 +457 @@
-
-- (void) setMarks:(NSSet *) marks {
-
-
-
-
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}
-
-- (NSSet *) marks {
-
-
-
+
-}
-
@@ -540 +468 @@
-
-- (void) startShadedAreaAt:(unsigned long long) location {
-
-
-
-
-
+
+
-                [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-        }
@@ -550 +475 @@
-
-- (void) stopShadedAreaAt:(unsigned long long) location {
-
-
-
-
-
+
+
-                [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-        }
@@ -562 +484 @@
-
-- (void) removeAllShadedAreas {
-
-
-
-
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}
@@ -577 +496 @@
-
-- (float) scaleToContentView {
-( NSWidth( [self frame] ) / [self knobProportion
-( NSHeight( [self frame] ) / [self knobProportion
-
-
-long
+NSWidth( [[(NSScrollView *)[self superview] contentView] documentRect
+NSHeight( [[(NSScrollView *)[self superview] contentView] documentRect
+
+
+float
-        float scale = [self scaleToContentView];
-        if( sFlags.isHoriz ) return ( ( NSWidth( [self rectForPart:NSScrollerKnobSlot] ) * [self knobProportion] ) / 2. ) / scale;

trunk/Views/JVStyleView.h

@@ -15 +15 @@
-        BOOL _switchingStyles;
-        BOOL _ready;
-
+
+
-        JVChatTranscript *_transcript;
-        JVStyle *_style;
@@ -21 +22 @@
-        NSMutableDictionary *_styleParameters;
-        JVEmoticonSet *_emoticons;
+        DOMHTMLDocument *_mainDocument;
-        DOMHTMLDocument *_domDocument;
-        DOMHTMLElement *_body;

trunk/Views/JVStyleView.m

@@ -35 +35 @@
-- (void) _prependMessages:(NSString *) messages;
-- (void) _styleError;
-
+
+
-- (unsigned long) _visibleMessageCount;
-- (long) _locationOfMessage:(JVChatMessage *) message;
-- (long) _locationOfElementAtIndex:(unsigned long) index;
-tickleForLayout
+setupMarkedScroller
-@end
-
@@ -50 +51 @@
-                _forwarding = NO;
-                _ready = NO;
-webView
+contentFrame
-                _requiresFullMessage = YES;
-                _scrollbackLimit = 600;
@@ -79 +80 @@
-        [_styleParameters release];
-        [_emoticons release];
+        [_mainDocument release];
-        [_domDocument release];
-        [_body release];
@@ -89 +91 @@
-        _styleParameters = nil;
-        _emoticons = nil;
+        _mainDocument = nil;
-        _domDocument = nil;
-        _body = nil;
@@ -103 +106 @@
-                [[self nextTextView] tryToPerform:selector with:object];
-        }
-}
-
-#pragma mark -
-
-- (void) setFrame:(NSRect) frame {
-        [super setFrame:frame];
-        [self _tickleForLayout];
-}
-
-- (void) setFrameSize:(NSSize) size {
-        [super setFrameSize:size];
-        [self _tickleForLayout];
-}
-
-- (void) setBounds:(NSRect) bounds {
-        [super setBounds:bounds];
-        [self _tickleForLayout];
-}
-
-- (void) setBoundsSize:(NSSize) size {
-        [super setBoundsSize:size];
-        [self _tickleForLayout];
-}
-
@@ -218 +199 @@
-        _styleVariant = [variant copyWithZone:[self zone]];
-
-webView
+contentFrame
-                [WebCoreCache empty];
-
@@ -264 +245 @@
-        _emoticons = [emoticons retain];
-
-webView
+contentFrame
-                [WebCoreCache empty];
-
@@ -309 +290 @@
-
-- (void) mark {
-webView
+contentFrame
-                unsigned int location = 0;
-
@@ -332 +313 @@
-#pragma mark -
-
+- (void) addBanner:(NSString *) name {
+        if( ! _mainFrameReady ) {
+                [self performSelector:_cmd withObject:name afterDelay:0.];
+                return;
+        }
+
+        NSString *shell = nil;
+        if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
+                shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:name ofType:@"html"]];
+        else shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:name ofType:@"html"] encoding:NSUTF8StringEncoding error:NULL];
+
+        DOMHTMLElement *element = (DOMHTMLElement *)[_mainDocument createElement:@"div"];
+        [element setClassName:@"banner"];
+        [element setInnerHTML:shell];
+
+        [[_mainDocument body] insertBefore:element :[[_mainDocument body] firstChild]];
+
+        NSLog(@"%@", [[_mainDocument documentElement] outerHTML] );
+}
+
+#pragma mark -
+
-- (BOOL) appendChatMessage:(JVChatMessage *) message {
-webView
+contentFrame
-
-        NSString *result = nil;
@@ -362 +365 @@
-
-- (BOOL) appendChatTranscriptElement:(id <JVChatTranscriptElement>) element {
-webView
+contentFrame
-
-        NSString *result = nil;
@@ -417 +420 @@
-
-- (void) markScrollbarForMessage:(JVChatMessage *) message {
-webView
+contentFrame
-                [self performSelector:_cmd withObject:message afterDelay:0.];
-                return;
@@ -427 +430 @@
-
-- (void) markScrollbarForMessage:(JVChatMessage *) message usingMarkIdentifier:(NSString *) identifier andColor:(NSColor *) color {
-webView
+contentFrame
-
-        long loc = [self _locationOfMessage:message];
@@ -434 +437 @@
-
-- (void) markScrollbarForMessages:(NSArray *) messages {
-webView
+contentFrame
-                [self performSelector:_cmd withObject:messages afterDelay:0.];
-                return;
@@ -464 +467 @@
-
-- (void) webView:(WebView *) sender didFinishLoadForFrame:(WebFrame *) frame {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -493 +505 @@
-#pragma mark Highlight/Message Jumping
-