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.

Sign up for GitHub

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

Jump to bottom

Fix iqa comments #30172

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Fix iqa comments #30172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 core-web/libs/edit-content/src/lib/feature/edit-content/edit-content.layout.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@
}

<p-toast></p-toast>
<p-confirmDialog />
4 changes: 3 additions & 1 deletion core-web/libs/edit-content/src/lib/feature/edit-content/edit-content.layout.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';

import { MessageService } from 'primeng/api';
import { ButtonModule } from 'primeng/button';
import { ConfirmDialogModule } from 'primeng/confirmdialog';
import { MessagesModule } from 'primeng/messages';
import { ToastModule } from 'primeng/toast';

Expand Down Expand Up @@ -47,7 +48,8 @@ import { DotEditContentService } from '../../services/dot-edit-content.service';
RouterLink,
DotEditContentFormComponent,
DotEditContentAsideComponent,
DotEditContentToolbarComponent
DotEditContentToolbarComponent,
ConfirmDialogModule
],
templateUrl: './edit-content.layout.component.html',
styleUrls: ['./edit-content.layout.component.scss'],
Expand Down
2 changes: 0 additions & 2 deletions ...c/lib/fields/dot-edit-content-wysiwyg-field/dot-edit-content-wysiwyg-field.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@
data-testId="language-selector" />
}
</div>

<p-confirmDialog />
2 changes: 1 addition & 1 deletion ...src/lib/fields/dot-edit-content-wysiwyg-field/dot-edit-content-wysiwyg-field.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export class DotEditContentWYSIWYGFieldComponent implements AfterViewInit {
const currentDisplayedEditor = this.$displayedEditor();
const content = this.$fieldContent();

if (content.length > 0) {
if (content.length > 0 && this.$displayedEditor() !== AvailableEditor.TinyMCE) {
this.#confirmationService.confirm({
header: this.#dotMessageService.get(
'edit.content.wysiwyg.confirm.switch-editor.header'
Expand Down
2 changes: 1 addition & 1 deletion dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5797,4 +5797,4 @@ edit.content.category-field.search.empty.title=There are no categories yet
edit.content.category-field.search.empty.legend=To create a new category, navigate to: Content model > Categories > Click the "+" Plus Button > Add.

edit.content.wysiwyg.confirm.switch-editor.header=Confirm View Change
edit.content.wysiwyg.confirm.switch-editor.message=Switching to the WYSIWYG view may change your HTML code and cause code loss.<br> Are you sure you want to continue?
edit.content.wysiwyg.confirm.switch-editor.message=Switching to the WYSIWYG view may change your code and cause code loss.<br> Are you sure you want to continue?