Changeset 495 for trunk

Timestamp:

02/24/09 19:00:40 (16 years ago)

Author:

Nicholas Riley

Message:

English.proj/APEInfo.rtfd: Updated for 1.5b5.

English.lproj/InfoPlist.strings: Updated copyright date.

English.lproj/Localizable.strings: Don't report an error in WebKit if
there's nothing to launch ("Sorry, ICeCoffEE was unable to find
anything to select").

ICeCoffEE/ICeCoffEE.m: Don't trigger exception with Command-click
outside text range (introduced in 10.5.x?).

ICeCoffEE/ICeCoffEEWebKit.m: Update for WebFrame changes (r39145).

VERSION.xcconfig: Updated for 1.5b5.

Location:

trunk/ICeCoffEE/ICeCoffEE

Files:

• English.lproj/APEInfo.rtfd/TXT.rtf (modified) ( previous)
• English.lproj/InfoPlist.strings (modified) ( previous)
• English.lproj/Localizable.strings (modified) (1 diff)
• ICeCoffEE.m (modified) (1 diff)
• ICeCoffEEWebKit.m (modified) (5 diffs)
• VERSION.xcconfig (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/English.lproj/Localizable.strings

@@ -74 +74 @@
 
 
-/**** Terminal/WebKit launching errors ****/
+/**** Terminal launching errors ****/
 
 /* Word selection produced nothing */

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -219 +219 @@
         NSCAssert(range.location != NSNotFound, ICCF_LocalizedString(@"There is no insertion point or selection in the text field where you clicked"));
         NSString *url = nil;
+        
+        if (range.location == length)
+            range.location--; // Leopard text storage complains "out of range"
     
         if ([[self textStorage] attribute: NSLinkAttributeName atIndex: range.location

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -16 +16 @@
 // Safari 3.1 and earlier (pre-r31014)
 // eliminated in http://bugs.webkit.org/show_bug.cgi?id=17640
+// but convertNSRangeToDOMRange: (temporarily) restored in r39145
 @interface WebCoreFrameBridge : NSObject
 - (DOMRange *)convertNSRangeToDOMRange:(NSRange)range;
@@ -34 +35 @@
 
 - (WebView *)_webView;
-- (WebCoreFrameBridge *)_bridge; // moved from WebNSViewExtras in r14032; removed in r31014
+- (WebCoreFrameBridge *)_bridge; // moved from WebNSViewExtras in r14032; removed in r31014 then (temporarily) restored in r39145
 - (WebFrame *)_frame; // moved from WebNSViewExtras in r14032
 
@@ -126 +127 @@
         ICLog(@"elementDict: %@", elementDict);
 
-        NSAssert([elementDict count] != 0, ICCF_LocalizedString(@"Sorry, ICeCoffEE was unable to find anything to select"));
+        if ([elementDict count] == 0)
+            return;
 
         elementIsEditable = [[elementDict objectForKey: @"WebElementIsContentEditableKey"] boolValue];
@@ -180 +182 @@
             
             NSRange range = [ICeCoffEETrigger rangeForEvent: downEvent onTarget: (NSView<NSTextInput> *)self];
-            NSAssert(range.location != NSNotFound, ICCF_LocalizedString(@"Sorry, ICeCoffEE was unable to find anything to select"));
+            if (range.location == NSNotFound)
+                return;
 
             WebFrame *frame = [(WebHTMLView *)self _frame];
@@ -196 +199 @@
                 ICLog(@"Using stringForRange:");
                 domRange = [(WebHTMLView *)self _documentRange];
-                if (bridge != nil)
+                if ([frame respondsToSelector: @selector(_stringForRange:)])
+                    s = [frame _stringForRange: domRange];
+                else if (bridge != nil && [bridge respondsToSelector: @selector(stringForRange:)])
                     s = [bridge stringForRange: domRange];
-                else if (![frame respondsToSelector: @selector(_stringForRange:)])
+                else {
+                    ICLog(@"WebKit has neither -[WebFrame _stringForRange:] nor -[WebCoreFrameBridge stringForRange:]");
                     return; // WebKit too new?
-                else
-                    s = [frame _stringForRange: domRange];
+                }
             }
             
             if (bridge == nil && ![frame respondsToSelector: @selector(_convertNSRangeToDOMRange:)]) {
+                ICLog(@"WebKit has no bridge and no -[WebFrame _convertNSRangeToDOMRange:]");
                 return; // WebKit too new?
             }

trunk/ICeCoffEE/ICeCoffEE/VERSION.xcconfig

@@ -1 @@
-CURRENT_MARKETING_VERSION=1.5b4
+CURRENT_MARKETING_VERSION=1.5b5