From 6deae83a1b4612bd5408dd08eb6dfd545a4c12cc Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 29 Jan 2016 16:32:49 +0100 Subject: [PATCH] Only hide #log element, so it's always in the DOM When a job is not started, we will show a message that the log can't be shown. If a pusher message with a state change comes after the first log pusher message, travis-web-log will error out, because in such a situation a DOM element wouldn't be available. To make it always work, this commit changes the behaviour to just hide #log element with CSS instead of using {{#if}}. --- app/styles/app/main/log.sass | 3 +++ app/templates/components/log-content.hbs | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/styles/app/main/log.sass b/app/styles/app/main/log.sass index f20172ab..bbf8d082 100644 --- a/app/styles/app/main/log.sass +++ b/app/styles/app/main/log.sass @@ -248,3 +248,6 @@ @media #{$medium-up} height: 70px line-height: 70px + +.log-container.hidden + display: none diff --git a/app/templates/components/log-content.hbs b/app/templates/components/log-content.hbs index dee27c71..4a21dd2d 100644 --- a/app/templates/components/log-content.hbs +++ b/app/templates/components/log-content.hbs @@ -25,8 +25,10 @@ {{/if}} {{#if job.notStarted}} -
Hang tight, the log cannot be shown until the build has started.
- {{else}} +
Hang tight, the log cannot be shown until the build has started.
+ {{/if}} + +
{{eye-icon}} View log @@ -62,11 +64,12 @@ {{/if}}
+ {{#if limited}}

This log is too long to be displayed. Please reduce the verbosity of your build or download the raw log.

{{/if}} - {{/if}} +