diff --git a/web/package.json b/web/package.json index db85a44e..6ad5168b 100644 --- a/web/package.json +++ b/web/package.json @@ -42,6 +42,7 @@ "dependencies": { "ansi-256-colors": "^1.1.0", "babel-runtime": "6.22.0", + "event-source-polyfill": "0.0.9", "jsonschema": "1.1.1", "noVNC": "https://github.com/novnc/noVNC.git#0613d18", "react": "15.4.2", diff --git a/web/src/components/Session/style.scss b/web/src/components/Session/style.scss index da8188ac..09e57c8e 100644 --- a/web/src/components/Session/style.scss +++ b/web/src/components/Session/style.scss @@ -82,7 +82,6 @@ $background-color-lighter: #3d444c; margin: -3px 5px 0; padding: 0 5px; - overflow: scroll; background-color: $color-session-name; font-family: "Source Code Pro", Menlo, Monaco, Consolas, "Courier New", monospace; diff --git a/web/src/components/Sessions/style.scss b/web/src/components/Sessions/style.scss index 8b5362af..6a311e1d 100644 --- a/web/src/components/Sessions/style.scss +++ b/web/src/components/Sessions/style.scss @@ -61,8 +61,7 @@ $color-session-name: #555f6a; padding: 0 5px; &__name { - overflow-x: visible; - overflow-y: hidden; + overflow: hidden; background-color: $color-session-name; font-family: "Source Code Pro", Menlo, Monaco, Consolas, "Courier New", monospace; diff --git a/web/src/containers/Viewport/index.js b/web/src/containers/Viewport/index.js index e5da0e68..e38cbde9 100644 --- a/web/src/containers/Viewport/index.js +++ b/web/src/containers/Viewport/index.js @@ -6,12 +6,13 @@ import {Observable} from 'rxjs/Observable'; import {Subject} from 'rxjs/Subject'; import 'rxjs/add/operator/map'; +import 'event-source-polyfill' + import "./style.scss"; import Navigation from "components/Navigation"; import Stats from "containers/Stats"; import Capabilities from "containers/Capabilities"; -import Log from "components/Log"; import Status from "components/Status"; import Sessions from "components/Sessions"; import Session from "components/Session"; @@ -158,7 +159,7 @@ const schema = { }) .retryWhen(errs => errs .do(err => { - console.error('Error connecting to SSE', err.target.url); + console.error('Error connecting to SSE', err.target ? err.target.url : err); errors.next({ sse: "error", status: "unknown" diff --git a/web/yarn.lock b/web/yarn.lock index f69e487a..83a7fe65 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -2047,6 +2047,10 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" +event-source-polyfill@0.0.9: + version "0.0.9" + resolved "https://registry.yarnpkg.com/event-source-polyfill/-/event-source-polyfill-0.0.9.tgz#18c6205d170ab09db889ffceaa33f0e493f14a50" + eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"