Changeset 495 for trunk/ICeCoffEE


Ignore:
Timestamp:
02/24/09 19:00:40 (11 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ICeCoffEE/ICeCoffEE/English.lproj/Localizable.strings

    r470 r495  
    7474
    7575
    76 /**** Terminal/WebKit launching errors ****/
     76/**** Terminal launching errors ****/
    7777
    7878/* Word selection produced nothing */
  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

    r440 r495  
    219219        NSCAssert(range.location != NSNotFound, ICCF_LocalizedString(@"There is no insertion point or selection in the text field where you clicked"));
    220220        NSString *url = nil;
     221       
     222        if (range.location == length)
     223            range.location--; // Leopard text storage complains "out of range"
    221224   
    222225        if ([[self textStorage] attribute: NSLinkAttributeName atIndex: range.location
  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

    r467 r495  
    1616// Safari 3.1 and earlier (pre-r31014)
    1717// eliminated in http://bugs.webkit.org/show_bug.cgi?id=17640
     18// but convertNSRangeToDOMRange: (temporarily) restored in r39145
    1819@interface WebCoreFrameBridge : NSObject
    1920- (DOMRange *)convertNSRangeToDOMRange:(NSRange)range;
     
    3435
    3536- (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
    3738- (WebFrame *)_frame; // moved from WebNSViewExtras in r14032
    3839
     
    126127        ICLog(@"elementDict: %@", elementDict);
    127128
    128         NSAssert([elementDict count] != 0, ICCF_LocalizedString(@"Sorry, ICeCoffEE was unable to find anything to select"));
     129        if ([elementDict count] == 0)
     130            return;
    129131
    130132        elementIsEditable = [[elementDict objectForKey: @"WebElementIsContentEditableKey"] boolValue];
     
    180182           
    181183            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;
    183186
    184187            WebFrame *frame = [(WebHTMLView *)self _frame];
     
    196199                ICLog(@"Using stringForRange:");
    197200                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:)])
    199204                    s = [bridge stringForRange: domRange];
    200                 else if (![frame respondsToSelector: @selector(_stringForRange:)])
     205                else {
     206                    ICLog(@"WebKit has neither -[WebFrame _stringForRange:] nor -[WebCoreFrameBridge stringForRange:]");
    201207                    return; // WebKit too new?
    202                 else
    203                     s = [frame _stringForRange: domRange];
     208                }
    204209            }
    205210           
    206211            if (bridge == nil && ![frame respondsToSelector: @selector(_convertNSRangeToDOMRange:)]) {
     212                ICLog(@"WebKit has no bridge and no -[WebFrame _convertNSRangeToDOMRange:]");
    207213                return; // WebKit too new?
    208214            }
  • trunk/ICeCoffEE/ICeCoffEE/VERSION.xcconfig

    r485 r495  
    1 CURRENT_MARKETING_VERSION=1.5b4
     1CURRENT_MARKETING_VERSION=1.5b5
Note: See TracChangeset for help on using the changeset viewer.