Merge pull request #456 from chunqiuyiyu/dashboard

Aaaaash · web-flow · commit 1c54d567d2b3 · 2018-11-26T17:09:21.000+08:00
Add some iPad support and slash for newFile path.
diff --git a/app/commands/commandBindings/file.js b/app/commands/commandBindings/file.js
@@ -220,6 +220,7 @@ export function openFile (obj, callback) {
 
 function createFileWithContent (content) {
   return function createFileAtPath (path) {
+    path = path.startsWith('/') ? path : `/${path}`
     if (content) {
       return api.createFile(path, content)
         .then((res) => {
diff --git a/app/commons/Tree/TreeNode.jsx b/app/commons/Tree/TreeNode.jsx
@@ -153,6 +153,7 @@ class TreeNode extends Component {
           ref={r => (this.nodeDOM = r)}
           onClick={e => selectNode(node)}
           onDoubleClick={e => openNode(node)}
+          onTouchStart={e => openNode(node)}
           style={{ paddingLeft: `${1 + node.depth}em` }}
         >
           {node.isLoading && <i className='fa fa-spinner fa-pulse fa-fw' />}
diff --git a/app/components/Terminal/actions.js b/app/components/Terminal/actions.js
@@ -106,7 +106,10 @@ export function inputPath (inputPath) {
 */
 
 export const addTerminal = registerAction('terminal:add', (props) => {
-  state.tabGroups.get('terminalGroup').addTab(new Tab(props))
+  const group = state.tabGroups.get('terminalGroup')
+  if (!group.tabs.find(tab => tab.id === props.id)) {
+    group.addTab(new Tab(props))
+  }
 })
 
 // 如果没有，添加一个
diff --git a/app/extensions/Terminal.ext.js b/app/extensions/Terminal.ext.js
@@ -5,8 +5,8 @@ class Terminal {
   constructor (xterm) {
     this.name = xterm.id
     this.sendText = (text) => {
-      const textArr = text.split(' ')
-      xterm.emit('data', textArr)
+      xterm.emit('data', 'clear\r')
+      xterm.emit('data', text + '\r')
     }
 
     this.active = () => {
@@ -34,5 +34,10 @@ export function registerTerminalOpenHandler (fn) {
 
 export function createTerminal (id, shellPath) {
   addTerminal({ id, cwd: shellPath })
-  return new Terminal(state.terminalManager.getTermById(id))
+  return new Promise(resolve => {
+    setTimeout(() => {
+      const term = state.tabs.get(id).terminal
+      resolve(new Terminal(term))
+    }, 0)
+  })
 }
diff --git a/app/index.html b/app/index.html
@@ -2,7 +2,7 @@
 <html lang="zh-cn">
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1,minimum-scale=1, maximum-scale=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1,minimum-scale=1, maximum-scale=1, shrink-to-fit=no">
   <title>Cloud Studio - 开启云端开发模式 WebIDE</title>
   <meta name="Keywords" content="Coding.net,Coding,WebIDE,Web IDE,IDE,Git,代码托管,在线开发,在线调试,Terminal,开发环境分享,软件团队协作,Cloud Studio">
   <meta name="Description" content="Cloud Studio 是Coding自主研发的在线集成开发环境。用户可以通过 Cloud Studio 创建项目的工作空间，进行在线开发，调试等操作。与此同时，Cloud Studio 还提供了可分享的开发环境功能，用户可以保存当前的 Terminal 环境，分享给团队的其他成员。">

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ class TreeNode extends Component {`
`153`	`153`	`ref={r => (this.nodeDOM = r)}`
`154`	`154`	`onClick={e => selectNode(node)}`
`155`	`155`	`onDoubleClick={e => openNode(node)}`
	`156`	`+ onTouchStart={e => openNode(node)}`
`156`	`157`	style={{ paddingLeft: `${1 + node.depth}em` }}
`157`	`158`	`>`
`158`	`159`	`{node.isLoading && <i className='fa fa-spinner fa-pulse fa-fw' />}`