Changeset 19761 in webkit


Ignore:
Timestamp:
Feb 20, 2007 7:58:51 PM (17 years ago)
Author:
justing
Message:

LayoutTests:

Reviewed by harrison


<rdar://problem/5006779>
REGRESSION: Paste and Match Style of quoted text onto empty line yields quoted text

  • editing/pasteboard/5006779-expected.checksum: Added.
  • editing/pasteboard/5006779-expected.png: Added.
  • editing/pasteboard/5006779-expected.txt: Added.
  • editing/pasteboard/5006779.html: Added.

WebCore:

Reviewed by harrison

<rdar://problem/5006779>
REGRESSION: Paste and Match Style of quoted text onto empty line yields quoted text


We decided to change the copy/paste behavior in both
the Paste and the Paste and Match Style cases.

  • editing/markup.cpp: (WebCore::createMarkup): Don't add mail blockquote wrappers unless the user selected one or more paragraphs.
Location:
trunk
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r19732 r19761  
     12007-02-20  Justin Garcia  <justin.garcia@apple.com>
     2
     3        Reviewed by harrison
     4       
     5        <rdar://problem/5006779>
     6        REGRESSION: Paste and Match Style of quoted text onto empty line yields quoted text
     7
     8        * editing/pasteboard/5006779-expected.checksum: Added.
     9        * editing/pasteboard/5006779-expected.png: Added.
     10        * editing/pasteboard/5006779-expected.txt: Added.
     11        * editing/pasteboard/5006779.html: Added.
     12
    1132007-02-20  Rob Buis  <buis@kde.org>
    214
  • trunk/WebCore/ChangeLog

    r19760 r19761  
     12007-02-20  Justin Garcia  <justin.garcia@apple.com>
     2
     3        Reviewed by harrison
     4
     5        <rdar://problem/5006779>
     6        REGRESSION: Paste and Match Style of quoted text onto empty line yields quoted text
     7       
     8        We decided to change the copy/paste behavior in both
     9        the Paste and the Paste and Match Style cases.
     10
     11        * editing/markup.cpp:
     12        (WebCore::createMarkup): Don't add mail blockquote wrappers
     13        unless the user selected one or more paragraphs.
     14
    1152007-02-20  Timothy Hatcher  <timothy@apple.com>
    216
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r19747 r19761  
    1118011180                        isa = PBXProject;
    1118111181                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
    11182                         compatibilityVersion = "Xcode 2.4";
    1118311182                        hasScannedForEncodings = 1;
    1118411183                        knownRegions = (
     
    1119511194                        projectDirPath = "";
    1119611195                        projectRoot = "";
    11197                         shouldCheckCompatibility = 1;
    1119811196                        targets = (
    1119911197                                93F198A508245E59001E9ABC /* WebCore */,
  • trunk/WebCore/editing/markup.cpp

    r19648 r19761  
    525525        markups.append(interchangeNewlineString);
    526526
     527    bool selectedOneOrMoreParagraphs = startOfParagraph(visibleStart) != startOfParagraph(visibleEnd) ||
     528                                       isStartOfParagraph(visibleStart) && isEndOfParagraph(visibleEnd);
     529                                     
    527530    // Retain the Mail quote level by including all ancestor mail block quotes.
    528     if (annotate) {
     531    if (annotate && selectedOneOrMoreParagraphs) {
    529532        for (Node *ancestor = commonAncestorBlock; ancestor; ancestor = ancestor->parentNode()) {
    530533            if (isMailBlockquote(ancestor)) {
Note: See TracChangeset for help on using the changeset viewer.