Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-06 12:16:16 +0300
committerPhil Hughes <me@iamphill.com>2016-07-06 12:16:16 +0300
commit2044af6ced27a28f87cf05ca6f2b0f7cb41031df (patch)
tree41641a41839c882ec712772e532cfb54b87c1c86 /app/assets/javascripts/ci
parentcfd5870b62e9d76e564ffc64db1d1281b4a363bb (diff)
Fixed issue with build auto-refresh not working
Diffstat (limited to 'app/assets/javascripts/ci')
-rw-r--r--app/assets/javascripts/ci/build.coffee8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index 2d515d7efa2..74691b2c1b5 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -2,7 +2,7 @@ class @CiBuild
@interval: null
@state: null
- constructor: (@build_url, @build_status, @state) ->
+ constructor: (@page_url, @build_url, @build_status, @state) ->
clearInterval(CiBuild.interval)
# Init breakpoint checker
@@ -41,7 +41,7 @@ class @CiBuild
# Only valid for runnig build when output changes during time
#
CiBuild.interval = setInterval =>
- if window.location.href.split("#").first() is @build_url
+ if window.location.href.split("#").first() is @page_url
@getBuildTrace()
, 4000
@@ -57,7 +57,7 @@ class @CiBuild
getBuildTrace: ->
$.ajax
- url: "#{@build_url}/trace.json?state=#{encodeURIComponent(@state)}"
+ url: "#{@page_url}/trace.json?state=#{encodeURIComponent(@state)}"
dataType: "json"
success: (log) =>
if log.state
@@ -70,7 +70,7 @@ class @CiBuild
$('.js-build-output').html log.html
@checkAutoscroll()
else if log.status isnt @build_status
- Turbolinks.visit @build_url
+ Turbolinks.visit @page_url
checkAutoscroll: ->
$("html,body").scrollTop $("#build-trace").height() if "enabled" is $("#autoscroll-button").data("state")