Commit 1c4d466c authored by justing's avatar justing

LayoutTests:

        Reviewed by levi

        * editing/pasteboard/pasting-object-expected.checksum: Added.
        * editing/pasteboard/pasting-object-expected.png: Added.
        * editing/pasteboard/pasting-object-expected.txt: Added.
        * editing/pasteboard/pasting-object.html: Added.

WebCore:

        Reviewed by levi

        * editing/htmlediting.cpp:
        (WebCore::canHaveChildrenForEditing): Don't insert children into
        object tags while editing.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15113 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6b8bc83f
2006-06-30 Justin Garcia <justin.garcia@apple.com>
Reviewed by levi
* editing/pasteboard/pasting-object-expected.checksum: Added.
* editing/pasteboard/pasting-object-expected.png: Added.
* editing/pasteboard/pasting-object-expected.txt: Added.
* editing/pasteboard/pasting-object.html: Added.
2006-06-30 Justin Garcia <justin.garcia@apple.com>
Reviewed by harrison
ddb47168f0e155bd53c873769879386a
\ No newline at end of file
EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {#text} at (0,0) size 757x36
text run at (0,0) width 757: "This tests for a bug where attachments dragged into Mail documents blew all content after the position being pasted into."
text run at (0,18) width 319: "You should see \"Hello[black box] World!\" below."
RenderBlock {DIV} at (0,52) size 784x156
RenderText {#text} at (0,138) size 35x18
text run at (0,138) width 35: "Hello"
RenderPartObject {OBJECT} at (35,0) size 302x152 [border: (1px solid #AAAAAA)]
RenderText {#text} at (337,138) size 49x18
text run at (337,138) width 49: " World!"
caret: position 1 of child 1 {OBJECT} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
<body>
<p>This tests for a bug where attachments dragged into Mail documents blew all content after the position being pasted into. You should see "Hello[black box] World!" below.</p>
<div id="test" contenteditable="true">Hello World!</div>
</body>
<script>
var s = window.getSelection();
s.setPosition(document.getElementById("test"), 0);
s.modify("move", "forward", "word");
</script>
\ No newline at end of file
2006-06-30 Justin Garcia <justin.garcia@apple.com>
Reviewed by levi
* editing/htmlediting.cpp:
(WebCore::canHaveChildrenForEditing): Don't insert children into
object tags while editing.
2006-06-30 Justin Garcia <justin.garcia@apple.com>
Reviewed by harrison
......
......@@ -83,6 +83,7 @@ bool canHaveChildrenForEditing(const Node* node)
!node->hasTagName(brTag) &&
!node->hasTagName(imgTag) &&
!node->hasTagName(buttonTag) &&
!node->hasTagName(objectTag) &&
!node->isTextNode();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment