OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 14 matching lines...) Expand all Loading... |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "HTMLNames.h" | 27 #include "HTMLNames.h" |
28 #include "bindings/v8/ExceptionStatePlaceholder.h" | 28 #include "bindings/v8/ExceptionStatePlaceholder.h" |
29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
30 #include "core/dom/Element.h" | 30 #include "core/dom/Element.h" |
31 #include "core/dom/Range.h" | 31 #include "core/dom/Range.h" |
32 #include "core/editing/FormatBlockCommand.h" | 32 #include "core/editing/FormatBlockCommand.h" |
33 #include "core/editing/VisibleUnits.h" | 33 #include "core/editing/VisibleUnits.h" |
34 #include "core/editing/htmlediting.h" | 34 #include "core/editing/htmlediting.h" |
| 35 #include "core/html/HTMLElement.h" |
35 | 36 |
36 namespace WebCore { | 37 namespace WebCore { |
37 | 38 |
38 using namespace HTMLNames; | 39 using namespace HTMLNames; |
39 | 40 |
40 static Node* enclosingBlockToSplitTreeTo(Node* startNode); | 41 static Node* enclosingBlockToSplitTreeTo(Node* startNode); |
41 static bool isElementForFormatBlock(const QualifiedName& tagName); | 42 static bool isElementForFormatBlock(const QualifiedName& tagName); |
42 static inline bool isElementForFormatBlock(Node* node) | 43 static inline bool isElementForFormatBlock(Node* node) |
43 { | 44 { |
44 return node->isElementNode() && isElementForFormatBlock(toElement(node)->tag
QName()); | 45 return node->isElementNode() && isElementForFormatBlock(toElement(node)->tag
QName()); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 // this by splitting all parents of the current paragraph up to that poi
nt. | 86 // this by splitting all parents of the current paragraph up to that poi
nt. |
86 blockNode = createBlockElement(); | 87 blockNode = createBlockElement(); |
87 insertNodeBefore(blockNode, nodeAfterInsertionPosition); | 88 insertNodeBefore(blockNode, nodeAfterInsertionPosition); |
88 } | 89 } |
89 | 90 |
90 Position lastParagraphInBlockNode = blockNode->lastChild() ? positionAfterNo
de(blockNode->lastChild()) : Position(); | 91 Position lastParagraphInBlockNode = blockNode->lastChild() ? positionAfterNo
de(blockNode->lastChild()) : Position(); |
91 bool wasEndOfParagraph = isEndOfParagraph(lastParagraphInBlockNode); | 92 bool wasEndOfParagraph = isEndOfParagraph(lastParagraphInBlockNode); |
92 | 93 |
93 moveParagraphWithClones(start, end, blockNode.get(), outerBlock.get()); | 94 moveParagraphWithClones(start, end, blockNode.get(), outerBlock.get()); |
94 | 95 |
| 96 // Copy the inline style of the original block element to the newly created
block-style element. |
| 97 if (outerBlock.get() != nodeAfterInsertionPosition.get() && toHTMLElement(no
deAfterInsertionPosition.get())->hasAttribute(styleAttr)) |
| 98 blockNode->setAttribute(styleAttr, toHTMLElement(nodeAfterInsertionPosit
ion.get())->getAttribute(styleAttr)); |
| 99 |
95 if (wasEndOfParagraph && !isEndOfParagraph(lastParagraphInBlockNode) && !isS
tartOfParagraph(lastParagraphInBlockNode)) | 100 if (wasEndOfParagraph && !isEndOfParagraph(lastParagraphInBlockNode) && !isS
tartOfParagraph(lastParagraphInBlockNode)) |
96 insertBlockPlaceholder(lastParagraphInBlockNode); | 101 insertBlockPlaceholder(lastParagraphInBlockNode); |
97 } | 102 } |
98 | 103 |
99 Element* FormatBlockCommand::elementForFormatBlockCommand(Range* range) | 104 Element* FormatBlockCommand::elementForFormatBlockCommand(Range* range) |
100 { | 105 { |
101 if (!range) | 106 if (!range) |
102 return 0; | 107 return 0; |
103 | 108 |
104 Node* commonAncestor = range->commonAncestorContainer(IGNORE_EXCEPTION); | 109 Node* commonAncestor = range->commonAncestorContainer(IGNORE_EXCEPTION); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 return n; | 160 return n; |
156 if (isBlock(n)) | 161 if (isBlock(n)) |
157 lastBlock = n; | 162 lastBlock = n; |
158 if (isListElement(n)) | 163 if (isListElement(n)) |
159 return n->parentNode()->rendererIsEditable() ? n->parentNode() : n; | 164 return n->parentNode()->rendererIsEditable() ? n->parentNode() : n; |
160 } | 165 } |
161 return lastBlock; | 166 return lastBlock; |
162 } | 167 } |
163 | 168 |
164 } | 169 } |
OLD | NEW |