Commit c66a7b0e authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'build-auto-refresh' into 'master'

Fixed issue with build auto-refresh not working

## What does this MR do?

Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that.

See merge request !5110
parents e33b215e 2044af6c
...@@ -2,7 +2,7 @@ class @CiBuild ...@@ -2,7 +2,7 @@ class @CiBuild
@interval: null @interval: null
@state: null @state: null
constructor: (@build_url, @build_status, @state) -> constructor: (@page_url, @build_url, @build_status, @state) ->
clearInterval(CiBuild.interval) clearInterval(CiBuild.interval)
# Init breakpoint checker # Init breakpoint checker
...@@ -41,7 +41,7 @@ class @CiBuild ...@@ -41,7 +41,7 @@ class @CiBuild
# Only valid for runnig build when output changes during time # Only valid for runnig build when output changes during time
# #
CiBuild.interval = setInterval => CiBuild.interval = setInterval =>
if window.location.href.split("#").first() is @build_url if window.location.href.split("#").first() is @page_url
@getBuildTrace() @getBuildTrace()
, 4000 , 4000
...@@ -57,7 +57,7 @@ class @CiBuild ...@@ -57,7 +57,7 @@ class @CiBuild
getBuildTrace: -> getBuildTrace: ->
$.ajax $.ajax
url: "#{@build_url}/trace.json?state=#{encodeURIComponent(@state)}" url: "#{@page_url}/trace.json?state=#{encodeURIComponent(@state)}"
dataType: "json" dataType: "json"
success: (log) => success: (log) =>
if log.state if log.state
...@@ -70,7 +70,7 @@ class @CiBuild ...@@ -70,7 +70,7 @@ class @CiBuild
$('.js-build-output').html log.html $('.js-build-output').html log.html
@checkAutoscroll() @checkAutoscroll()
else if log.status isnt @build_status else if log.status isnt @build_status
Turbolinks.visit @build_url Turbolinks.visit @page_url
checkAutoscroll: -> checkAutoscroll: ->
$("html,body").scrollTop $("#build-trace").height() if "enabled" is $("#autoscroll-button").data("state") $("html,body").scrollTop $("#build-trace").height() if "enabled" is $("#autoscroll-button").data("state")
......
...@@ -67,4 +67,4 @@ ...@@ -67,4 +67,4 @@
= render "sidebar" = render "sidebar"
:javascript :javascript
new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}") new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment