首頁 探索 說明
註冊 登入
ylproj
/
jupyterlab
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge pull request #800 from afshin/terminal-fixes

Terminal fixes
Steven Silvester 8 年之前
父節點
bd1524e856 ec85bca6f3
當前提交
e5f530df8e
共有 5 個文件被更改，包括 35 次插入 和 18 次删除
統一視圖 顯示文件統計
  1. 0 1
      examples/terminal/index.html
  2. 1 1
      examples/terminal/package.json
  3. 10 9
      examples/terminal/src/index.ts
  4. 0 1
      src/default-theme/terminal.less
  5. 24 6
      src/terminal/index.ts

+ 0 - 1
examples/terminal/index.html
查看文件 

@@ -5,7 +5,6 @@
 
     <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 
     <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 
     <script type="text/javascript" src="https://www.promisejs.org/polyfills/promise-6.1.0.js"></script>
 
     <script type="text/javascript" src="https://www.promisejs.org/polyfills/promise-6.1.0.js"></script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.2.0/require.js"></script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.2.0/require.js"></script>
 
-    <link href="index.css" rel="stylesheet">
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <script id='jupyter-config-data' type="application/json">{ "baseUrl": "{{base_url}}" }</script>
 
     <script id='jupyter-config-data' type="application/json">{ "baseUrl": "{{base_url}}" }</script>

+ 1 - 1
examples/terminal/package.json
查看文件 

@@ -12,7 +12,7 @@
 
     "jupyter-js-services": "^0.18.0",
 
     "jupyter-js-services": "^0.18.0",
 
     "jupyterlab": "file:../..",
 
     "jupyterlab": "file:../..",
 
     "phosphor": "^0.6.0",
 
     "phosphor": "^0.6.0",
 
-    "xterm": "^1.0.0"
 
+    "xterm": "^1.1.3"
 
   },
 
   },
 
   "devDependencies": {
 
   "devDependencies": {
 
     "css-loader": "^0.23.1",
 
     "css-loader": "^0.23.1",

+ 10 - 9
examples/terminal/src/index.ts
查看文件 

@@ -19,21 +19,22 @@ import {
 
 
 
 import 'jupyterlab/lib/basestyle/index.css';
 
 import 'jupyterlab/lib/basestyle/index.css';
 
 import 'jupyterlab/lib/default-theme/index.css';
 
 import 'jupyterlab/lib/default-theme/index.css';
 
+import '../index.css';
 
 
 
 
 
 function main(): void {
 
 function main(): void {
 
-  let term1 = new TerminalWidget({ background: 'black',
 
-                                  color: 'white'});
 
-  let term2 = new TerminalWidget({ background: 'white',
 
-                                  color: 'black'});
 
-
 
-  createTerminalSession().then(session => {
 
-    term1.session = session;
 
+  let term1 = new TerminalWidget({
 
+    background: 'black',
 
+    color: 'white'
 
   });
 
   });
 
-  createTerminalSession().then(session => {
 
-    term2.session = session;
 
+  let term2 = new TerminalWidget({
 
+    background: 'white',
 
+    color: 'black'
 
   });
 
   });
 
 
 
+  createTerminalSession().then(session => term1.session = session);
 
+  createTerminalSession().then(session => term2.session = session);
 
+
 
   term1.title.closable = true;
 
   term1.title.closable = true;
 
   term2.title.closable = true;
 
   term2.title.closable = true;
 
   let dock = new DockPanel();
 
   let dock = new DockPanel();

+ 0 - 1
src/default-theme/terminal.less
查看文件 

@@ -11,7 +11,6 @@
 
   min-height: 200px;
 
   min-height: 200px;
 
   padding: 8px;
 
   padding: 8px;
 
   margin: 0;
 
   margin: 0;
 
-  background: red;
 
 }
 
 }

+ 24 - 6
src/terminal/index.ts
查看文件 

@@ -248,12 +248,30 @@ class TerminalWidget extends Widget {
 
    */
 
    */
 
   protected onUpdateRequest(msg: Message): void {
 
   protected onUpdateRequest(msg: Message): void {
 
     // Set the fg and bg colors of the terminal and cursor.
 
     // Set the fg and bg colors of the terminal and cursor.
 
-    this.node.style.backgroundColor = this.background;
 
-    this.node.style.color = this.color;
 
-    this._term.element.style.backgroundColor = this.background;
 
-    this._term.element.style.color = this.color;
 
-    this._sheet.innerHTML = (`#${this.node.id} .terminal-cursor {background:
 
-                             ${this.color};color:${this.background};}`);
 
+    const style = (`
 
+      #${this.node.id} {
 
+        background: ${this.background};
 
+        color: ${this.color};
 
+      }
 
+      #${this.node.id} .xterm-viewport, #${this.node.id} .xterm-rows {
 
+        background-color: ${this.background};
 
+        color: ${this.color};
 
+      }
 
+      #${this.node.id} .terminal.focus .terminal-cursor.blinking {
 
+          animation: ${this.node.id}-blink-cursor 1.2s infinite step-end;
 
+      }
 
+      @keyframes ${this.node.id}-blink-cursor {
 
+          0% {
 
+              background-color: ${this.color};
 
+              color: ${this.background};
 
+          }
 
+          50% {
 
+              background-color: transparent;
 
+              color: ${this.color};
 
+          }
 
+      }
 
+    `);
 
+    this._sheet.innerHTML = style;
 
   }
 
   }
 
 
 
   /**
 
   /**