yusuketk 5 лет назад
Родитель
Сommit
d7798c7fe6

+ 11 - 9
src/client/js/components/PageEditor/LinkEditModal.jsx

@@ -29,6 +29,8 @@ class LinkEditModal extends React.PureComponent {
   constructor(props) {
   constructor(props) {
     super(props);
     super(props);
 
 
+    this.defaultMessageInPreviewWindow = 'Page preview here.';
+
     this.state = {
     this.state = {
       show: false,
       show: false,
       isUseRelativePath: false,
       isUseRelativePath: false,
@@ -36,7 +38,7 @@ class LinkEditModal extends React.PureComponent {
       linkInputValue: '',
       linkInputValue: '',
       labelInputValue: '',
       labelInputValue: '',
       linkerType: Linker.types.markdownLink,
       linkerType: Linker.types.markdownLink,
-      markdown: '',
+      markdown: this.defaultMessageInPreviewWindow,
       permalink: '',
       permalink: '',
       linkText: '',
       linkText: '',
       isPreviewOpen: false,
       isPreviewOpen: false,
@@ -181,11 +183,11 @@ class LinkEditModal extends React.PureComponent {
         permalink = !isPermanentLink ? `${window.location.origin}/${page.id}` : '';
         permalink = !isPermanentLink ? `${window.location.origin}/${page.id}` : '';
       }
       }
       catch (err) {
       catch (err) {
-        markdown = `<div>${err.message}</div>`;
+        markdown = err.message;
       }
       }
     }
     }
     else {
     else {
-      markdown = '<div>Page preview here.</div>';
+      markdown = this.defaultMessageInPreviewWindow;
     }
     }
     this.setState({ markdown, permalink });
     this.setState({ markdown, permalink });
   }
   }
@@ -204,17 +206,17 @@ class LinkEditModal extends React.PureComponent {
     const linkText = linker.generateMarkdownText();
     const linkText = linker.generateMarkdownText();
     return (
     return (
       <div className="d-flex justify-content-between mb-3">
       <div className="d-flex justify-content-between mb-3">
-        <div className="card w-100 mb-0 p-1 bg-muted">
-          <p className="text-left text-muted mb-0">Markdown</p>
-          <p className="text-center text-truncate">{linkText}</p>
+        <div className="card w-100 bg-muted p-1 mb-0">
+          <p className="text-left text-muted mb-1 small">Markdown</p>
+          <p className="text-center text-truncate text-muted">{linkText}</p>
         </div>
         </div>
         <div className="d-flex align-items-center">
         <div className="d-flex align-items-center">
           <span className="lead mx-3">
           <span className="lead mx-3">
             <i className="fa fa-caret-right"></i>
             <i className="fa fa-caret-right"></i>
           </span>
           </span>
         </div>
         </div>
-        <div className="card w-100 mb-0">
-          <p className="text-left text-muted mb-0 p-1">HTML</p>
+        <div className="card w-100 p-1 mb-0">
+          <p className="text-left text-muted mb-1 small">HTML</p>
           <p className="text-center text-truncate">
           <p className="text-center text-truncate">
             <a href={linker.link}>{linker.label}</a>
             <a href={linker.link}>{linker.label}</a>
           </p>
           </p>
@@ -318,7 +320,7 @@ class LinkEditModal extends React.PureComponent {
                       </button>
                       </button>
                       <Popover placement="right" isOpen={this.state.isPreviewOpen} target="preview-btn" toggle={this.toggleIsPreviewOpen}>
                       <Popover placement="right" isOpen={this.state.isPreviewOpen} target="preview-btn" toggle={this.toggleIsPreviewOpen}>
                         <PopoverBody>
                         <PopoverBody>
-                          <div className="overflow-auto">{this.renderPreview()}</div>
+                          {this.renderPreview()}
                         </PopoverBody>
                         </PopoverBody>
                       </Popover>
                       </Popover>
                     </div>
                     </div>

+ 10 - 6
src/client/styles/scss/_linkedit-preview.scss

@@ -1,8 +1,12 @@
-.modal .modal-body .linkedit-preview {
-  height: 0;
-  padding-bottom: 50%;
-
-  .page-editor-preview-body {
-    overflow-y: unset;
+.popover .popover-body {
+  .linkedit-preview {
+    .page-editor-preview-body {
+      max-height: 70vh;
+      padding-top: 0px;
+      .wiki {
+        overflow-y: scroll;
+        font-size: 100%;
+      }
+    }
   }
   }
 }
 }