Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Yoast/Yoast-SEO-for-TYPO3 into bugf…
Browse files Browse the repository at this point in the history
…ix/534-old-dbal-support
  • Loading branch information
Riny van Tiggelen committed Jul 5, 2023
2 parents 273896d + c0a87bb commit 3ab3526
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ We will follow [Semantic Versioning](http://semver.org/).
### Fixed
- Content Security Policy issues in CMS12 by adding extra parameter within BackendYoastConfig and removing unnecessary inline code within FocusKeywordAnalysis.html
- `doctrine/dbal` 2.10 support by adding `DbalService` which checks for the TYPO3 major version, if 10 then use the old `fetch` methods
- Loading state of internal linking suggestions when the bodytext is empty (e.g. new content element)

## 9.0.0 June 12, 2023
### Breaking
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/JavaScript/dist/plugin.js

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions Resources/Public/JavaScript/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ let YoastLinkingSuggestions = {

checkLinkingSuggestions: () => {
let content = YoastLinkingSuggestions.getCKEditorContent();
if (content === '') {
if (content === null) {
return;
}

Expand All @@ -461,15 +461,20 @@ let YoastLinkingSuggestions = {
if (ckeditor5elements.length > 0) {
const editableElements = document.querySelectorAll('.ck-editor__editable');
let content = '';
let ckeditorLoaded = false;
for (let editorElement in editableElements) {
if (typeof editableElements[editorElement].ckeditorInstance !== 'undefined') {
ckeditorLoaded = true;
content += editableElements[editorElement].ckeditorInstance.getData();
}
}
if (ckeditorLoaded === false) {
return null;
}
return content;
} else {
if (typeof CKEDITOR === 'undefined') {
return '';
return null;
}
let content = '';
for (let instance in CKEDITOR.instances) {
Expand Down

0 comments on commit 3ab3526

Please sign in to comment.