Changeset 457 for trunk/ICeCoffEE

Timestamp:

03/28/08 21:52:35 (16 years ago)

Author:

Nicholas Riley

Message:

Better workarounds for WebKit range bugs.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m (modified) (3 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -79 +79 @@
 }
 
+
+static BOOL ICCF_DOMParentOfClass(DOMNode *node, Class cls) {
+    do {
+        if ([node isKindOfClass: cls])
+            return YES;
+    } while ( (node = [node parentNode]) != nil);
+    
+    return NO;
+}
+#define ICCF_NodeIs(elt) [clickedNode isKindOfClass: NSClassFromString(@"DOMHTML"elt"Element")]
+#define ICCF_DOMParentIs(elt) ICCF_DOMParentOfClass(clickedNode, NSClassFromString(@"DOMHTML"elt"Element"))
+
 - (void)mouseUp:(NSEvent *)e;
 {
@@ -132 +144 @@
 
         DOMNode *clickedNode = [elementDict objectForKey: @"WebElementDOMNode"];
-        
-        if (!elementIsEditable && ([clickedNode isKindOfClass: NSClassFromString(@"DOMHTMLInputElement")] ||
-            [clickedNode isKindOfClass: NSClassFromString(@"DOMHTMLFieldSetElement")])) {
+        BOOL elementIsHTMLInput = ICCF_NodeIs("Input");
+        
+        if (!elementIsEditable && (elementIsHTMLInput || ICCF_DOMParentIs("Button") || ICCF_NodeIs("FieldSet"))) {
             ICLog(@"got an uneditable form field (e.g., button)");
             return;
@@ -169 +181 @@
             // XXX limit to a reasonable size
             NSString *s;
-            if (elementIsEditable) // for form fields, range will be field-relative rather than document-relative
+            if (elementIsHTMLInput || ICCF_NodeIs("TextArea") || (elementIsEditable && !webViewIsEditable)) {
+                // for form fields, range will be field-relative rather than document-relative
+                ICLog(@"Using attributedSubstringFromRange:");
                 s = [[(NSView<NSTextInput> *)self attributedSubstringFromRange: NSMakeRange(0, UINT_MAX)] string];
-            else { // sometimes attributedSubstringFromRange: returns nil
+            } else { // sometimes attributedSubstringFromRange: returns nil
+                ICLog(@"Using stringForRange:");
                 domRange = [(WebHTMLView *)self _documentRange];
                 if (bridge != nil)