Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue #3432756: Splitting the links in two #47

Open
wants to merge 1 commit into
base: 3.0.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cspell-project-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ unusedcode
wapmorgan
Wenger
wengerk
dolo
2 changes: 1 addition & 1 deletion js/build/nbsp.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 13 additions & 5 deletions js/ckeditor5_plugins/nbsp/src/nbspCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@ import { Command } from "ckeditor5/src/core";

export default class NbspCommand extends Command {
execute() {
const editor = this.editor;
const selection = editor.model.document.selection;

// Insert tag in the current selection location.
this.editor.model.change((writer) => {
const nbspElement = "<nbsp>&nbsp;</nbsp>";
const nbspViewFragment = this.editor.data.processor.toView(nbspElement);
const nbspModelFragment = this.editor.data.toModel(nbspViewFragment);
this.editor.model.insertContent(nbspModelFragment);
editor.model.change((writer) => {
// Create a <nbsp> element with all the selection attributes.
const placeholder = writer.createElement("nbsp", {
...Object.fromEntries(selection.getAttributes()),
});

// Insert it into the document. Put the selection on the inserted element.
editor.model.insertObject(placeholder, null, null, {
setSelection: "on",
});
});
}
}
44 changes: 44 additions & 0 deletions tests/src/FunctionalJavascript/DrupalCKEditor5NbspTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,48 @@ public function testNbspInsideLinkTag() {
$this->assertEquals("dolore sit", $link[0]->textContent);
}

/**
* Tests using Drupal Nbsp button to add non-breaking space into Link via Btn.
*
* @group kevin
*/
public function testNbspInsideLinkTagWithButton() {
$this->drupalGet('node/add/page');
$this->waitForEditor();
$assert_session = $this->assertSession();
$editor = $assert_session->waitForElementVisible('css', '.ck-editor__editable', 1000);

// Emulate the user typing a link element.
$this->pressEditorButton('Source');
$source_text_area = $assert_session->waitForElement('css', '.ck-source-editing-area textarea');
$source_text_area->setValue('lorem ipsum <a href="https://www.google.ch">dolore<em>sit</em>dolo</a> amet.');

// Click source again to make source inactive and have the Schema refreshed.
$this->pressEditorButton('Source');

// Place an NBSP element inside the link by replacing the content of the
// <em> element.
$this->selectTextInsideElement('.ck-editor__editable a em');
$this->pressEditorButton('Insert non-breaking space');

$this->assertNotEmpty($assert_session->waitForElement('css', '.ck-editor__editable a em > nbsp'));

// Since Drupal 10.1.0.
if (version_compare(\Drupal::VERSION, '10.1.0', '>')) {
$this->assertEquals('<p>lorem ipsum <a href="https://www.google.ch" class="ck-link_selected">dolore<em><nbsp><br data-cke-filler="true"></nbsp></em>dolo</a> amet.</p>', $editor->getHtml());
}
else {
$this->assertEquals('<p>lorem ipsum <a href="https://www.google.ch">dolore<em><nbsp><br data-cke-filler="true"></nbsp></em>dolo</a> amet.</p>', $editor->getHtml());
}

// The link should be left intact and we should have 1 NBSP element inside.
$xpath = new \DOMXPath($this->getEditorDataAsDom());
$nbsp = $xpath->query('//nbsp');
$this->assertCount(1, $nbsp);
$this->assertEquals(" ", $nbsp[0]->firstChild->nodeValue);
$link = $xpath->query('//a');
$this->assertCount(1, $link);
$this->assertEquals("dolore dolo", $link[0]->textContent);
}

}
Loading