WIP: #243 coudn't display page contents

resource/js/components/PageEditor.js

@@ -39,16 +39,13 @@ export default class PageEditor extends React.Component {
     // create throttled function
     this.renderWithDebounce = debounce(50, throttle(100, this.renderPreview));
     this.saveDraftWithDebounce = debounce(300, this.saveDraft);
-
-    // initial rendering
-    this.renderPreview(this.state.markdown);
   }
 
   componentWillMount() {
     // restore draft
     this.restoreDraft();
-    // initial preview
-    this.renderPreview();
+    // initial rendering
+    this.renderPreview(this.state.markdown);
   }
 
   focusToEditor() {
@@ -233,6 +230,8 @@ export default class PageEditor extends React.Component {
   renderPreview(value) {
     const config = this.props.crowi.config;
 
+    this.setState({ markdown: value });
+
     // generate options obj
     const rendererOptions = {
       // see: https://www.npmjs.com/package/marked
@@ -243,7 +242,7 @@ export default class PageEditor extends React.Component {
 
     // render html
     var context = {
-      markdown: value,
+      markdown: this.state.markdown,
       dom: this.previewElement,
       currentPagePath: decodeURIComponent(location.pathname)
     };
@@ -262,7 +261,7 @@ export default class PageEditor extends React.Component {
       .then(() => crowi.interceptorManager.process('preRenderPreviewHtml', context))
       .then(() => {
         this.setState({
-          markdown: value,
+          markdown: context.markdown,
           html: context.parsedHTML,
         });
 

resource/js/legacy/crowi.js

@@ -457,7 +457,12 @@ $(function() {
     var $link = $(this);
     var text = $link.text();
     var path = $link.data('path');
-    var shortPath = new String($link.data('short-path'));
+    var shortPath = String($link.data('short-path'));
+
+    if (path == null || shortPath == null) {
+      // continue
+      return;
+    }
 
     var escape = function(s) {
       return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');