Reviewed by John

        Terminology change in execCommand command identifiers. Specifically, the name of
        "InsertNewline" command has been changed to "InsertLineBreak". This matches the
        terminology used by AppKit. It is also more accurate, since the insertion of a
        "br" element is what the command does. The inspiration for this change is so the
        -insertNewline AppKit method can be mapped to insert a new "div" element in
        a document and avoid ambiguity with what the javascript editing command does.

        * khtml/editing/jsediting.cpp
        * layout-tests/editing/deleting/delete-tab-004.html
        * layout-tests/editing/editing.js
        * layout-tests/editing/inserting/insert-3654864-fix.html
        * layout-tests/editing/inserting/insert-3659587-fix.html
        * layout-tests/editing/inserting/insert-3775316-fix.html
        * layout-tests/editing/inserting/insert-3800346-fix.html
        * layout-tests/editing/inserting/insert-br-001.html
        * layout-tests/editing/inserting/insert-br-002.html
        * layout-tests/editing/inserting/insert-br-003.html
        * layout-tests/editing/inserting/insert-br-004.html
        * layout-tests/editing/inserting/insert-br-005.html
        * layout-tests/editing/inserting/insert-br-006.html
        * layout-tests/editing/inserting/insert-br-007.html
        * layout-tests/editing/inserting/insert-br-008.html
        * layout-tests/editing/inserting/insert-tab-004.html
        * layout-tests/editing/inserting/insert-text-with-newlines.html
        * layout-tests/editing/pasteboard/paste-text-010.html

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/editing/deleting/delete-tab-004.html b/LayoutTests/editing/deleting/delete-tab-004.html
index 916de4d9f93a3013c137f6a2e348853345fdc655..3e953241694eb01d977632435c240b83747073fd 100644 (file)
--- a/LayoutTests/editing/deleting/delete-tab-004.html
+++ b/LayoutTests/editing/deleting/delete-tab-004.html
@@ -13,7 +13,7 @@
 <script>
 
 function editingTest() {
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand('\t');
     typeCharacterCommand('\t');
     for (i = 0; i < 4; i++)

diff --git a/LayoutTests/editing/editing.js b/LayoutTests/editing/editing.js
index ee5c08e0ed759338a2f40645ecef59961124825d..468e8c62c957ee252801f908b328b6d57a8bc7aa 100644 (file)
--- a/LayoutTests/editing/editing.js
+++ b/LayoutTests/editing/editing.js
@@ -269,16 +269,16 @@ function justifyRightCommand() {
 
 //-------------------------------------------------------------------------------------------------------
 
-function execInsertNewlineCommand() {
-    document.execCommand("InsertNewline");
+function execInsertLineBreakCommand() {
+    document.execCommand("InsertLineBreak");
 }
-function insertNewlineCommand() {
+function insertLineBreakCommand() {
     if (commandDelay > 0) {
-        window.setTimeout(execInsertNewlineCommand, commandCount * commandDelay);
+        window.setTimeout(execInsertLineBreakCommand, commandCount * commandDelay);
         commandCount++;
     }
     else {
-        execInsertNewlineCommand();
+        execInsertLineBreakCommand();
     }
 }
 

diff --git a/LayoutTests/editing/inserting/insert-3654864-fix.html b/LayoutTests/editing/inserting/insert-3654864-fix.html
index 6431ca49c17d103145fba6f67824f8fda24acd52..a6841b046a55e11462d10274059ded289676850c 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3654864-fix.html
+++ b/LayoutTests/editing/inserting/insert-3654864-fix.html
@@ -14,7 +14,7 @@
 
 function editingTest() {
     selectAllCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
     for (i = 0; i < 3; i++) {
         typeCharacterCommand();
     }

diff --git a/LayoutTests/editing/inserting/insert-3659587-fix.html b/LayoutTests/editing/inserting/insert-3659587-fix.html
index 21f4844a6e3f0977d7dafd6472417aa5357df67f..b4084e6d4010e13288ecff5220755d732bd42636 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3659587-fix.html
+++ b/LayoutTests/editing/inserting/insert-3659587-fix.html
@@ -22,7 +22,7 @@ function editingTest() {
     for (i = 0; i < 3; i++) {
         typeCharacterCommand();
     }
-    insertNewlineCommand();
+    insertLineBreakCommand();
     for (i = 0; i < 3; i++) {
         typeCharacterCommand();
     }

diff --git a/LayoutTests/editing/inserting/insert-3775316-fix.html b/LayoutTests/editing/inserting/insert-3775316-fix.html
index 91135f8ff63171ac67c75735dbcf9e92cd76dcfc..b6345d31201f178cc02bce1fca5d37cc7002223a 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3775316-fix.html
+++ b/LayoutTests/editing/inserting/insert-3775316-fix.html
@@ -14,12 +14,12 @@
 
 function editingTest() {
     moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
     selectAllCommand();
     deleteCommand();
     typeCharacterCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
 }
 

diff --git a/LayoutTests/editing/inserting/insert-3800346-fix.html b/LayoutTests/editing/inserting/insert-3800346-fix.html
index 782e8ca277b9c88652d7227e32be138c675aa0db..2c562aea84a1b367d6fafa5e19e6b35806fd27b3 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3800346-fix.html
+++ b/LayoutTests/editing/inserting/insert-3800346-fix.html
@@ -16,7 +16,7 @@ function editingTest() {
     for (i = 0; i < 15; i++)
         moveSelectionForwardByCharacterCommand();
     for (i = 0; i < 3; i++)
-        insertNewlineCommand();
+        insertLineBreakCommand();
 }
 
 </script>

diff --git a/LayoutTests/editing/inserting/insert-br-001.html b/LayoutTests/editing/inserting/insert-br-001.html
index ba53c2cc32b767d3d1b4626e8f004a0408864313..bc6f8a11449c4f9f14b9638d335bee0f587707f5 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-001.html
+++ b/LayoutTests/editing/inserting/insert-br-001.html
@@ -15,7 +15,7 @@
 function editingTest() {
     selectAllCommand();
     moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
 }
 

diff --git a/LayoutTests/editing/inserting/insert-br-002.html b/LayoutTests/editing/inserting/insert-br-002.html
index f5d28058e1ecd56bb4567781f26a69bb6a9f87e3..7d16c308940f7d976dfe615b377b985816ba3a05 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-002.html
+++ b/LayoutTests/editing/inserting/insert-br-002.html
@@ -15,7 +15,7 @@
 function editingTest() {
     for (i = 0; i < 4; i++)
         moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
 }
 

diff --git a/LayoutTests/editing/inserting/insert-br-003.html b/LayoutTests/editing/inserting/insert-br-003.html
index 3ea23584c7a21821f0784e9ae5c345a17c1469de..1fed4ab884d85bd3038b282fa0d1e48e89f3b2f6 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-003.html
+++ b/LayoutTests/editing/inserting/insert-br-003.html
@@ -15,7 +15,7 @@
 function editingTest() {
     for (i = 0; i < 4; i++)
         moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
 }
 

diff --git a/LayoutTests/editing/inserting/insert-br-004.html b/LayoutTests/editing/inserting/insert-br-004.html
index 951f5456d3c196fd64ab15aac8be0edf20097ee8..de2fd3292f0d0a220c4b86e2ec96947567736d6a 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-004.html
+++ b/LayoutTests/editing/inserting/insert-br-004.html
@@ -15,8 +15,8 @@
 function editingTest() {
     for (i = 0; i < 3; i++)
         moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
+    insertLineBreakCommand();
 }
 
 </script>

diff --git a/LayoutTests/editing/inserting/insert-br-005.html b/LayoutTests/editing/inserting/insert-br-005.html
index 56d784f7c26291abc418f8ccbfdccea01113cb72..b4ba3cd5236a2a0c186910548086142aba95cfdc 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-005.html
+++ b/LayoutTests/editing/inserting/insert-br-005.html
@@ -15,8 +15,8 @@
 function editingTest() {
     for (i = 0; i < 3; i++)
         moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
 }
 

diff --git a/LayoutTests/editing/inserting/insert-br-006.html b/LayoutTests/editing/inserting/insert-br-006.html
index 9d6577ec71e69b97ebcda423e987c2463f112451..d3d58c5ab029444fdddb2e62d7015216d41747c1 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-006.html
+++ b/LayoutTests/editing/inserting/insert-br-006.html
@@ -13,7 +13,7 @@
 <script>
 
 function editingTest() {
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand();
 }
 

diff --git a/LayoutTests/editing/inserting/insert-br-007.html b/LayoutTests/editing/inserting/insert-br-007.html
index c61f451e7bf9e3052f9f5e1fd1fe094f72e6a89d..b46779955dfb9640c397050011d56cf07b6d7d56 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-007.html
+++ b/LayoutTests/editing/inserting/insert-br-007.html
@@ -15,7 +15,7 @@
 function editingTest() {
     for (i = 0; i < 3; i++)
         moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
 }
 
 </script>

diff --git a/LayoutTests/editing/inserting/insert-br-008.html b/LayoutTests/editing/inserting/insert-br-008.html
index d47ecbdb22c9d545acf197ae74bd27f78f2e2b72..061615131b4f95ae72123555adcd2fbc0000f9f0 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-008.html
+++ b/LayoutTests/editing/inserting/insert-br-008.html
@@ -13,7 +13,7 @@
 <script>
 
 function editingTest() {
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand(" ");
 }
 

diff --git a/LayoutTests/editing/inserting/insert-tab-004.html b/LayoutTests/editing/inserting/insert-tab-004.html
index 53eff5b040ccbf42f482ac6698f604f9a0499e0b..9f670558d04515f7c072bb58ba214717ce1baedd 100644 (file)
--- a/LayoutTests/editing/inserting/insert-tab-004.html
+++ b/LayoutTests/editing/inserting/insert-tab-004.html
@@ -13,7 +13,7 @@
 <script>
 
 function editingTest() {
-    insertNewlineCommand();
+    insertLineBreakCommand();
     typeCharacterCommand('\t');
 }
 

diff --git a/LayoutTests/editing/inserting/insert-text-with-newlines.html b/LayoutTests/editing/inserting/insert-text-with-newlines.html
index fbed7e35a4fb6a08fae13773f3cfc76771cb7ff9..0cb607dbceab67ba836fef74a35ca912af67c650 100644 (file)
--- a/LayoutTests/editing/inserting/insert-text-with-newlines.html
+++ b/LayoutTests/editing/inserting/insert-text-with-newlines.html
@@ -1,3 +1,4 @@
+
 <html> 
 <head>
 
@@ -23,10 +24,10 @@ function moveNSpacesAndType(n) {
 
 function editingTest() {
     moveNSpacesAndType(4);
-    insertNewlineCommand();
+    insertLineBreakCommand();
     moveNSpacesAndType(4);
-    insertNewlineCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
+    insertLineBreakCommand();
     moveNSpacesAndType(4);
 }
 

diff --git a/LayoutTests/editing/pasteboard/paste-text-010.html b/LayoutTests/editing/pasteboard/paste-text-010.html
index 95ff47ca775f454012f5274b8946510d79fc1a89..bd39890a7e40d0163e8f01bece7d6312f0b9717d 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-text-010.html
+++ b/LayoutTests/editing/pasteboard/paste-text-010.html
@@ -1,3 +1,4 @@
+
 <html> 
 <head>
 
@@ -22,8 +23,8 @@ function editingTest() {
         extendSelectionForwardByCharacterCommand();
     copyCommand();
     moveSelectionForwardByCharacterCommand();
-    insertNewlineCommand();
-    insertNewlineCommand();
+    insertLineBreakCommand();
+    insertLineBreakCommand();
     pasteCommand();
     pasteCommand();
 }

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4d935277522b7e701c967764e0a814e5ab11e13b..1a119a875a6f5400511830260e809cf0b4538d38 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,33 @@
+2004-12-03  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by John
+
+        Terminology change in execCommand command identifiers. Specifically, the name of 
+        "InsertNewline" command has been changed to "InsertLineBreak". This matches the 
+        terminology used by AppKit. It is also more accurate, since the insertion of a
+        "br" element is what the command does. The inspiration for this change is so the 
+        -insertNewline AppKit method can be mapped to insert a new "div" element in 
+        a document and avoid ambiguity with what the javascript editing command does.
+        
+        * khtml/editing/jsediting.cpp
+        * layout-tests/editing/deleting/delete-tab-004.html
+        * layout-tests/editing/editing.js
+        * layout-tests/editing/inserting/insert-3654864-fix.html
+        * layout-tests/editing/inserting/insert-3659587-fix.html
+        * layout-tests/editing/inserting/insert-3775316-fix.html
+        * layout-tests/editing/inserting/insert-3800346-fix.html
+        * layout-tests/editing/inserting/insert-br-001.html
+        * layout-tests/editing/inserting/insert-br-002.html
+        * layout-tests/editing/inserting/insert-br-003.html
+        * layout-tests/editing/inserting/insert-br-004.html
+        * layout-tests/editing/inserting/insert-br-005.html
+        * layout-tests/editing/inserting/insert-br-006.html
+        * layout-tests/editing/inserting/insert-br-007.html
+        * layout-tests/editing/inserting/insert-br-008.html
+        * layout-tests/editing/inserting/insert-tab-004.html
+        * layout-tests/editing/inserting/insert-text-with-newlines.html
+        * layout-tests/editing/pasteboard/paste-text-010.html
+
 2004-12-02  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John

diff --git a/WebCore/khtml/editing/jsediting.cpp b/WebCore/khtml/editing/jsediting.cpp
index b473dec7174368402e6812bca1b9667456b19f85..359cd16272cd5f08aabf9eed47bbf2e1e8d3a14b 100644 (file)
--- a/WebCore/khtml/editing/jsediting.cpp
+++ b/WebCore/khtml/editing/jsediting.cpp
@@ -235,7 +235,7 @@ bool execIndent(KHTMLPart *part, bool userInterface, const DOMString &value)
     return false;
 }
 
-bool execInsertNewline(KHTMLPart *part, bool userInterface, const DOMString &value)
+bool execInsertLineBreak(KHTMLPart *part, bool userInterface, const DOMString &value)
 {
     TypingCommand::insertLineBreak(part->xmlDocImpl());
     return true;
@@ -471,7 +471,7 @@ QDict<CommandImp> createCommandDictionary()
         { "FontSize", { execFontSize, enabledAnySelection, stateNone, valueFontSize } },
         { "ForeColor", { execForeColor, enabledAnySelection, stateNone, valueForeColor } },
         { "Indent", { execIndent, enabledAnySelection, stateNone, valueNull } },
-        { "InsertNewline", { execInsertNewline, enabledAnySelection, stateNone, valueNull } },
+        { "InsertLineBreak", { execInsertLineBreak, enabledAnySelection, stateNone, valueNull } },
         { "InsertParagraph", { execInsertParagraph, enabledAnySelection, stateNone, valueNull } },
         { "InsertText", { execInsertText, enabledAnySelection, stateNone, valueNull } },
         { "Italic", { execItalic, enabledAnySelection, stateItalic, valueNull } },