Krinkle has submitted this change and it was merged.
Change subject: Zuul status page: Clean up status.js
......................................................................
Zuul status page: Clean up status.js
* Use dot notatation instead of bracket notation with string literals
* Strict comparison
* Missing semicolons
* Scope of 'html' variable in asynchronous action
* Chain jQuery method instead of re-selecting the same css
selector from the DOM:
$(foo).bar(); $(foo).quux(); -> $(foo).bar().quux();
* Use .empty() instead of .html('')
* Use .text() for text instead of .html()
.html will trigger html parser where text will simply create
a text node with the string literal, much faster, safer and
semantically correct.
* Consistently use single quotes.
* Fix implied global variable leak 'result'.
Change-Id: I44231de5297ce21c1c4408ae7443ef1cab7dd41e
---
M org/wikimedia/integration/zuul/status.js
1 file changed, 47 insertions(+), 37 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/org/wikimedia/integration/zuul/status.js
b/org/wikimedia/integration/zuul/status.js
index 3acc78f..e7f6b68 100644
--- a/org/wikimedia/integration/zuul/status.js
+++ b/org/wikimedia/integration/zuul/status.js
@@ -1,4 +1,8 @@
+// Client script for Zuul status page.
+//
// Copyright 2012 OpenStack Foundation
+// Copyright 2013 Timo Tijhof
+// Copyright 2013 Wikimedia Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License. You may obtain
@@ -12,30 +16,32 @@
// License for the specific language governing permissions and limitations
// under the License.
+/*jshint eqnull:true */
+
window.zuul_enable_status_updates = true;
function format_pipeline(data) {
var html = '<div class="pipeline"><h3 class="subhead">'+
- data['name']+'</h3>';
- if (data['description'] != null) {
- html += '<p>'+data['description']+'</p>';
+ data.name+'</h3>';
+ if (data.description != null) {
+ html += '<p>'+data.description+'</p>';
}
- $.each(data['change_queues'], function(change_queue_i, change_queue) {
- $.each(change_queue['heads'], function(head_i, head) {
- if (data['change_queues'].length > 1 && head_i == 0) {
+ $.each(data.change_queues, function(change_queue_i, change_queue) {
+ $.each(change_queue.heads, function(head_i, head) {
+ if (data.change_queues.length > 1 && head_i === 0) {
html += '<div> Change queue: ';
- var name = change_queue['name'];
+ var name = change_queue.name;
html += '<a title="' + name + '">';
if (name.length > 32) {
name = name.substr(0,32) + '...';
}
- html += name + '</a></div>'
+ html += name + '</a></div>';
}
$.each(head, function(change_i, change) {
if (change_i > 0) {
- html += '<div class="arrow">↑</div>'
+ html += '<div class="arrow">↑</div>';
}
html += format_change(change);
});
@@ -49,9 +55,9 @@
function format_change(change) {
var html = '<div class="change"><div class="header">';
- html += '<span class="project">'+change['project']+'</span>';
- var id = change['id'];
- var url = change['url'];
+ html += '<span class="project">'+change.project+'</span>';
+ var id = change.id;
+ var url = change.url;
if (id.length == 40) {
id = id.substr(0,7);
}
@@ -65,34 +71,34 @@
}
html += '</span></div><div class="jobs">';
- $.each(change['jobs'], function(i, job) {
- result = job['result'];
- var result_class = "result";
+ $.each(change.jobs, function(i, job) {
+ var result = job.result;
+ var result_class = 'result';
if (result == null) {
- if (job['url'] != null) {
+ if (job.url != null) {
result = 'in progress';
} else {
result = 'queued';
}
} else if (result == 'SUCCESS') {
- result_class += " result_success";
+ result_class += ' result_success';
} else if (result == 'FAILURE') {
- result_class += " result_failure";
+ result_class += ' result_failure';
} else if (result == 'LOST') {
- result_class += " result_unstable";
+ result_class += ' result_unstable';
} else if (result == 'UNSTABLE') {
- result_class += " result_unstable";
+ result_class += ' result_unstable';
}
html += '<span class="job">';
- if (job['url'] != null) {
- html += '<a href="'+job['url']+'">';
+ if (job.url != null) {
+ html += '<a href="'+job.url+'">';
}
- html += job['name'];
- if (job['url'] != null) {
+ html += job.name;
+ if (job.url != null) {
html += '</a>';
}
html += ': <span class="'+result_class+'">'+result+'</span>';
- if (job['voting'] == false) {
+ if (job.voting === false) {
html += ' (non-voting)';
}
html += '</span>';
@@ -121,37 +127,41 @@
}
function update() {
- var html = '';
$.getJSON('/zuul/status.json', function(data) {
+ var html = '';
if ('message' in data) {
- $("#message").attr('class', 'alertbox');
- $("#message").html(data['message']);
+ $('#message')
+ .attr('class', 'alertbox')
+ .html(data.message);
} else {
- $("#message").removeClass('alertbox');
- $("#message").html('');
+ $('#message')
+ .removeClass('alertbox')
+ .empty();
}
html += '<br style="clear:both"/>';
- $.each(data['pipelines'], function(i, pipeline) {
+ $.each(data.pipelines, function(i, pipeline) {
html = html + format_pipeline(pipeline);
});
html += '<br style="clear:both"/>';
- $("#pipeline-container").html(html);
+ $('#pipeline-container').html(html);
- $("#trigger_event_queue_length").html(
- data['trigger_event_queue']['length']);
- $("#result_event_queue_length").html(
- data['result_event_queue']['length']);
+ $('#trigger_event_queue_length').text(
+ data.trigger_event_queue.length
+ );
+ $('#result_event_queue_length').text(
+ data.result_event_queue.length
+ );
});
}
function update_graphs() {
$('.graph').each(function(i, img) {
- var newimg = new Image()
+ var newimg = new Image();
var parts = img.src.split('#');
newimg.src = parts[0] + '#' + new Date().getTime();
$(newimg).load(function (x) {
--
To view, visit https://gerrit.wikimedia.org/r/57895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44231de5297ce21c1c4408ae7443ef1cab7dd41e
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle <ttij...@wikimedia.org>
Gerrit-Reviewer: Krinkle <ttij...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
