Merge branch '2.1' into 2

silverstripe · Oct 27, 2023 · 4e6f231 · 4e6f231
2 parents f1492aa + 20eae7d
commit 4e6f231
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/client/src/components/HistoryViewer/HistoryViewer.js b/client/src/components/HistoryViewer/HistoryViewer.js
@@ -409,8 +409,6 @@ HistoryViewer.propTypes = {
   }),
   page: PropTypes.number,
   schemaUrl: PropTypes.string,
-  // @todo replace this with import { VIEW_MODE_STATES } from 'state/viewMode/ViewModeStates'
-  // when webpack-config has this export available via silverstripe/admin
   previewState: PropTypes.oneOf(['edit', 'preview', 'split']),
   actions: PropTypes.object,
   onSelect: PropTypes.func,

diff --git a/client/src/components/HistoryViewer/HistoryViewer.scss b/client/src/components/HistoryViewer/HistoryViewer.scss
@@ -59,7 +59,6 @@ $diff-added-color: #b9f1c8;
   }
 }
 
-// Todo: remove this when the CMS is React driven and we don't need this hack
 .history-viewer__preview {
   margin-top: -54px;
 }
@@ -84,7 +83,7 @@ $diff-added-color: #b9f1c8;
   }
 }
 
-// Hide preview on small devices. @todo replace this with a view toggle component
+// Hide preview on small devices.
 @include media-breakpoint-down(md) {
   .history-viewer__preview {
     display: none;

diff --git a/client/src/components/HistoryViewer/HistoryViewerVersionDetail.js b/client/src/components/HistoryViewer/HistoryViewerVersionDetail.js
@@ -63,7 +63,7 @@ class HistoryViewerVersionDetail extends PureComponent {
 
   /**
    * Until the CMS is fully React driven, we must control certain aspects of the CMS DOM with
-   * manual CSS tweaks. @todo remove this when React drives the CMS.
+   * manual CSS tweaks.
    *
    * @param {boolean} add
    */
@@ -226,8 +226,6 @@ HistoryViewerVersionDetail.propTypes = {
     }),
     PropTypes.bool,
   ]),
-  // @todo replace this with import { VIEW_MODE_STATES } from 'state/viewMode/ViewModeStates'
-  // when webpack-config has this export available via silverstripe/admin
   previewState: PropTypes.oneOf(['edit', 'preview', 'split']),
 };