Changeset 3450

Timestamp:

12/10/06 13:26:55 (2 years ago)

Author:

timothy

Message:

Code clean up for JavaScript? exception reporting. Fixes a leak also.

Files:

• trunk/Models/JVChatEvent.m (modified) (1 diff)
• trunk/Models/JVChatMessage.m (modified) (1 diff)
• trunk/Plug-Ins/JavaScript Support/JVJavaScriptChatPlugin.h (modified) (3 diffs)
• trunk/Plug-Ins/JavaScript Support/JVJavaScriptChatPlugin.m (modified) (3 diffs)
• trunk/Plug-Ins/JavaScript Support/plugin.html (modified) (1 diff)

trunk/Models/JVChatEvent.m

@@ -246 +246 @@
-
-- (id) init {
-
-
-
-
-
-
+
-                _loadedMessage = YES;
-                _loadedAttributes = YES;
-                _loadedSmall = YES;
-                [self setDate:[NSDate date]];
+                [self setEventIdentifier:[NSString locallyUniqueString]];
+        }
+
+        return self;
+}
+
+- (id) initWithName:(NSString *) name andMessage:(id) message {
+        if( ( self = [self init] ) ) {
-                [self setName:name];
-                [self setMessage:message];
-                [self setEventIdentifier:[NSString locallyUniqueString]];
-        }
-

trunk/Models/JVChatMessage.m

@@ -382 +382 @@
-#pragma mark -
-
-WithText:(id) body sender:(id) sender
-elf
+
+uper
-                _loaded = YES;
-                _bodyLoaded = YES;
-                _senderLoaded = YES;
-                [self setDate:[NSDate date]];
+                [self setMessageIdentifier:[NSString locallyUniqueString]];
+        }
+
+        return self;
+}
+
+- (id) initWithText:(id) body sender:(id) sender {
+        if( ( self = [self init] ) ) {
-                [self setBody:body];
-                [self setSender:sender];
-                [self setMessageIdentifier:[NSString locallyUniqueString]];
-        }
-

trunk/Plug-Ins/JavaScript Support/JVJavaScriptChatPlugin.h

@@ -3 +3 @@
-extern NSString *JVJavaScriptErrorDomain;
-
+@class WebScriptCallFrame;
-@class WebView;
-
@@ -11 +12 @@
-        WebView *_webview;
-        NSString *_currentFunction;
+        id _currentException;
-        BOOL _loading;
-}
@@ -21 +23 @@
-- (void) setupScriptGlobalsForWebView:(WebView *) webView;
-
+- (void) reportErrorForCallFrame:(WebScriptCallFrame *) frame lineNumber:(unsigned int) line;
-- (void) reportError:(NSDictionary *) error inFunction:(NSString *) functionName whileLoading:(BOOL) whileLoading;
-- (id) callScriptFunctionNamed:(NSString *) functionName withArguments:(NSArray *) arguments forSelector:(SEL) selector;

trunk/Plug-Ins/JavaScript Support/JVJavaScriptChatPlugin.m

@@ -216 +216 @@
-}
-
+- (void) webView:(WebView *) sender didEnterCallFrame:(WebScriptCallFrame *) frame sourceId:(int) sid line:(int) line forWebFrame:(WebFrame *) webFrame {
+        [_currentException release];
+        _currentException = nil;
+}
+
-- (void) webView:(WebView *) sender willLeaveCallFrame:(WebScriptCallFrame *) frame sourceId:(int) sid line:(int) line forWebFrame:(WebFrame *) webFrame {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-- (void) webView:(WebView *) sender exceptionWasRaised:(WebScriptCallFrame *) frame sourceId:(int) sid line:(int) line forWebFrame:(WebFrame *) webFrame {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -264 +245 @@
-
-- (id) allocInstance:(NSString *) class {
-NSClassFromString(class) allocWithZone:nil
+[NSClassFromString(class) allocWithZone:nil] autorelease
-}
-
@@ -324 +305 @@
-#pragma mark -
-
+- (void) reportErrorForCallFrame:(WebScriptCallFrame *) frame lineNumber:(unsigned int) line {
+        id handled = nil;
+        id exception = [frame exception];
+        @try { handled = [exception valueForKey:@"handled"]; } @catch( NSException *e ) { handled = nil; }
+
+        if( exception && ! handled && ! [_currentException isEqual:exception] ) {
+                [_currentException release];
+                _currentException = [exception retain];
+
+                NSNumber *lineNumber = ( line ? [NSNumber numberWithUnsignedInt:line] : nil );
+                NSString *sourceURL = nil;
+                NSString *message = exception;
+
+                if( [exception isKindOfClass:[WebScriptObject class]] ) {
+                        [exception setValue:[NSNumber numberWithBool:YES] forKey:@"handled"];
+
+                        @try { lineNumber = [exception valueForKey:@"line"]; } @catch( NSException *e ) { lineNumber = nil; }
+                        @try { sourceURL = [exception valueForKey:@"sourceURL"]; } @catch( NSException *e ) { sourceURL = nil; }
+                        @try { message = [exception valueForKey:@"message"]; } @catch( NSException *e ) { message = exception; }
+                }
+
+                NSDictionary *error = [[NSDictionary allocWithZone:nil] initWithObjectsAndKeys:message, @"message", lineNumber, @"lineNumber", sourceURL, @"sourceURL", nil];
+                [self reportError:error inFunction:_currentFunction whileLoading:_loading];
+                [error release];
+        }
+}
+
-- (void) reportError:(NSDictionary *) error inFunction:(NSString *) functionName whileLoading:(BOOL) whileLoading {
-        NSMutableString *errorDesc = [[NSMutableString alloc] initWithCapacity:64];

trunk/Plug-Ins/JavaScript Support/plugin.html

@@ -5 +5 @@
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<script>
+String.prototype.fourCharCode = function() {
+        var result = 0;
+        var spaceCode = ' '.charCodeAt(0);
+
+        if( this.length >= 1 ) result |= ( this.charCodeAt(0) & 0x00ff ) << 24;
+        else result |= spaceCode << 24;
+
+        if( this.length >= 2 ) result |= ( this.charCodeAt(1) & 0x00ff ) << 16;
+        else result |= spaceCode << 16;
+
+        if( this.length >= 3 ) result |= ( this.charCodeAt(2) & 0x00ff ) << 8;
+        else result |= spaceCode << 8;
+
+        if( this.length >= 4 ) result |= ( this.charCodeAt(3) & 0x00ff );
+        else result |= spaceCode;
+
+        return result;
+}
+
+JVChatMessageNormalType = 'noMt'.fourCharCode();
+JVChatMessageNoticeType = 'nTMt'.fourCharCode();
+
+function JVChatMessage() {
+        throw "Can't create a JVChatMessage directly, use JVMutableChatMessage.";
+}
+
-function JVMutableChatMessage(text, sender) {
-        var obj = Plugin.allocInstance('JVMutableChatMessage');
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-</script>