From fc399b7517aeed42bf458faa08242366e93e87fa Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Thu, 12 Nov 2015 13:08:28 +0100 Subject: [PATCH] Revert "Merge branch 't/13798'" This reverts commit 85652018a7d6aed2fa2c55c060c19e31e59afa98, reversing changes made to e4f24321591de46716f3fac1130e7c5f60629018. --- CHANGES.md | 1 - core/editable.js | 6 +++--- tests/core/editable/keystrokes/keystrokes.js | 10 +--------- tests/tickets/13798/1.html | 9 --------- tests/tickets/13798/1.md | 15 --------------- 5 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 tests/tickets/13798/1.html delete mode 100644 tests/tickets/13798/1.md diff --git a/CHANGES.md b/CHANGES.md index b6fd2aa6d5e..2b3fb52ce2b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,7 +21,6 @@ Fixed Issues: * [#12848](http://dev.ckeditor.com/ticket/12848): [Blink] Fixed: Opening the [Find and Replace](http://ckeditor.com/addon/find) dialog window in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode throws an exception. * [#13879](http://dev.ckeditor.com/ticket/13879): Fixed: It is not possible to prevent the [`editor.drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop) event. * [#13361](http://dev.ckeditor.com/ticket/13361): Fixed: Skin images fail when the site path includes parentheses because the `background-image` path needs single quotes around the URL value. -* [#13798](http://dev.ckeditor.com/ticket/13798): [Firefox] Fixed: Changing paragraph format causes the cursor to move. * [#13771](http://dev.ckeditor.com/ticket/13771): Fixed: The `contents.css` style is not used if the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin is missing. * [#13782](http://dev.ckeditor.com/ticket/13782): Fixed: Unclear log messages. * [#13919](http://dev.ckeditor.com/ticket/13919): [Edge] Fixed: Browser window crashes when accessing the `isContentEditable` property of an `` DOM element. diff --git a/core/editable.js b/core/editable.js index c24aad4ad46..4c941cd36ca 100644 --- a/core/editable.js +++ b/core/editable.js @@ -1108,9 +1108,9 @@ } ); } - // Prevent Webkit/Blink/Gecko from going rogue when joining - // blocks on BACKSPACE/DEL (#13798,#11861,#9998). - if ( CKEDITOR.env.webkit || CKEDITOR.env.gecko ) { + // Prevent Webkit/Blink from going rogue when joining + // blocks on BACKSPACE/DEL (#11861,#9998). + if ( CKEDITOR.env.webkit ) { this.attachListener( editor, 'key', function( evt ) { if ( editor.readOnly ) { return true; diff --git a/tests/core/editable/keystrokes/keystrokes.js b/tests/core/editable/keystrokes/keystrokes.js index 9f7152a76c7..f2e70aafe19 100644 --- a/tests/core/editable/keystrokes/keystrokes.js +++ b/tests/core/editable/keystrokes/keystrokes.js @@ -166,13 +166,5 @@ bender.test( { // No content in a parent list. this.assertKeystroke( DEL, 0, '', '^', 'table 3' ); - }, - - // ##13798 - 'test caret position after pressing BACKSPACE between blocks in Firefox': function() { - if ( !CKEDITOR.env.gecko ) - assert.ignore(); - - this.assertKeystroke( BACKSPACE, 0, '

Head

^ing

', '

Head^ing

', 'blocks are correctly joined' ); } -} ); +} ); \ No newline at end of file diff --git a/tests/tickets/13798/1.html b/tests/tickets/13798/1.html deleted file mode 100644 index 9244ab805b1..00000000000 --- a/tests/tickets/13798/1.html +++ /dev/null @@ -1,9 +0,0 @@ - -
-

Heading

-
- - - diff --git a/tests/tickets/13798/1.md b/tests/tickets/13798/1.md deleted file mode 100644 index d406d38bb08..00000000000 --- a/tests/tickets/13798/1.md +++ /dev/null @@ -1,15 +0,0 @@ -@bender-tags: tc, 4.5.5, editor, 13798 -@bender-ui: collapsed -@bender-ckeditor-plugins: wysiwygarea, format, toolbar - -###Only on Firefox### - ----- - -1. Set the cursor after "d" letter in a heading. -2. Press Enter. -3. Change the paragraph format to Normal. -4. Press Backspace. - -**Expected:** -* Cursor is placed after "d" letter in the heading.