|
@@ -17,13 +17,15 @@ import { useEditorMode } from '~/stores/ui';
|
|
|
import PageContainer from '../../client/services/PageContainer';
|
|
import PageContainer from '../../client/services/PageContainer';
|
|
|
import { IRevisionOnConflict } from '../../interfaces/revision';
|
|
import { IRevisionOnConflict } from '../../interfaces/revision';
|
|
|
import ExpandOrContractButton from '../ExpandOrContractButton';
|
|
import ExpandOrContractButton from '../ExpandOrContractButton';
|
|
|
-import UncontrolledCodeMirrorCore from '../UncontrolledCodeMirror';
|
|
|
|
|
|
|
+// import UncontrolledCodeMirror from '../UncontrolledCodeMirror';
|
|
|
|
|
|
|
|
require('codemirror/lib/codemirror.css');
|
|
require('codemirror/lib/codemirror.css');
|
|
|
require('codemirror/addon/merge/merge');
|
|
require('codemirror/addon/merge/merge');
|
|
|
require('codemirror/addon/merge/merge.css');
|
|
require('codemirror/addon/merge/merge.css');
|
|
|
const DMP = require('diff_match_patch');
|
|
const DMP = require('diff_match_patch');
|
|
|
|
|
|
|
|
|
|
+const UncontrolledCodeMirror = require('../UncontrolledCodeMirror');
|
|
|
|
|
+
|
|
|
Object.keys(DMP).forEach((key) => { window[key] = DMP[key] });
|
|
Object.keys(DMP).forEach((key) => { window[key] = DMP[key] });
|
|
|
|
|
|
|
|
type ConflictDiffModalProps = {
|
|
type ConflictDiffModalProps = {
|
|
@@ -229,7 +231,7 @@ const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IU
|
|
|
<div className="col-12">
|
|
<div className="col-12">
|
|
|
<div className="border border-dark">
|
|
<div className="border border-dark">
|
|
|
<h3 className="font-weight-bold my-2 mx-2">{t('modal_resolve_conflict.selected_editable_revision')}</h3>
|
|
<h3 className="font-weight-bold my-2 mx-2">{t('modal_resolve_conflict.selected_editable_revision')}</h3>
|
|
|
- <UncontrolledCodeMirrorCore
|
|
|
|
|
|
|
+ <UncontrolledCodeMirror
|
|
|
ref={uncontrolledRef}
|
|
ref={uncontrolledRef}
|
|
|
value={resolvedRevision}
|
|
value={resolvedRevision}
|
|
|
options={{
|
|
options={{
|