Skip to content

Commit fb19f24

Browse files
committed
LHVirgo fix merge in
2 parents d3df951 + 1bebb6e commit fb19f24

File tree

10 files changed

+25
-8
lines changed

10 files changed

+25
-8
lines changed

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Use Node 12.19 with Yarn
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: '14'
24+
node-version: '18'
2525
npm: '6.14.8'
2626

2727
- name: Typescript install WebUI

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
},
2424
data() {
2525
return {
26-
editorConfig: { toolbar: CKEditorToolbar.default },
26+
editorConfig: {
27+
toolbar: CKEditorToolbar.default,
28+
versionCheck: false
29+
},
2730
description: this.initialValue,
2831
hint: `You have ${this.maxLength} characters remaining`,
2932
valid: getRemainingCharactersFromHtml(this.maxLength, this.initialValue) >= 0,

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,10 @@ export default Vue.extend({
169169
isReady: false,
170170
EditModeEnum: EditModeEnum,
171171
HierarchyEditStatusEnum: HierarchyEditStatusEnum,
172-
editorConfig: { toolbar: CKEditorToolbar.default },
172+
editorConfig: {
173+
toolbar: CKEditorToolbar.default,
174+
versionCheck: false
175+
},
173176
deleteFolderName: '',
174177
editFolderStructureButtonText: '',
175178
editFolderStructureButtonDisabled: true,

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageImageSection.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@
257257
SectionLayoutType: SectionLayoutType,
258258
editorConfig: {
259259
toolbar: CKEditorToolbar.landingPages,
260+
versionCheck: false,
260261
stylesSet: 'landing-pages-image-text'
261262
},
262263

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageVideoSection.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ Vue.use(Vuelidate as any);
263263
SectionLayoutType: SectionLayoutType,
264264
editorConfig: {
265265
toolbar: CKEditorToolbar.landingPages,
266+
versionCheck: false,
266267
stylesSet: 'landing-pages-video-text'
267268
},
268269

LearningHub.Nhs.WebUI/Scripts/vuesrc/ckeditorwithhint.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
},
2424
data() {
2525
return {
26-
editorConfig: { toolbar: CKEditorToolbar.default },
26+
editorConfig: {
27+
toolbar: CKEditorToolbar.default,
28+
versionCheck: false
29+
},
2730
description: this.initialValue,
2831
hint: `You have ${this.maxLength} characters remaining`,
2932
valid: getRemainingCharactersFromHtml(this.maxLength, this.initialValue) >= 0,

LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,10 @@
176176
isReady: false,
177177
EditModeEnum: EditModeEnum,
178178
HierarchyEditStatusEnum: HierarchyEditStatusEnum,
179-
editorConfig: { toolbar: CKEditorToolbar.default },
179+
editorConfig: {
180+
toolbar: CKEditorToolbar.default,
181+
versionCheck: false
182+
},
180183
deleteFolderName: '',
181184
editFolderStructureButtonText: '',
182185
editFolderStructureButtonDisabled: true,

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTextBlock.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
data() {
3333
return {
3434
textBlockContent: this.textBlock.content,
35-
ckEditorConfig: { toolbar: CKEditorToolbar.default },
35+
ckEditorConfig: { toolbar: CKEditorToolbar.default, versionCheck: false },
3636
prevHeight: undefined,
3737
};
3838
},

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentArticle.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@
7575
data() {
7676
return {
7777
articleContent: '',
78-
editorConfig: { toolbar: CKEditorToolbar.default },
78+
editorConfig: {
79+
toolbar: CKEditorToolbar.default,
80+
versionCheck: false
81+
},
7982
localArticleDetail: new ArticleResourceModel(),
8083
uploadingFile: null as File,
8184
changeingFileId: 0

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
currentUserAuthor: false,
283283
certificateEnabled: null,
284284
newKeyword: '',
285-
editorConfig: { toolbar: CKEditorToolbar.default },
285+
editorConfig: { toolbar: CKEditorToolbar.default, versionCheck: false },
286286
ResourceType,
287287
resourceProviderId: null,
288288
};

0 commit comments

Comments
 (0)