Changeset 495 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m
- Timestamp:
- 02/24/09 19:00:40 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m
r467 r495 16 16 // Safari 3.1 and earlier (pre-r31014) 17 17 // eliminated in http://bugs.webkit.org/show_bug.cgi?id=17640 18 // but convertNSRangeToDOMRange: (temporarily) restored in r39145 18 19 @interface WebCoreFrameBridge : NSObject 19 20 - (DOMRange *)convertNSRangeToDOMRange:(NSRange)range; … … 34 35 35 36 - (WebView *)_webView; 36 - (WebCoreFrameBridge *)_bridge; // moved from WebNSViewExtras in r14032; removed in r31014 37 - (WebCoreFrameBridge *)_bridge; // moved from WebNSViewExtras in r14032; removed in r31014 then (temporarily) restored in r39145 37 38 - (WebFrame *)_frame; // moved from WebNSViewExtras in r14032 38 39 … … 126 127 ICLog(@"elementDict: %@", elementDict); 127 128 128 NSAssert([elementDict count] != 0, ICCF_LocalizedString(@"Sorry, ICeCoffEE was unable to find anything to select")); 129 if ([elementDict count] == 0) 130 return; 129 131 130 132 elementIsEditable = [[elementDict objectForKey: @"WebElementIsContentEditableKey"] boolValue]; … … 180 182 181 183 NSRange range = [ICeCoffEETrigger rangeForEvent: downEvent onTarget: (NSView<NSTextInput> *)self]; 182 NSAssert(range.location != NSNotFound, ICCF_LocalizedString(@"Sorry, ICeCoffEE was unable to find anything to select")); 184 if (range.location == NSNotFound) 185 return; 183 186 184 187 WebFrame *frame = [(WebHTMLView *)self _frame]; … … 196 199 ICLog(@"Using stringForRange:"); 197 200 domRange = [(WebHTMLView *)self _documentRange]; 198 if (bridge != nil) 201 if ([frame respondsToSelector: @selector(_stringForRange:)]) 202 s = [frame _stringForRange: domRange]; 203 else if (bridge != nil && [bridge respondsToSelector: @selector(stringForRange:)]) 199 204 s = [bridge stringForRange: domRange]; 200 else if (![frame respondsToSelector: @selector(_stringForRange:)]) 205 else { 206 ICLog(@"WebKit has neither -[WebFrame _stringForRange:] nor -[WebCoreFrameBridge stringForRange:]"); 201 207 return; // WebKit too new? 202 else 203 s = [frame _stringForRange: domRange]; 208 } 204 209 } 205 210 206 211 if (bridge == nil && ![frame respondsToSelector: @selector(_convertNSRangeToDOMRange:)]) { 212 ICLog(@"WebKit has no bridge and no -[WebFrame _convertNSRangeToDOMRange:]"); 207 213 return; // WebKit too new? 208 214 }
Note:
See TracChangeset
for help on using the changeset viewer.