Skip to content

CIRCLE / cloud

Go to a project
Commit 6cb335d7 by Őry Máté
Options

fix js code style

parent 411a478b
Showing with 131 additions and 133 deletions
circle/dashboard/static/dashboard/disk-list.js
......@@ -8,16 +8,16 @@ $(function() {
function refreshDisk(disk, element) {
$.get("/dashboard/disk/" + disk + "/status/", function(result) {
if(result.percentage == null || result.failed == "True") {
location.reload();
if(result.percentage === null || result.failed == "True") {
location.reload();
} else {
var diff = result.percentage - parseInt(element.html());
var refresh = 5 - diff;
refresh = refresh < 1 ? 1 : (result.percentage == 0 ? 1 : refresh);
refresh = refresh < 1 ? 1 : (result.percentage === 0 ? 1 : refresh);
if(isNaN(refresh)) refresh = 2; // this should not happen
element.html(result.percentage);
setTimeout(function() {refreshDisk(disk, element)}, refresh * 1000);
setTimeout(function() {refreshDisk(disk, element);}, refresh * 1000);
}
});
}
circle/dashboard/static/dashboard/group-details.js
......@@ -14,7 +14,7 @@
data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) {
$("#group-details-h1-name").html(data['new_name']).show();
$("#group-details-h1-name").html(data.new_name).show();
$('#group-details-rename').hide();
// addMessage(data['message'], "success");
},
......@@ -51,14 +51,14 @@
function removeMember(data) {
$.ajax({
type: 'POST',
url: data['url'],
url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
data['tr'].fadeOut(function() {
data.tr.fadeOut(function() {
$(this).remove();});
},
error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger')
addMessage('Uh oh :(', 'danger');
}
});
}
......
circle/dashboard/static/dashboard/group-list.js
......@@ -7,7 +7,7 @@ $(function() {
/* rename ajax */
$('.group-list-rename-submit').click(function() {
var row = $(this).closest("tr")
var row = $(this).closest("tr");
var name = $('#group-list-rename-name', row).val();
var url = '/dashboard/group/' + row.children("td:first-child").text().replace(" ", "") + '/';
$.ajax({
......@@ -16,12 +16,12 @@ $(function() {
data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) {
$("#group-list-column-name", row).html(
$("<a/>", {
'class': "real-link",
href: "/dashboard/group/" + data['group_pk'] + "/",
text: data['new_name']
href: "/dashboard/group/" + data.group_pk + "/",
text: data.new_name
})
).show();
$('#group-list-rename', row).hide();
......
circle/dashboard/static/dashboard/node-details.js
......@@ -15,9 +15,9 @@ $(function() {
data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) {
$("#node-details-h1-name").html(data['new_name']).show();
$("#node-details-h1-name").html(data.new_name).show();
$('#node-details-rename').hide();
// addMessage(data['message'], "success");
// addMessage(data.message, "success");
},
error: function(xhr, textStatus, error) {
addMessage("Error during renaming!", "danger");
......@@ -34,7 +34,7 @@ $(function() {
$('.node-enable').click(function() {
var node_pk = $(this).data('node-pk');
var dir = window.location.pathname.indexOf('list') == -1;
addModalConfirmation(changeNodeStatus,
addModalConfirmation(changeNodeStatus,
{ 'url': '/dashboard/node/status/' + node_pk + '/',
'data': [],
'pk': node_pk,
......@@ -51,17 +51,17 @@ $(function() {
$.ajax({
type: 'POST',
url: location.href,
headers: {"X-CSRFToken": getCookie('csrftoken')},
headers: {"X-CSRFToken": getCookie('csrftoken')},
data: {'to_remove': to_remove},
success: function(re) {
if(re['message'].toLowerCase() == "success") {
if(re.message.toLowerCase() == "success") {
$(clicked).closest(".label").fadeOut(500, function() {
$(this).remove();
});
}
},
error: function() {
addMessage(re['message'], 'danger');
addMessage(re.message, 'danger');
}
});
......@@ -73,18 +73,18 @@ $(function() {
function changeNodeStatus(data) {
$.ajax({
type: 'POST',
url: data['url'],
url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
if(!data['redirect']) {
if(!data.redirect) {
selected = [];
addMessage(re['message'], 'success');
addMessage(re.message, 'success');
} else {
window.location.replace('/dashboard');
}
},
error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger')
addMessage('Uh oh :(', 'danger');
}
});
}
circle/dashboard/static/dashboard/node-list.js
......@@ -4,12 +4,10 @@ $(function() {
});
// find disabled nodes, set danger (red) on the rows
function colortable()
function colortable()
{
var tr= $('.false').closest("tr");
tr.addClass('danger');
var tr= $('.true').closest("tr");
tr.removeClass('danger');
$('.false').closest("tr").addClass('danger');
$('.true').closest("tr").removeClass('danger');
}
/* rename */
......@@ -20,7 +18,7 @@ $(function() {
/* rename ajax */
$('.node-list-rename-submit').click(function() {
var row = $(this).closest("tr")
var row = $(this).closest("tr");
var name = $('#node-list-rename-name', row).val();
var url = '/dashboard/node/' + row.children("td:first-child").text().replace(" ", "") + '/';
$.ajax({
......@@ -29,12 +27,12 @@ $(function() {
data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) {
$("#node-list-column-name", row).html(
$("<a/>", {
'class': "real-link",
href: "/dashboard/node/" + data['node_pk'] + "/",
text: data['new_name']
href: "/dashboard/node/" + data.node_pk + "/",
text: data.new_name
})
).show();
$('#node-list-rename', row).hide();
......@@ -50,7 +48,7 @@ $(function() {
function statuschangeSuccess(tr){
var tspan=tr.children('.enabled').children();
var buttons=tr.children('.actions').children('.btn-group').children('.dropdown-menu').children('li').children('.node-enable');
buttons.each(function(index){
if ($(this).css("display")=="block"){
$(this).css("display","none");
......@@ -58,12 +56,12 @@ $(function() {
else{
$(this).css("display","block");
}
});
});
if(tspan.hasClass("false")){
tspan.removeClass("false");
tspan.addClass("true");
tspan.text("✔");
}
}
else{
tspan.removeClass("true");
tspan.addClass("false");
......
circle/dashboard/static/dashboard/profile.js
......@@ -7,10 +7,10 @@ $(function() {
$.ajax({
type: 'POST',
url:"/dashboard/profile/" + user + "/use_gravatar/",
headers: {"X-CSRFToken": getCookie('csrftoken')},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re) {
if(re.new_avatar_url) {
$("#dashboard-profile-avatar").prop("src", re.new_avatar_url);
$("#dashboard-profile-avatar").prop("src", re.new_avatar_url);
}
},
error: function(xhr, textStatus, error) {
......
circle/dashboard/static/dashboard/store.js
......@@ -25,18 +25,18 @@ $(function() {
$('#store-upload-form button[type="submit"] i').addClass("fa-spinner fa-spin");
var current_dir = $("#store-upload-form").find('[name="current_dir"]').val();
$.get($("#store-upload-form").data("action") + "?current_dir=" + current_dir, function(result) {
$("#store-upload-form").get(0).setAttribute("action", result['url']);
$("#store-upload-form").get(0).setAttribute("action", result.url);
$("#store-upload-form").submit();
});
return false;
});
/* "fake" browse button */
$("#store-list-container").on("click", "#store-upload-browse", function() {
$('#store-upload-form input[type="file"]').click();
});
$("#store-list-container").on("change", "#store-upload-file", function() {
var input = $(this);
var numFiles = input.get(0).files ? input.get(0).files.length : 1;
......
circle/dashboard/static/dashboard/template-list.js
......@@ -20,7 +20,7 @@ $(function() {
});
return false;
});
/* template table sort */
var ttable = $(".template-list-table").stupidtable();
......@@ -37,7 +37,7 @@ $(function() {
// only if js is enabled
$(".template-list-table thead th").css("cursor", "pointer");
$(".template-list-table th a").on("click", function(event) {
event.preventDefault();
});
......@@ -48,16 +48,16 @@ $(function() {
function deleteTemplate(data) {
$.ajax({
type: 'POST',
url: data['url'],
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
addMessage(re['message'], 'success');
$('a[data-template-pk="' + data['template_pk'] + '"]').closest('tr').fadeOut(function() {
url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
addMessage(re.message, 'success');
$('a[data-template-pk="' + data.template_pk + '"]').closest('tr').fadeOut(function() {
$(this).remove();
});
},
error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger')
addMessage('Uh oh :(', 'danger');
}
});
}
......@@ -67,16 +67,16 @@ function deleteTemplate(data) {
function deleteLease(data) {
$.ajax({
type: 'POST',
url: data['url'],
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
addMessage(re['message'], 'success');
$('a[data-lease-pk="' + data['lease_pk'] + '"]').closest('tr').fadeOut(function() {
url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
addMessage(re.message, 'success');
$('a[data-lease-pk="' + data.lease_pk + '"]').closest('tr').fadeOut(function() {
$(this).remove();
});
},
error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger')
addMessage('Uh oh :(', 'danger');
}
});
}
circle/dashboard/static/dashboard/vm-common.js
......@@ -74,7 +74,7 @@ $(function() {
},
error: function(xhr, textStatus, error) {
$('#confirmation-modal').modal("hide");
if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger");
} else {
......
circle/dashboard/static/dashboard/vm-console.js
......@@ -6,7 +6,7 @@ $(function() {
var rfb;
function updateState(rfb, state, oldstate, msg) {
$('#_console .btn-toolbar button').attr('disabled', !(state === "normal"));
$('#_console .btn-toolbar button').attr('disabled', (state !== "normal"));
rfb.sendKey(0xffe3); // press and release ctrl to kill screensaver
if (typeof(msg) !== 'undefined') {
......@@ -42,13 +42,13 @@ $(function() {
if (window.location.port == 8080) {
port = 9999;
} else {
port = window.location.port == "" ? "443" : window.location.port;
port = window.location.port === "" ? "443" : window.location.port;
}
password = '';
$('#_console .btn-toolbar button').attr('disabled', true);
$('#noVNC_status').html('Retreiving authorization token.');
$.get(VNC_URL, function(data) {
if (data.indexOf('vnc') != 0) {
if (data.indexOf('vnc') !== 0) {
$('#noVNC_status').html('No authorization token received.');
}
else {
......
circle/dashboard/static/dashboard/vm-create.js
......@@ -18,7 +18,7 @@ function vmCreateLoaded() {
$(".customize-vm").click(function() {
var template = $(this).data("template-pk");
$.get("/dashboard/vm/create/?template=" + template, function(data) {
var r = $('#create-modal'); r.next('div').remove(); r.remove();
$('body').append(data);
......@@ -34,7 +34,7 @@ function vmCreateLoaded() {
});
return false;
});
/* start vm button clicks */
$('.vm-create-start').click(function() {
template = $(this).data("template-pk");
......@@ -60,7 +60,7 @@ function vmCreateLoaded() {
},
error: function(xhr, textStatus, error) {
var r = $('#create-modal'); r.next('div').remove(); r.remove();
if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger");
} else {
......@@ -77,7 +77,7 @@ function vmCreateLoaded() {
var now = $(this).attr('aria-valuenow');
var siz = (now-min)*100/(max-min);
$(this).css('width', siz+'%');
});
});
}
......@@ -93,18 +93,18 @@ function vmCustomizeLoaded() {
// remove the hex chars
name = name.substring(name.indexOf(" "), name.length);
if ($('#vm-create-network-list').children('span').length < 1) {
if ($('#vm-create-network-list').children('span').length < 1) {
$('#vm-create-network-list').html('');
}
}
$('#vm-create-network-list').append(
vmCreateNetworkLabel(vlan_pk, name, managed)
);
/* select the network in the hidden network select */
$('#vm-create-network-add-vlan option[value="' + vlan_pk + '"]').prop('selected', true);
$('option:selected', $('#vm-create-network-add-select')).remove();
/* add dummy text if no more networks are available */
if($('#vm-create-network-add-select option').length < 1) {
$('#vm-create-network-add-button').attr('disabled', true);
......@@ -117,23 +117,23 @@ function vmCustomizeLoaded() {
/* remove network */
// event for network remove button (icon, X)
$('body').on('click', '.vm-create-remove-network', function() {
var vlan_pk = ($(this).parent('span').prop('id')).replace('vlan-', '')
var vlan_pk = ($(this).parent('span').prop('id')).replace('vlan-', '');
// if it's "blue" then it's managed, kinda not cool
var managed = $(this).parent('span').hasClass('label-primary');
$(this).parent('span').fadeOut(500, function() {
/* if ther are no more vlans disabled the add button */
if($('#vm-create-network-add-select option')[0].value == -1) {
$('#vm-create-network-add-button').attr('disabled', false);
if($('#vm-create-network-add-select option')[0].value == -1) {
$('#vm-create-network-add-button').attr('disabled', false);
$('#vm-create-network-add-select').html('');
}
/* remove the network label */
$(this).remove();
$(this).remove();
var vlan_name = $(this).text();
var html = '<option data-managed="' + (managed ? 1 : 0) + '" value="' + vlan_pk + '">'+
var html = '<option data-managed="' + (managed ? 1 : 0) + '" value="' + vlan_pk + '">'+
(managed ? "&#xf0ac;": "&#xf0c1;") + vlan_name + '</option>';
$('#vm-create-network-add-select').append(html);
......@@ -148,7 +148,7 @@ function vmCustomizeLoaded() {
/* copy networks from hidden select */
$('#vm-create-network-add-vlan option').each(function() {
var managed = $(this).text().indexOf("mana") == 0;
var managed = $(this).text().indexOf("mana") === 0;
var raw_text = $(this).text();
var pk = $(this).val();
if(managed) {
......@@ -157,7 +157,7 @@ function vmCustomizeLoaded() {
text = raw_text.replace("unmanaged -", "&#xf0c1;");
}
var html = '<option data-managed="' + (managed ? 1 : 0) + '" value="' + pk + '">' + text + '</option>';
if($('#vm-create-network-list span').length < 1) {
$("#vm-create-network-list").html("");
}
......@@ -180,7 +180,7 @@ function vmCustomizeLoaded() {
vlans.push({
'name': $(this).text().replace("unmanaged -", "&#xf0c1;").replace("managed -", "&#xf0ac;"),
'pk': parseInt($(this).val()),
'managed': $(this).text().indexOf("mana") == 0,
'managed': $(this).text().indexOf("mana") === 0,
});
});
......@@ -248,7 +248,7 @@ function vmCustomizeLoaded() {
},
error: function(xhr, textStatus, error) {
var r = $('#create-modal'); r.next('div').remove(); r.remove();
if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger");
} else {
......@@ -260,8 +260,8 @@ function vmCustomizeLoaded() {
});
/* for no js stuff */
$('.no-js-hidden').show();
$('.js-hidden').hide();
$('.no-js-hidden').show();
$('.js-hidden').hide();
}
......
circle/dashboard/static/dashboard/vm-details.js
......@@ -41,7 +41,7 @@ $(function() {
var vm = $(this).data("vm");
$.ajax({
type: 'POST',
url: "/dashboard/vm/" + vm + "/op/resources_change/",
url: "/dashboard/vm/" + vm + "/op/resources_change/",
data: $('#vm-details-resources-form').serialize(),
success: function(data, textStatus, xhr) {
if(data.success) {
......@@ -57,7 +57,7 @@ $(function() {
addMessage("500 Internal Server Error", "danger");
} else {
addMessage(xhr.status + " Unknown Error", "danger");
}
}
}
});
return false;
......@@ -70,17 +70,17 @@ $(function() {
$.ajax({
type: 'POST',
url: location.href,
headers: {"X-CSRFToken": getCookie('csrftoken')},
headers: {"X-CSRFToken": getCookie('csrftoken')},
data: {'to_remove': to_remove},
success: function(re) {
if(re['message'].toLowerCase() == "success") {
if(re.message.toLowerCase() == "success") {
$(clicked).closest(".label").fadeOut(500, function() {
$(this).remove();
});
}
},
error: function() {
addMessage(re['message'], 'danger');
addMessage(re.message, 'danger');
}
});
......@@ -89,7 +89,7 @@ $(function() {
/* remove port */
$('.vm-details-remove-port').click(function() {
addModalConfirmation(removePort,
addModalConfirmation(removePort,
{
'url': $(this).prop("href"),
'data': [],
......@@ -100,13 +100,13 @@ $(function() {
/* for js fallback */
$("#vm-details-pw-show").parent("div").children("input").prop("type", "password");
/* show password */
$("#vm-details-pw-show").click(function() {
var input = $(this).parent("div").children("input");
var eye = $(this).children("#vm-details-pw-eye");
eye.tooltip("destroy")
eye.tooltip("destroy");
if(eye.hasClass("fa-eye")) {
eye.removeClass("fa-eye").addClass("fa-eye-slash");
input.prop("type", "text");
......@@ -148,7 +148,7 @@ $(function() {
}
});
} else {
$("#vm-details-pw-confirm").fadeOut();
$("#vm-details-pw-confirm").fadeOut();
}
return false;
});
......@@ -168,7 +168,7 @@ $(function() {
/* for interface remove buttons */
$('.interface-remove').click(function() {
var interface_pk = $(this).data('interface-pk');
addModalConfirmation(removeInterface,
addModalConfirmation(removeInterface,
{ 'url': '/dashboard/interface/' + interface_pk + '/delete/',
'data': [],
'pk': interface_pk,
......@@ -181,15 +181,15 @@ $(function() {
function removeInterface(data) {
$.ajax({
type: 'POST',
url: data['url'],
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
/* remove the html element */
$('a[data-interface-pk="' + data.pk + '"]').closest("div").fadeOut();
location.reload();
},
error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger')
addMessage('Uh oh :(', 'danger');
}
});
}
......@@ -219,12 +219,12 @@ $(function() {
data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) {
$(".vm-details-home-edit-name").text(data['new_name']).show();
$(".vm-details-home-edit-name").text(data.new_name).show();
$(".vm-details-home-edit-name").parent("div").show();
$(".vm-details-home-edit-name-click").show();
$(".vm-details-home-rename-form-div").hide();
// update the inputs too
$(".vm-details-rename-submit").parent("span").prev("input").val(data['new_name']);
$(".vm-details-rename-submit").parent("span").prev("input").val(data.new_name);
},
error: function(xhr, textStatus, error) {
addMessage("Error during renaming!", "danger");
......@@ -232,7 +232,7 @@ $(function() {
});
return false;
});
/* update description click */
$(".vm-details-home-edit-description-click").click(function() {
$(".vm-details-home-edit-description-click").hide();
......@@ -241,10 +241,10 @@ $(function() {
var tmp = ta.val();
ta.val("");
ta.focus();
ta.val(tmp)
ta.val(tmp);
return false;
});
/* description update ajax */
$('.vm-details-description-submit').click(function() {
var description = $(this).prev("textarea").val();
......@@ -254,14 +254,14 @@ $(function() {
data: {'new_description': description},
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) {
var new_desc = data['new_description'];
/* we can't simply use $.text, because we need new lines */
var new_desc = data.new_description;
/* we can't simply use $.text, because we need new lines */
var tagsToReplace = {
'&': "&amp;",
'<': "&lt;",
'>': "&gt;",
};
new_desc = new_desc.replace(/[&<>]/g, function(tag) {
return tagsToReplace[tag] || tag;
});
......@@ -271,7 +271,7 @@ $(function() {
$(".vm-details-home-edit-description-click").show();
$("#vm-details-home-description").hide();
// update the textareia
$("vm-details-home-description textarea").text(data['new_description']);
$("vm-details-home-description textarea").text(data.new_description);
},
error: function(xhr, textStatus, error) {
addMessage("Error during renaming!", "danger");
......@@ -298,8 +298,8 @@ $(function() {
.find("i").removeClass("fa-spinner fa-spin");
});
// screenshot close
$("#vm-console-screenshot button").click(function() {
$(this).parent("div").slideUp();
......@@ -320,15 +320,15 @@ $(function() {
function removePort(data) {
$.ajax({
type: 'POST',
url: data['url'],
url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) {
$("a[data-rule=" + data['rule'] + "]").each(function() {
$("a[data-rule=" + data.rule + "]").each(function() {
$(this).closest("tr").fadeOut(500, function() {
$(this).remove();
});
});
addMessage(re['message'], "success");
addMessage(re.message, "success");
},
error: function(xhr, textStatus, error) {
......@@ -345,7 +345,7 @@ function decideActivityRefresh() {
/* if there is only one activity */
if($('#activity-timeline div[class="activity"]').length < 2)
check = true;
return check;
}
......@@ -357,32 +357,32 @@ function checkNewActivity(runs) {
url: '/dashboard/vm/' + instance + '/activity/',
data: {'show_all': show_all},
success: function(data) {
var new_activity_hash = (data['activities'] + "").hashCode();
var new_activity_hash = (data.activities + "").hashCode();
if(new_activity_hash != activity_hash) {
$("#activity-refresh").html(data['activities']);
$("#activity-refresh").html(data.activities);
}
activity_hash = new_activity_hash;
$("#ops").html(data['ops']);
$("#disk-ops").html(data['disk_ops']);
$("#ops").html(data.ops);
$("#disk-ops").html(data.disk_ops);
$("[title]").tooltip();
/* changing the status text */
var icon = $("#vm-details-state i");
if(data['is_new_state']) {
if(data.is_new_state) {
if(!icon.hasClass("fa-spin"))
icon.prop("class", "fa fa-spinner fa-spin");
} else {
icon.prop("class", "fa " + data['icon']);
icon.prop("class", "fa " + data.icon);
}
$("#vm-details-state span").html(data['human_readable_status'].toUpperCase());
if(data['status'] == "RUNNING") {
$("#vm-details-state span").html(data.human_readable_status.toUpperCase());
if(data.status == "RUNNING") {
$("[data-target=#_console]").attr("data-toggle", "pill").attr("href", "#console").parent("li").removeClass("disabled");
} else {
$("[data-target=#_console]").attr("data-toggle", "_pill").attr("href", "#").parent("li").addClass("disabled");
}
if(data['status'] == "STOPPED" || data['status'] == "PENDING") {
if(data.status == "STOPPED" || data.status == "PENDING") {
$(".change-resources-button").prop("disabled", false);
$(".change-resources-help").hide();
} else {
......@@ -392,7 +392,7 @@ function checkNewActivity(runs) {