From 20e779a147e4717f53e038a2d1e0ac5108e0b64d Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 17 Feb 2015 10:26:20 -0800 Subject: [PATCH] Don't show jQuery errors and scroll mini logs --- src/ContainerHomePreview.react.js | 25 ++++++++++--------------- styles/containers.less | 4 ++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/ContainerHomePreview.react.js b/src/ContainerHomePreview.react.js index 5cfe2a65d6..8d48f50cd0 100644 --- a/src/ContainerHomePreview.react.js +++ b/src/ContainerHomePreview.react.js @@ -4,8 +4,7 @@ var exec = require('exec'); var ContainerStore = require('./ContainerStore'); var ContainerUtil = require('./ContainerUtil'); var Router = require('react-router'); -var Promise = require('bluebird'); -var $ = require('jquery'); +var request = require('request'); var ContainerHomePreview = React.createClass({ mixins: [Router.State, Router.Navigation], @@ -24,20 +23,16 @@ var ContainerHomePreview = React.createClass({ reload: function () { var webview = document.getElementById('webview'); if (webview) { - try { - var url = webview.src; - Promise.resolve($.get(url)).then(() => { - webview.reload(); - }).catch(err => { - if (err.status === 0) { - setTimeout(this.reload, 2000); - } else { + var url = webview.src; + request(url, err => { + if (err && err.code === 'ECONNREFUSED') { + setTimeout(this.reload, 2000); + } else { + try { webview.reload(); - } - }); - } catch (err) { - - } + } catch (err) {} + } + }); } }, componentDidUpdate: function () { diff --git a/styles/containers.less b/styles/containers.less index 4b0bc05324..5960529d93 100644 --- a/styles/containers.less +++ b/styles/containers.less @@ -827,6 +827,10 @@ font-family: Menlo; font-size: 7px; white-space: pre; + .logs { + overflow: auto; + height: 100%; + } p { margin-bottom: 0px; }