diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-05 16:18:25 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-11 17:20:47 +0100 |
| commit | 60fd4188a540368776738896b1e10683b7fa9e65 (patch) | |
| tree | dc68aa818db4522f01f63bdeeb005bf85ced1484 | |
| parent | 8b7ce2adc8fb622ad153dad9ccbc4c47cb699a20 (diff) | |
| download | gitlab-ce-60fd4188a540368776738896b1e10683b7fa9e65.tar.gz | |
Build notification null check
Cancels build notification interval on page change
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 15 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 84a8887fbce..1e3a5847521 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -12,10 +12,19 @@ class @MergeRequestWidget @readyForCICheck = true clearInterval @fetchBuildStatusInterval + @clearEventListeners() + @addEventListeners() @pollCIStatus() notifyPermissions() - setOpts: (@opts) -> + clearEventListeners: -> + $(document).off 'page:change.merge_request' + + addEventListeners: -> + $(document).on 'page:change.merge_request', => + if $('body').data('page') isnt 'projects:merge_requests:show' + clearInterval @fetchBuildStatusInterval + @clearEventListeners() mergeInProgress: (deleteSourceBranch = false)-> $.ajax @@ -63,11 +72,15 @@ class @MergeRequestWidget @firstCICheck = false @opts.ci_status = data.status +<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3 if @opts.ci_status is '' @opts.ci_status = data.status return if data.status isnt @opts.ci_status +======= + if data.status isnt @opts.ci_status and data.status? +>>>>>>> Build notification null check @showCIStatus data.status if data.coverage @showCICoverage data.coverage diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index 92d95358937..003477dda1a 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -8,7 +8,6 @@ = render 'projects/merge_requests/widget/locked' :javascript - var merge_request_widget; var opts = { merge_check_url: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", check_enable: #{@merge_request.unchecked? ? "true" : "false"}, @@ -20,8 +19,4 @@ builds_path: "#{builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}" }; - if(typeof merge_request_widget === 'undefined') { - merge_request_widget = new MergeRequestWidget(opts); - } else { - merge_request_widget.setOpts(opts); - } + new MergeRequestWidget(opts); |