Merge pull request #3142 from pinpins/master

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-node_js: 11
+node_js: 10
 
 stages:
   - Build

terminus-core/src/components/tabHeader.component.pug

@@ -1,7 +1,7 @@
 .progressbar([style.width]='progress + "%"', *ngIf='progress != null')
-.index(
+.index(*ngIf='!config.store.terminal.disableTabIndex',
     #handle,
     [style.background-color]='tab.color',
 ) {{index + 1}}
 .name([title]='tab.customTitle || tab.title') {{tab.customTitle || tab.title}}
-button((click)='app.closeTab(tab, true)') ×
+button(*ngIf='!config.store.terminal.disableCloseButton',(click)='app.closeTab(tab, true)') ×

terminus-core/src/components/tabHeader.component.ts

@@ -9,6 +9,7 @@ import { HotkeysService } from '../services/hotkeys.service'
 import { ElectronService } from '../services/electron.service'
 import { AppService } from '../services/app.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
+import { ConfigService } from '../services/config.service'
 
 /** @hidden */
 export interface SortableComponentProxy {
@@ -31,6 +32,7 @@ export class TabHeaderComponent {
 
     private constructor (
         public app: AppService,
+        public config: ConfigService,
         private electron: ElectronService,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,

terminus-ssh/package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "build": "webpack --progress --color",
     "watch": "webpack --progress --color --watch",
-    "postinstall": "xcopy /i node_modules\\ssh2\\util\\pagent.exe util\\"
+    "postinstall:win32": "xcopy /i node_modules\\ssh2\\util\\pagent.exe util\\"
   },
   "files": [
     "dist",

terminus-terminal/src/components/appearanceSettingsTab.component.pug

@@ -109,6 +109,24 @@ h3.mb-3 Appearance
         (ngModelChange)='config.save()',
     )
 
+.form-line
+    .header
+        .title Disable tab index
+
+    toggle(
+        [(ngModel)]='config.store.terminal.disableTabIndex',
+        (ngModelChange)='config.save();',
+    )
+
+.form-line
+    .header
+        .title Disable tab close button
+
+    toggle(
+        [(ngModel)]='config.store.terminal.disableCloseButton',
+        (ngModelChange)='config.save();',
+    )
+
 .form-line
     .header
         .title Fallback font

terminus-terminal/src/config.ts

@@ -23,6 +23,8 @@ export class TerminalConfigProvider extends ConfigProvider {
             ligatures: false,
             cursor: 'block',
             cursorBlink: true,
+            disableTabIndex: false,
+            disableCloseButton: false,
             customShell: '',
             rightClick: 'menu',
             pasteOnMiddleClick: true,