Просмотр исходного кода

Revert "uploadhandler and uploadattachment"

This reverts commit 246367d2b18e5eacca6cb36efa7ce708404d3e0e.
shinoka7 6 лет назад
Родитель
Сommit
914d866a9b

+ 1 - 1
src/client/js/app.js

@@ -114,7 +114,7 @@ const crowiRenderer = new GrowiRenderer(crowi, null, {
 window.crowiRenderer = crowiRenderer;
 window.crowiRenderer = crowiRenderer;
 
 
 // create unstated container instance
 // create unstated container instance
-const commentContainer = new CommentContainer(crowi, pageId, pagePath, pageRevisionId);
+const commentContainer = new CommentContainer(crowi, pageId, pageRevisionId);
 
 
 // FIXME
 // FIXME
 const isEnabledPlugins = $('body').data('plugin-enabled');
 const isEnabledPlugins = $('body').data('plugin-enabled');

+ 29 - 10
src/client/js/components/PageComment/CommentContainer.jsx

@@ -8,12 +8,11 @@ import { Container } from 'unstated';
  */
  */
 export default class CommentContainer extends Container {
 export default class CommentContainer extends Container {
 
 
-  constructor(crowi, pageId, pagePath, revisionId) {
+  constructor(crowi, pageId, revisionId) {
     super();
     super();
 
 
     this.crowi = crowi;
     this.crowi = crowi;
     this.pageId = pageId;
     this.pageId = pageId;
-    this.pagePath = pagePath;
     this.revisionId = revisionId;
     this.revisionId = revisionId;
 
 
     this.state = {
     this.state = {
@@ -89,14 +88,34 @@ export default class CommentContainer extends Container {
   }
   }
 
 
   uploadAttachment(file) {
   uploadAttachment(file) {
-    const endpoint = '/attachments.add';
-    const formData = new FormData();
-    formData.append('_csrf', this.crowi.csrfToken);
-    formData.append('file', file);
-    formData.append('path', this.pagePath);
-    formData.append('page_id', this.pageId);
-
-    return this.crowi.apiPost(endpoint, formData);
+    // const endpoint = '/attachments.add';
+
+    // // create a FromData instance
+    // const formData = new FormData();
+    // formData.append('_csrf', this.props.data.crowi.csrfToken);
+    // formData.append('file', file);
+    // formData.append('path', this.props.data.pagePath);
+    // formData.append('page_id', this.props.data.pageId || 0);
+
+    // // post
+    // this.props.data.crowi.apiPost(endpoint, formData)
+    //   .then((res) => {
+    //     const attachment = res.attachment;
+    //     const fileName = attachment.originalName;
+
+    //     let insertText = `[${fileName}](${attachment.filePathProxied})`;
+    //     // when image
+    //     if (attachment.fileFormat.startsWith('image/')) {
+    //       // modify to "![fileName](url)" syntax
+    //       insertText = `!${insertText}`;
+    //     }
+    //     this.editor.insertText(insertText);
+    //   })
+    //   .catch(this.apiErrorHandler)
+    //   // finally
+    //   .then(() => {
+    //     this.editor.terminateUploadingState();
+    //   });
   }
   }
 
 
 }
 }

+ 23 - 12
src/client/js/components/PageComment/CommentEditor.jsx

@@ -7,7 +7,6 @@ import { Subscribe } from 'unstated';
 import Button from 'react-bootstrap/es/Button';
 import Button from 'react-bootstrap/es/Button';
 import Tab from 'react-bootstrap/es/Tab';
 import Tab from 'react-bootstrap/es/Tab';
 import Tabs from 'react-bootstrap/es/Tabs';
 import Tabs from 'react-bootstrap/es/Tabs';
-import * as toastr from 'toastr';
 import UserPicture from '../User/UserPicture';
 import UserPicture from '../User/UserPicture';
 import ReactUtils from '../ReactUtils';
 import ReactUtils from '../ReactUtils';
 
 
@@ -129,7 +128,18 @@ class CommentEditor extends React.Component {
   }
   }
 
 
   uploadHandler(file) {
   uploadHandler(file) {
-    this.props.commentContainer.uploadAttachment(file)
+    // const endpoint = '/attachments.add';
+
+    /*
+    // create a FromData instance
+    const formData = new FormData();
+    formData.append('_csrf', this.props.data.crowi.csrfToken);
+    formData.append('file', file);
+    formData.append('path', this.props.data.pagePath);
+    formData.append('page_id', this.props.data.pageId || 0);
+
+    // post
+    this.props.data.crowi.apiPost(endpoint, formData)
       .then((res) => {
       .then((res) => {
         const attachment = res.attachment;
         const attachment = res.attachment;
         const fileName = attachment.originalName;
         const fileName = attachment.originalName;
@@ -147,18 +157,19 @@ class CommentEditor extends React.Component {
       .then(() => {
       .then(() => {
         this.editor.terminateUploadingState();
         this.editor.terminateUploadingState();
       });
       });
+    */
   }
   }
 
 
-  apiErrorHandler(error) {
-    toastr.error(error.message, 'Error occured', {
-      closeButton: true,
-      progressBar: true,
-      newestOnTop: false,
-      showDuration: '100',
-      hideDuration: '100',
-      timeOut: '3000',
-    });
-  }
+  // apiErrorHandler(error) {
+  //   toastr.error(error.message, 'Error occured', {
+  //     closeButton: true,
+  //     progressBar: true,
+  //     newestOnTop: false,
+  //     showDuration: '100',
+  //     hideDuration: '100',
+  //     timeOut: '3000',
+  //   });
+  // }
 
 
   getCommentHtml() {
   getCommentHtml() {
     return (
     return (