Merge pull request #54 from Coding/yangzhen/add-details

Yangzhen/add details
coding · Feb 20, 2017 · 8defe85 · 8defe85
2 parents 84691c5 + f11081c
commit 8defe85
Show file tree

Hide file tree

Showing 6 changed files with 426 additions and 20 deletions.
diff --git a/app/components/FileTree/index.jsx b/app/components/FileTree/index.jsx
@@ -139,11 +139,10 @@ class FileTreeNode extends Component {
           <span className="filetree-node-arrow"
             onClick={e => openNode(node, null, e.altKey)}
           >
-            <i className={cx({
+            {(node.isDir && node.childrenCount !== 0)&&<i className={cx({
               'fa fa-angle-right': node.isFolded,
               'fa fa-angle-down': !node.isFolded,
-              hidden: !node.isDir || node.childrenCount === 0
-            })}></i>
+            })}></i>}
           </span>
           <span className="filetree-node-icon">
             <i className={cx({

diff --git a/app/components/Git/GitCommitView.jsx b/app/components/Git/GitCommitView.jsx
@@ -10,12 +10,17 @@ import * as GitActions from './actions'
 import GitFileTree from './GitFileTree'
 
 var GitCommitView = ({isWorkingDirClean, ...actionProps}) => {
-  const {updateCommitMessage, commit, statusFiles} = actionProps
+  const {updateCommitMessage, commit, statusFiles, diffFile} = actionProps
   return isWorkingDirClean ?
     <h1 className=''>Your working directory is clean. Nothing to commit.</h1>
   : (<div>
       <GitFileTree
         statusFiles={statusFiles}
+        handleClick={(path) => {
+          diffFile({
+            path, newRef: 'HEAD', oldRef: '~~unstaged~~'
+          })
+        }}
       />
       <hr />
       <div className='git-commit-message-container'>

diff --git a/app/components/MarkdownEditor/index.jsx b/app/components/MarkdownEditor/index.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import AceEditor from '../AceEditor';
+import CodeMirrorEditor from '../CodeMirrorEditor'
 import { markdown } from 'markdown';
 import { connect } from 'react-redux';
 import cx from 'classnames';
@@ -12,7 +12,7 @@ const styles = {
 const PreviewEditor = (content) => {
   const makeHTMLComponent = (html) => React.DOM.div({ dangerouslySetInnerHTML: {__html: html} });
   return (
-    <div name="markdown_preview">
+    <div name="markdown_preview" className="markdown content">
     { makeHTMLComponent(markdown.toHTML(content)) }
     </div>);
 }
@@ -97,7 +97,7 @@ const MarkdownEditor = ({
           flexShrink: 0,
           flexBasis: 0,
         }}>
-        {React.createElement(AceEditor, { tab })}
+        {React.createElement(CodeMirrorEditor, { tab })}
       </div>): null
     }
       { (showPreview && !showBigSize) ? (