Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #75 from aerokube/win
Browse files Browse the repository at this point in the history
fix win issues (add event source polifyll)
  • Loading branch information
lanwen authored Sep 6, 2017
2 parents df82d82 + 2dfa705 commit 27c6a0f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion web/src/components/Session/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions web/src/components/Sessions/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 3 additions & 2 deletions web/src/containers/Viewport/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,10 @@ event-emitter@~0.3.5:
d "1"
es5-ext "~0.10.14"

[email protected]:
version "0.0.9"
resolved "https://registry.yarnpkg.com/event-source-polyfill/-/event-source-polyfill-0.0.9.tgz#18c6205d170ab09db889ffceaa33f0e493f14a50"

[email protected]:
version "1.2.0"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
Expand Down

0 comments on commit 27c6a0f

Please sign in to comment.