Przeglądaj źródła

apply detach-code-blocks to Comment and CommentForm component

Yuki Takei 7 lat temu
rodzic
commit
7758fa04bb

+ 7 - 7
resource/js/components/PageComment/Comment.js

@@ -88,27 +88,27 @@ export default class Comment extends React.Component {
 
     const crowiRenderer = this.props.crowiRenderer;
     const interceptorManager = this.props.crowi.interceptorManager;
-    interceptorManager.process('preCommentRender', context)
-      .then(() => interceptorManager.process('preCommentPreProcess', context))
+    interceptorManager.process('preRenderComment', context)
+      .then(() => interceptorManager.process('prePreProcess', context))
       .then(() => {
         context.markdown = crowiRenderer.preProcess(context.markdown);
       })
-      .then(() => interceptorManager.process('postCommentPreProcess', context))
+      .then(() => interceptorManager.process('postPreProcess', context))
       .then(() => {
         var parsedHTML = crowiRenderer.process(context.markdown);
         context['parsedHTML'] = parsedHTML;
       })
-      .then(() => interceptorManager.process('preCommentPostProcess', context))
+      .then(() => interceptorManager.process('prePostProcess', context))
       .then(() => {
         context.parsedHTML = crowiRenderer.postProcess(context.parsedHTML, context.dom);
       })
-      .then(() => interceptorManager.process('postCommentPostProcess', context))
-      .then(() => interceptorManager.process('preCommentRenderHtml', context))
+      .then(() => interceptorManager.process('postPostProcess', context))
+      .then(() => interceptorManager.process('preRenderCommentHtml', context))
       .then(() => {
         this.setState({ html: context.parsedHTML });
       })
       // process interceptors for post rendering
-      .then(() => interceptorManager.process('postCommentRenderHtml', context));
+      .then(() => interceptorManager.process('postRenderCommentHtml', context));
 
   }
 

+ 7 - 7
resource/js/components/PageComment/CommentForm.js

@@ -94,27 +94,27 @@ export default class CommentForm extends React.Component {
 
     const crowiRenderer = this.props.crowiRenderer;
     const interceptorManager = this.props.crowi.interceptorManager;
-    interceptorManager.process('preCommnetFormPreviewRender', context)
-      .then(() => interceptorManager.process('preCommnetFormPreviewPreProcess', context))
+    interceptorManager.process('preRenderCommnetPreview', context)
+      .then(() => interceptorManager.process('prePreProcess', context))
       .then(() => {
         context.markdown = crowiRenderer.preProcess(context.markdown);
       })
-      .then(() => interceptorManager.process('postCommnetFormPreviewPreProcess', context))
+      .then(() => interceptorManager.process('postPreProcess', context))
       .then(() => {
         var parsedHTML = crowiRenderer.process(context.markdown);
         context['parsedHTML'] = parsedHTML;
       })
-      .then(() => interceptorManager.process('preCommnetFormPreviewPostProcess', context))
+      .then(() => interceptorManager.process('prePostProcess', context))
       .then(() => {
         context.parsedHTML = crowiRenderer.postProcess(context.parsedHTML, context.dom);
       })
-      .then(() => interceptorManager.process('postCommnetFormPreviewPostProcess', context))
-      .then(() => interceptorManager.process('preCommnetFormPreviewRenderHtml', context))
+      .then(() => interceptorManager.process('postPostProcess', context))
+      .then(() => interceptorManager.process('preRenderCommentPreviewHtml', context))
       .then(() => {
         this.setState({ html: context.parsedHTML });
       })
       // process interceptors for post rendering
-      .then(() => interceptorManager.process('postCommnetFormPreviewRenderHtml', context));
+      .then(() => interceptorManager.process('postRenderCommentPreviewHtml', context));
   }
 
   generateInnerHtml(html) {

+ 3 - 2
resource/js/util/interceptor/detach-code-blocks.js

@@ -104,14 +104,15 @@ export class RestoreCodeBlockInterceptor extends BasicInterceptor {
    * @inheritdoc
    */
   isInterceptWhen(contextName) {
-    return /^postPreProcess|preRenderHtml|preRenderPreviewHtml$/.test(contextName);
+    return /^postPreProcess|preRenderHtml|preRenderPreviewHtml|preRenderCommentHtml|preRenderCommentPreviewHtml$/.test(contextName);
   }
 
   getTargetKey(contextName) {
     if (contextName === 'postPreProcess') {
       return 'markdown';
     }
-    else if (contextName === 'preRenderHtml' || contextName === 'preRenderPreviewHtml') {
+    else if (contextName === 'preRenderHtml' || contextName === 'preRenderPreviewHtml'
+        || contextName === 'preRenderCommentHtml' || contextName === 'preRenderCommentPreviewHtml') {
       return 'parsedHTML';
     }
   }