Merge branch 'master' into dependabot/npm_and_yarn/tracked-toolbox-2.0.0

lblod · Jun 13, 2023 · 2fdaae4 · 2fdaae4
2 parents d92b5de + 983b8b7
commit 2fdaae4
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 68 deletions.
diff --git a/app/components/zitting-text-document-container.js b/app/components/zitting-text-document-container.js
@@ -40,7 +40,10 @@ import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote';
 import { code_block } from '@lblod/ember-rdfa-editor/plugins/code';
 import { image } from '@lblod/ember-rdfa-editor/plugins/image';
 import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks';
-import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';
+import {
+  date,
+  dateView,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';
 
 import { service } from '@ember/service';
 import { linkPasteHandler } from '@lblod/ember-rdfa-editor/plugins/link';
@@ -163,6 +166,7 @@ export default class ZittingTextDocumentContainerComponent extends Component {
     return (controller) => {
       return {
         link: linkView(this.config.link)(controller),
+        date: dateView(this.config.date)(controller),
       };
     };
   }

diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js
@@ -45,7 +45,10 @@ import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote';
 import { code_block } from '@lblod/ember-rdfa-editor/plugins/code';
 import { image, imageView } from '@lblod/ember-rdfa-editor/plugins/image';
 import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks';
-import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';
+import {
+  date,
+  dateView,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';
 
 import {
   createInvisiblesPlugin,
@@ -191,6 +194,7 @@ export default class AgendapointsEditController extends Controller {
         regulatoryStatementNode: regulatoryStatementNodeView(controller),
         link: linkView(this.config.link)(controller),
         image: imageView(controller),
+        date: dateView(this.config.date)(controller),
       };
     };
   }

diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js
@@ -52,7 +52,10 @@ import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote';
 import { code_block } from '@lblod/ember-rdfa-editor/plugins/code';
 import { image, imageView } from '@lblod/ember-rdfa-editor/plugins/image';
 import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks';
-import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';
+import {
+  date,
+  dateView,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';
 
 import { Schema } from '@lblod/ember-rdfa-editor';
 
@@ -133,6 +136,7 @@ export default class RegulatoryStatementsRoute extends Controller {
         ),
         link: linkView(this.config.link)(controller),
         image: imageView(controller),
+        date: dateView(this.config.date)(controller),
       };
     };
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,8 +40,8 @@
     "@lblod/ember-acmidm-login": "^2.0.0-beta.1",
     "@lblod/ember-environment-banner": "^0.2.0",
     "@lblod/ember-mock-login": "0.7.0",
-    "@lblod/ember-rdfa-editor": "^3.7.2",
-    "@lblod/ember-rdfa-editor-lblod-plugins": "^7.1.0",
+    "@lblod/ember-rdfa-editor": "^3.8.1",
+    "@lblod/ember-rdfa-editor-lblod-plugins": "^7.2.0",
     "@release-it-plugins/lerna-changelog": "^5.0.0",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-plugin": "^4.0.7",