[webkit-changes] cvs commit: WebKit/WebView.subproj WebHTMLView.m
Adele
adele at opensource.apple.com
Tue Jul 26 13:32:24 PDT 2005
adele 05/07/26 13:32:24
Modified: . Tag: Safari-2-0-branch ChangeLog
WebView.subproj Tag: Safari-2-0-branch WebHTMLView.m
Log:
Merged fix from TOT to Safari-2-0-branch
2005-05-10 John Sullivan <sullivan at apple.com>
Reviewed by Chris.
- fixed <rdar://problem/4067981> Mail places RTF flavor before RTFD flavor when dragging
mixed image/text content.
* WebView.subproj/WebHTMLView.m:
(+[WebHTMLView _selectionPasteboardTypes]):
put RTFD type before RTF type in array of types to declare
Revision Changes Path
No revision
No revision
1.3118.4.27 +15 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3118.4.26
retrieving revision 1.3118.4.27
diff -u -r1.3118.4.26 -r1.3118.4.27
--- ChangeLog 26 Jul 2005 00:48:45 -0000 1.3118.4.26
+++ ChangeLog 26 Jul 2005 20:32:20 -0000 1.3118.4.27
@@ -1,3 +1,18 @@
+2005-07-26 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ 2005-05-10 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Chris.
+
+ - fixed <rdar://problem/4067981> Mail places RTF flavor before RTFD flavor when dragging
+ mixed image/text content.
+
+ * WebView.subproj/WebHTMLView.m:
+ (+[WebHTMLView _selectionPasteboardTypes]):
+ put RTFD type before RTF type in array of types to declare
+
=== WebKit-412.8 ===
2005-07-25 Adele Peterson <adele at apple.com>
No revision
No revision
1.437.8.2 +1 -1 WebKit/WebView.subproj/WebHTMLView.m
Index: WebHTMLView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
retrieving revision 1.437.8.1
retrieving revision 1.437.8.2
diff -u -r1.437.8.1 -r1.437.8.2
--- WebHTMLView.m 22 Jul 2005 01:18:49 -0000 1.437.8.1
+++ WebHTMLView.m 26 Jul 2005 20:32:24 -0000 1.437.8.2
@@ -1050,7 +1050,7 @@
+ (NSArray *)_selectionPasteboardTypes
{
// FIXME: We should put data for NSHTMLPboardType on the pasteboard but Microsoft Excel doesn't like our format of HTML (3640423).
- return [NSArray arrayWithObjects:WebArchivePboardType, NSRTFPboardType, NSRTFDPboardType, NSStringPboardType, nil];
+ return [NSArray arrayWithObjects:WebArchivePboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, nil];
}
- (WebArchive *)_selectedArchive
More information about the webkit-changes
mailing list