Changeset 2132

Timestamp:

11/21/04 10:50:28 (4 years ago)

Author:

timothy

Message:

Same as r2129 and r2130. Seems to prevent the need to do a reload style twice when first joining a room.

Files:

• branches/overhaul/JVChatTranscript.m (modified) (5 diffs)
• branches/overhaul/JVDirectChat.m (modified) (1 diff)

branches/overhaul/JVChatTranscript.m

@@ -152 +152 @@
-        [display setUIDelegate:self];
-        [display setPolicyDelegate:self];
+        [display setFrameLoadDelegate:self];
-
-        if( [self isMemberOfClass:[JVChatTranscript class]] ) {
+                if( ! _chatEmoticons && xmlHasProp( xmlDocGetRootElement( _xmlLog ), "emoticon" ) ) {
+                        xmlChar *emoticonProp = xmlGetProp( xmlDocGetRootElement( _xmlLog ), "emoticon" );
+                        [self setChatEmoticons:[NSBundle bundleWithIdentifier:[NSString stringWithUTF8String:emoticonProp]] performRefresh:NO];
+                        xmlFree( emoticonProp );
+                }
+
-                if( ! _chatStyle && xmlHasProp( xmlDocGetRootElement( _xmlLog ), "style" ) ) {
-                        xmlChar *styleProp = xmlGetProp( xmlDocGetRootElement( _xmlLog ), "style" );
@@ -160 +167 @@
-                        xmlFree( styleProp );
-                }
-
-                if( ! _chatEmoticons && xmlHasProp( xmlDocGetRootElement( _xmlLog ), "emoticon" ) ) {
-                        xmlChar *emoticonProp = xmlGetProp( xmlDocGetRootElement( _xmlLog ), "emoticon" );
-                        [self setChatEmoticons:[NSBundle bundleWithIdentifier:[NSString stringWithUTF8String:emoticonProp]]];
-                        xmlFree( emoticonProp );
-                }
-        }
-
@@ -185 +186 @@
-        [self _updateChatStylesMenu];
-        [self _updateChatEmoticonsMenu];
-
-        [self performSelector:@selector( _reloadCurrentStyle: ) withObject:nil afterDelay:0.];
-}
-
@@ -428 +427 @@
-        [[display window] disableFlushWindow];
-
-        [display setFrameLoadDelegate:self];
-        [[display mainFrame] loadHTMLString:[self _fullDisplayHTMLWithBody:@""] baseURL:nil];
-}
@@ -829 +827 @@
-                [[display window] enableFlushWindow];
-
-        [display setFrameLoadDelegate:nil];
-
-        NSScrollView *scrollView = [[[[display mainFrame] frameView] documentView] enclosingScrollView];
-        [scrollView setHasHorizontalScroller:NO];

branches/overhaul/JVDirectChat.m

@@ -259 +259 @@
-        NSString *variant = nil;
-        NSBundle *emoticon = nil;
-
+
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _refreshIcon: ) name:MVChatConnectionDidConnectNotification object:[self connection]];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _refreshIcon: ) name:MVChatConnectionDidDisconnectNotification object:[self connection]];
-
+
+
+
+
+
+
+
+
+
+
-        if( [self preferenceForKey:@"style"] ) {
-                style = [JVStyle styleWithIdentifier:[self preferenceForKey:@"style"]];
-                variant = [self preferenceForKey:@"style variant"];
-                if( style ) [self setChatStyle:style withVariant:variant];
-        }
-
-        if( [(NSString *)[self preferenceForKey:@"emoticon"] length] ) {
-                emoticon = [NSBundle bundleWithIdentifier:[self preferenceForKey:@"emoticon"]];
-                if( emoticon ) [self setChatEmoticons:emoticon];
-        }
-