diff --git a/gulpfile.js b/gulpfile.js index af841fc815..98fd33f140 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -29,10 +29,6 @@ var options = { gulp.task('js', function () { return gulp.src('src/**/*.js') - .pipe(plumber(function(error) { - gutil.log(gutil.colors.red('Error (' + error.plugin + '): ' + error.message)); - this.emit('end'); - })) .pipe(gulpif(options.dev || options.test, sourcemaps.init())) .pipe(react()) .pipe(babel({blacklist: ['regenerator']})) diff --git a/src/ContainerHomeLogs.react.js b/src/ContainerHomeLogs.react.js index d1778a36cf..f890f0596e 100644 --- a/src/ContainerHomeLogs.react.js +++ b/src/ContainerHomeLogs.react.js @@ -3,6 +3,8 @@ var React = require('react/addons'); var LogStore = require('./LogStore'); var Router = require('react-router'); +var _oldScrollTop = 0; + var ContainerHomeLogs = React.createClass({ mixins: [Router.State, Router.Navigation], getInitialState: function () { @@ -22,14 +24,11 @@ var ContainerHomeLogs = React.createClass({ }, componentDidUpdate: function () { // Scroll logs to bottom - var parent = $('.mini-logs'); - if (parent.length) { - if (parent.scrollTop() >= this._oldHeight) { - parent.stop(); - parent.scrollTop(parent[0].scrollHeight - parent.height()); - } - this._oldHeight = parent[0].scrollHeight - parent.height(); + var parent = $('.mini-logs > .widget'); + if (parent.scrollTop() >= _oldScrollTop) { + parent.scrollTop(parent[0].scrollHeight - parent.height()); } + _oldScrollTop = parent.scrollTop(); }, init: function () { this.updateLogs(); diff --git a/src/ContainerLogs.react.js b/src/ContainerLogs.react.js index a08487aac0..dcebccd9d4 100644 --- a/src/ContainerLogs.react.js +++ b/src/ContainerLogs.react.js @@ -3,6 +3,8 @@ var React = require('react/addons'); var LogStore = require('./LogStore'); var Router = require('react-router'); +var _oldScrollTop = 0; + var ContainerLogs = React.createClass({ mixins: [Router.State], getInitialState: function () { @@ -23,13 +25,10 @@ var ContainerLogs = React.createClass({ componentDidUpdate: function () { // Scroll logs to bottom var parent = $('.details-logs'); - if (parent.length) { - if (parent.scrollTop() >= this._oldHeight) { - parent.stop(); - parent.scrollTop(parent[0].scrollHeight - parent.height()); - } - this._oldHeight = parent[0].scrollHeight - parent.height(); + if (parent.scrollTop() >= _oldScrollTop) { + parent.scrollTop(parent[0].scrollHeight - parent.height()); } + _oldScrollTop = parent.scrollTop(); }, init: function () { this.updateLogs(); diff --git a/src/NewContainer.react.js b/src/NewContainer.react.js index 49dc676d74..d0cd7a4908 100644 --- a/src/NewContainer.react.js +++ b/src/NewContainer.react.js @@ -14,7 +14,7 @@ var NewContainer = React.createClass({ getInitialState: function () { return { query: '', - results: [], + results: _recommended, loading: false, tags: {} }; @@ -76,12 +76,10 @@ var NewContainer = React.createClass({ }); }).then(results => { _recommended = results.filter(r => !!r); - if (!this.state.query.length) { - if (this.isMounted()) { - this.setState({ - results: _recommended - }); - } + if (!this.state.query.length && this.isMounted()) { + this.setState({ + results: _recommended + }); } }).catch(err => { console.log(err);