소스 검색

Fixed bugs

Taichi Masuyama 3 년 전
부모
커밋
4c1adf10a8
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 1
      packages/app/src/client/services/AppContainer.js
  2. 2 2
      packages/app/src/client/util/reveal/plugins/growi-renderer.js

+ 4 - 1
packages/app/src/client/services/AppContainer.js

@@ -61,7 +61,10 @@ export default class AppContainer extends Container {
   injectToWindow() {
     window.appContainer = this;
 
-    window.growiRenderer = new GrowiRenderer(this.getConfig());
+    const growiRenderer = new GrowiRenderer(this.getConfig());
+    growiRenderer.init();
+
+    window.growiRenderer = growiRenderer;
 
     // backward compatibility
     window.crowi = this;

+ 2 - 2
packages/app/src/client/util/reveal/plugins/growi-renderer.js

@@ -11,7 +11,7 @@
   const DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '\\\.slide:\\\s*?(\\\S.+?)$';
   /* eslint-enable no-useless-escape */
 
-  const growiRenderer = window.previewRenderer;
+  const growiRenderer = window.parent.growiRenderer;
 
   let marked;
 
@@ -58,7 +58,7 @@
         section.setAttribute('data-markdown-parsed', 'true');
         const notes = section.querySelector('aside.notes');
         markdown = marked.getMarkdownFromSlide(section);
-        const context = { markdown };
+        const context = { markdown, currentPathname: decodeURIComponent(window.parent.location.pathname) };
 
         interceptorManager.process('preRender', context)
           .then(() => { return interceptorManager.process('prePreProcess', context) })