From 5f5772501b8588f69c2c1c011d5252c6d3c70fb1 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Thu, 20 Jul 2017 23:08:46 +0200
Subject: [PATCH] apply styles on start and to the terminal iframe (fixes #134)

---
 terminus-core/src/services/themes.service.ts              | 2 +-
 terminus-terminal/src/components/terminalTab.component.ts | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/terminus-core/src/services/themes.service.ts b/terminus-core/src/services/themes.service.ts
index 6e052664..5b199150 100644
--- a/terminus-core/src/services/themes.service.ts
+++ b/terminus-core/src/services/themes.service.ts
@@ -13,7 +13,6 @@ export class ThemesService {
         this.applyCurrentTheme()
         config.changed$.subscribe(() => {
             this.applyCurrentTheme()
-            document.querySelector('style#custom-css').innerHTML = config.store.appearance.css
         })
     }
 
@@ -32,6 +31,7 @@ export class ThemesService {
             document.querySelector('head').appendChild(this.styleElement)
         }
         this.styleElement.textContent = theme.css
+        document.querySelector('style#custom-css').innerHTML = this.config.store.appearance.css
     }
 
     applyCurrentTheme (): void {
diff --git a/terminus-terminal/src/components/terminalTab.component.ts b/terminus-terminal/src/components/terminalTab.component.ts
index 73f1d0af..39dc54cf 100644
--- a/terminus-terminal/src/components/terminalTab.component.ts
+++ b/terminus-terminal/src/components/terminalTab.component.ts
@@ -21,7 +21,6 @@ export class TerminalTabComponent extends BaseTabComponent {
     @ViewChild('content') content
     @HostBinding('style.background-color') backgroundColor: string
     hterm: any
-    configSubscription: Subscription
     sessionCloseSubscription: Subscription
     hotkeysSubscription: Subscription
     bell$ = new Subject()
@@ -48,9 +47,6 @@ export class TerminalTabComponent extends BaseTabComponent {
         super()
         this.decorators = this.decorators || []
         this.title = 'Terminal'
-        this.configSubscription = config.changed$.subscribe(() => {
-            this.configure()
-        })
         this.resize$.first().subscribe(async (resizeEvent) => {
             this.session = this.sessions.addSession(
                 Object.assign({}, this.sessionOptions, resizeEvent)
@@ -99,6 +95,7 @@ export class TerminalTabComponent extends BaseTabComponent {
 
     ngOnInit () {
         this.focused$.subscribe(() => {
+            this.configure()
             setTimeout(() => {
                 this.hterm.scrollPort_.resize()
                 this.hterm.scrollPort_.focus()
@@ -294,6 +291,7 @@ export class TerminalTabComponent extends BaseTabComponent {
                 }
             `
         }
+        css += config.appearance.css
         preferenceManager.set('user-css', dataurl.convert({
             data: css,
             mimetype: 'text/css',
@@ -322,7 +320,6 @@ export class TerminalTabComponent extends BaseTabComponent {
         this.decorators.forEach(decorator => {
             decorator.detach(this)
         })
-        this.configSubscription.unsubscribe()
         this.hotkeysSubscription.unsubscribe()
         if (this.sessionCloseSubscription) {
             this.sessionCloseSubscription.unsubscribe()