Changeset 2160

Timestamp:

12/28/04 10:42:43 (4 years ago)

Author:

timothy

Message:

Added a new define "WebKitVersion146", so we can selectively compile with or without the new WebKit? stuff.

Files:

• trunk/JVChatTranscript.m (modified) (4 diffs)
• trunk/JVDirectChat.m (modified) (6 diffs)

trunk/JVChatTranscript.m

@@ -676 +676 @@
-
-// Allows some simple code to work when not built with WebKit/Safari 1.3
-_WEB_SCRIPT_OBJECT_H_
+WebKitVersion146
-#define WebMenuItemTagGoBack 9
-#define WebMenuItemTagGoForward 10
@@ -810 +810 @@
-- (void) webView:(WebView *) sender didFinishLoadForFrame:(WebFrame *) frame {
-// Test for WebKit/Safari 1.3
-_WEB_SCRIPT_OBJECT_H_
+WebKitVersion146
-        if( [display respondsToSelector:@selector( setDrawsBackground: )] ) {
-                DOMCSSStyleDeclaration *style = [sender computedStyleForElement:[(DOMHTMLDocument *)[[sender mainFrame] DOMDocument] body] pseudoElement:nil];
@@ -954 +954 @@
-
-- (void) _prependMessages:(NSString *) messages {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-#ifdef _WEB_SCRIPT_OBJECT_H_
-                NSMutableString *result = [messages mutableCopy];
-                [result replaceOccurrencesOfString:@"  " withString:@"  " options:NSLiteralSearch range:NSMakeRange( 0, [result length] )];
@@ -979 +979 @@
-                // scroll down if we need to
-                if( [scrollNeeded boolValue] ) [body setValue:[body valueForKey:@"offsetHeight"] forKey:@"scrollTop"];
+        } else
-#endif
-} else {
+{ // old JavaScript method
-                NSMutableString *result = [messages mutableCopy];
-                [result escapeCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\\\"'"]];

trunk/JVDirectChat.m

@@ -101 +101 @@
-- (void) addEventMessageToLogAndDisplay:(NSString *) message withName:(NSString *) name andAttributes:(NSDictionary *) attributes entityEncodeAttributes:(BOOL) encode;
-- (void) addMessageToLogAndDisplay:(NSData *) message fromUser:(NSString *) user asAction:(BOOL) action;
+- (int) visibleMessageCount;
-- (int) locationOfMessage:(unsigned int) identifier;
-- (int) locationOfElementByIndex:(unsigned int) index;
@@ -1548 +1549 @@
-
-- (int) locationOfMessage:(unsigned int) identifier {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-                DOMElement *element = [[[display mainFrame] DOMDocument] getElementById:[NSString stringWithFormat:@"%d", identifier]];
-                return [[element valueForKey:@"offsetTop"] intValue];
-
-
-
+
+
+
+
-}
-
-- (int) locationOfElementByIndex:(unsigned int) index {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-                DOMHTMLElement *body = [(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body];
-                if( index < [[body children] length] ) return [[[[body children] item:index] valueForKey:@"offsetTop"] intValue];
-                else return 0;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-- (void) scrollToBottom {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-                DOMHTMLElement *body = [(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body];
-                [body setValue:[body valueForKey:@"offsetHeight"] forKey:@"scrollTop"];
-
-
-
+
+
+
+
-}
-
-- (void) appendMessage:(NSString *) html subsequent:(BOOL) subsequent {
-0
+[self visibleMessageCount]
-        unsigned int scrollbackLimit = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatScrollbackLimit"];
-        NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
-
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-                messageCount = [[[(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body] children] length];
-        } else { // old JavaScript method
-                messageCount = [[display stringByEvaluatingJavaScriptFromString:@"scrollBackMessageCount();"] intValue];
-        }
-
-        if( ! subsequent && ( messageCount + 1 ) > scrollbackLimit ) {
@@ -1592 +1603 @@
-        }
-
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-                DOMHTMLElement *element = (DOMHTMLElement *)[[[display mainFrame] DOMDocument] createElement:@"span"];
@@ -1633 +1645 @@
-                // scroll down if we need to
-                if( [scrollNeeded boolValue] ) [self scrollToBottom];
-
+
+
+
-                NSMutableString *transformedMessage = [html mutableCopy];
-                [transformedMessage escapeCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\\\"'"]];
@@ -1879 +1893 @@
-                [self addEventMessageToDisplay:[NSString stringWithFormat:NSLocalizedString( @"You have set yourself away with \"%@\".", "self away status set message" ), msgString] withName:@"awaySet" andAttributes:[NSDictionary dictionaryWithObjectsAndKeys:messageString, @"away-message", nil]];
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
@@ -1895 +1901 @@
-                [self addEventMessageToDisplay:NSLocalizedString( @"You have returned from away.", "self away status removed message" ) withName:@"awayRemoved" andAttributes:nil];
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];