The following commit has been merged in the debian/unstable branch:
commit be9f90b2b590ea82c56a8c5a82988cd130a79781
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 21 16:41:49 2004 +0000
Reviewed by Ken and Chris.
* WebView.subproj/WebHTMLView.m: (-[WebHTMLView _pasteFromPasteboard:]): Call replaceSelectionWithText:
instead of replaceSelectionWithMarkupString: when pasting plain text.
* WebView.subproj/WebDataSource.m: (-[WebDataSource _replaceSelectionWithMarkupString:baseURL:]):
Remove bogus check for empty markup. There's nothing wrong with an empty string, and no reason
that replacing with empty string should be a no-op instead of a delete.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6658 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e468efc..b86443c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-21 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken and Chris.
+
+ * WebView.subproj/WebHTMLView.m: (-[WebHTMLView _pasteFromPasteboard:]): Call replaceSelectionWithText:
+ instead of replaceSelectionWithMarkupString: when pasting plain text.
+
+ * WebView.subproj/WebDataSource.m: (-[WebDataSource _replaceSelectionWithMarkupString:baseURL:]):
+ Remove bogus check for empty markup. There's nothing wrong with an empty string, and no reason
+ that replacing with empty string should be a no-op instead of a delete.
+
2004-05-20 Darin Adler <darin at apple.com>
Reviewed by Chris.
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 07f1c19..65ca609 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -202,9 +202,7 @@
- (void)_replaceSelectionWithMarkupString:(NSString *)markupString baseURL:(NSURL *)baseURL
{
- if ([markupString length] > 0) {
- [[self _bridge] replaceSelectionWithMarkupString:markupString baseURLString:[baseURL _web_originalDataAsString]];
- }
+ [[self _bridge] replaceSelectionWithMarkupString:markupString baseURLString:[baseURL _web_originalDataAsString]];
}
- (void)_replaceSelectionWithImageResource:(WebResource *)resource
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index a82d8d2..b5adfc0 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -599,7 +599,7 @@ static WebHTMLView *lastHitView = nil;
ERROR("RTF to HTML conversion not yet supported.");
[self _replaceSelectionWithMarkupString:[pasteboard stringForType:NSStringPboardType]];
} else if ([types containsObject:NSStringPboardType]) {
- [self _replaceSelectionWithMarkupString:[pasteboard stringForType:NSStringPboardType]];
+ [[self _bridge] replaceSelectionWithText:[pasteboard stringForType:NSStringPboardType]];
}
}
--
WebKit Debian packaging