Skip to content
Snippets Groups Projects
Verified Commit 4548f130 authored by Dave Long's avatar Dave Long
Browse files

Issue #3396742 by ReINFaTe, smustgrave, Wim Leers, nod_: CKEditor 5 doesn't...

Issue #3396742 by ReINFaTe, smustgrave, Wim Leers, nod_: CKEditor 5 doesn't save updated value if form submitted right after the change

(cherry picked from commit 5d5dde43)
parent 1bdd9d75
No related branches found
No related tags found
26 merge requests!11185Issue #3477324 by andypost, alexpott: Fix usage of str_getcsv() and fgetcsv() for PHP 8.4,!10602Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear,!10301Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time login...,!10187Issue #3487488 by dakwamine: ExtensionMimeTypeGuesser::guessMimeType must support file names with "0" (zero) like foo.0.zip,!9944Issue #3483353: Consider making the createCopy config action optionally fail...,!9929Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9787Resolve issue 3479427 - bootstrap barrio issue under Windows,!9742Issue #3463908 by catch, quietone: Split OptionsFieldUiTest into two,!9526Issue #3458177 by mondrake, catch, quietone, godotislate, longwave, larowlan,...,!8738Issue #3424162 by camilledavis, dineshkumarbollu, smustgrave: Claro...,!8704Make greek characters available in ckeditor5,!8597Draft: Issue #3442259 by catch, quietone, dww: Reduce time of Migrate Upgrade tests...,!8533Issue #3446962 by kim.pepper: Remove incorrectly added...,!8517Issue #3443748 by NexusNovaz, smustgrave: Testcase creates false positive,!8325Update file Sort.php,!8095Expose document root on install,!7930Resolve #3427374 "Taxonomytid viewsargumentdefault plugin",!7627Issue #3439440 by nicxvan, Binoli Lalani, longwave: Remove country support from DateFormatter,!7445Issue #3440169: When using drupalGet(), provide an associative array for $headers,!7401#3271894 Fix documented StreamWrapperInterface return types for realpath() and dirname(),!7384Add constraints to system.advisories,!7078Issue #3320569 by Spokje, mondrake, smustgrave, longwave, quietone, Lendude,...,!6622Issue #2559833 by piggito, mohit_aghera, larowlan, guptahemant, vakulrai,...,!6502Draft: Resolve #2938524 "Plach testing issue",!38582585169-10.1.x,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key
Pipeline #118397 passed with warnings
......@@ -443,22 +443,9 @@
editor.model.document.on('change:data', () => {
const callback = callbacks.get(id);
if (callback) {
if (editor.plugins.has('SourceEditing')) {
// If the change:data is being called while in source editing
// mode, it means that the form is being submitted. To avoid
// race conditions, in this case the callback gets called
// without decorating the callback with debounce.
// @see https://www.drupal.org/i/3229174
// @see Drupal.editorDetach
if (editor.plugins.get('SourceEditing').isSourceEditingMode) {
callback();
return;
}
}
// Marks the field as changed.
// @see Drupal.editorAttach
debounce(callback, 400)();
callback();
}
});
......@@ -530,7 +517,7 @@
* Callback called with the value of the editor.
*/
onChange(element, callback) {
callbacks.set(getElementId(element), callback);
callbacks.set(getElementId(element), debounce(callback, 400, true));
},
/**
......@@ -570,7 +557,7 @@
const callback = callbacks.get(id);
if (callback) {
// Allow modules to update EditorModel by providing the current data.
debounce(callback, 400)(editor.getData());
callback(editor.getData());
}
});
})
......
......@@ -797,4 +797,82 @@ function (ConstraintViolation $v) {
$assert_session->responseContains('<!-- Hamsters, alpacas, llamas, and kittens are cute! --><p>This is a <em>test!</em></p>');
}
/**
* Ensures that changes are saved in CKEditor 5.
*/
public function testSave(): void {
// To replicate the bug from https://www.drupal.org/i/3396742
// We need 2 or more text formats and node edit page.
FilterFormat::create([
'format' => 'ckeditor5',
'name' => 'CKEditor 5 HTML',
'roles' => [RoleInterface::AUTHENTICATED_ID],
])->save();
Editor::create([
'format' => 'ckeditor5',
'editor' => 'ckeditor5',
'settings' => [
'toolbar' => [
'items' => [
'sourceEditing',
],
],
'plugins' => [
'ckeditor5_sourceEditing' => [
'allowed_tags' => [],
],
],
],
])->save();
$this->assertSame([], array_map(
function (ConstraintViolation $v) {
return (string) $v->getMessage();
},
iterator_to_array(CKEditor5::validatePair(
Editor::load('ckeditor5'),
FilterFormat::load('ckeditor5')
))
));
FilterFormat::create([
'format' => 'ckeditor5_2',
'name' => 'CKEditor 5 HTML 2',
'roles' => [RoleInterface::AUTHENTICATED_ID],
])->save();
Editor::create([
'format' => 'ckeditor5_2',
'editor' => 'ckeditor5',
])->save();
$this->assertSame([], array_map(
function (ConstraintViolation $v) {
return (string) $v->getMessage();
},
iterator_to_array(CKEditor5::validatePair(
Editor::load('ckeditor5_2'),
FilterFormat::load('ckeditor5_2')
))
));
$this->drupalCreateNode([
'title' => 'My test content',
]);
// Test that entered text is saved.
$this->drupalGet('node/1/edit');
$page = $this->getSession()->getPage();
$this->waitForEditor();
$editor = $page->find('css', '.ck-content');
$editor->setValue('Very important information');
$page->pressButton('Save');
$this->assertSession()->responseContains('Very important information');
// Test that changes only in source are saved.
$this->drupalGet('node/1/edit');
$page = $this->getSession()->getPage();
$this->waitForEditor();
$this->pressEditorButton('Source');
$editor = $page->find('css', '.ck-source-editing-area textarea');
$editor->setValue('Text hidden in the source');
$page->pressButton('Save');
$this->assertSession()->responseContains('Text hidden in the source');
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment