Commit 6cb335d7 by Őry Máté

fix js code style

parent 411a478b
...@@ -8,16 +8,16 @@ $(function() { ...@@ -8,16 +8,16 @@ $(function() {
function refreshDisk(disk, element) { function refreshDisk(disk, element) {
$.get("/dashboard/disk/" + disk + "/status/", function(result) { $.get("/dashboard/disk/" + disk + "/status/", function(result) {
if(result.percentage == null || result.failed == "True") { if(result.percentage === null || result.failed == "True") {
location.reload(); location.reload();
} else { } else {
var diff = result.percentage - parseInt(element.html()); var diff = result.percentage - parseInt(element.html());
var refresh = 5 - diff; 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 if(isNaN(refresh)) refresh = 2; // this should not happen
element.html(result.percentage); element.html(result.percentage);
setTimeout(function() {refreshDisk(disk, element)}, refresh * 1000); setTimeout(function() {refreshDisk(disk, element);}, refresh * 1000);
} }
}); });
} }
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
data: {'new_name': name}, data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) { 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(); $('#group-details-rename').hide();
// addMessage(data['message'], "success"); // addMessage(data['message'], "success");
}, },
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
function removeMember(data) { function removeMember(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) { success: function(re, textStatus, xhr) {
data['tr'].fadeOut(function() { data.tr.fadeOut(function() {
$(this).remove();}); $(this).remove();});
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger') addMessage('Uh oh :(', 'danger');
} }
}); });
} }
......
...@@ -7,7 +7,7 @@ $(function() { ...@@ -7,7 +7,7 @@ $(function() {
/* rename ajax */ /* rename ajax */
$('.group-list-rename-submit').click(function() { $('.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 name = $('#group-list-rename-name', row).val();
var url = '/dashboard/group/' + row.children("td:first-child").text().replace(" ", "") + '/'; var url = '/dashboard/group/' + row.children("td:first-child").text().replace(" ", "") + '/';
$.ajax({ $.ajax({
...@@ -16,12 +16,12 @@ $(function() { ...@@ -16,12 +16,12 @@ $(function() {
data: {'new_name': name}, data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) { success: function(data, textStatus, xhr) {
$("#group-list-column-name", row).html( $("#group-list-column-name", row).html(
$("<a/>", { $("<a/>", {
'class': "real-link", 'class': "real-link",
href: "/dashboard/group/" + data['group_pk'] + "/", href: "/dashboard/group/" + data.group_pk + "/",
text: data['new_name'] text: data.new_name
}) })
).show(); ).show();
$('#group-list-rename', row).hide(); $('#group-list-rename', row).hide();
......
...@@ -15,9 +15,9 @@ $(function() { ...@@ -15,9 +15,9 @@ $(function() {
data: {'new_name': name}, data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) { 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(); $('#node-details-rename').hide();
// addMessage(data['message'], "success"); // addMessage(data.message, "success");
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage("Error during renaming!", "danger"); addMessage("Error during renaming!", "danger");
...@@ -34,7 +34,7 @@ $(function() { ...@@ -34,7 +34,7 @@ $(function() {
$('.node-enable').click(function() { $('.node-enable').click(function() {
var node_pk = $(this).data('node-pk'); var node_pk = $(this).data('node-pk');
var dir = window.location.pathname.indexOf('list') == -1; var dir = window.location.pathname.indexOf('list') == -1;
addModalConfirmation(changeNodeStatus, addModalConfirmation(changeNodeStatus,
{ 'url': '/dashboard/node/status/' + node_pk + '/', { 'url': '/dashboard/node/status/' + node_pk + '/',
'data': [], 'data': [],
'pk': node_pk, 'pk': node_pk,
...@@ -51,17 +51,17 @@ $(function() { ...@@ -51,17 +51,17 @@ $(function() {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: location.href, url: location.href,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
data: {'to_remove': to_remove}, data: {'to_remove': to_remove},
success: function(re) { success: function(re) {
if(re['message'].toLowerCase() == "success") { if(re.message.toLowerCase() == "success") {
$(clicked).closest(".label").fadeOut(500, function() { $(clicked).closest(".label").fadeOut(500, function() {
$(this).remove(); $(this).remove();
}); });
} }
}, },
error: function() { error: function() {
addMessage(re['message'], 'danger'); addMessage(re.message, 'danger');
} }
}); });
...@@ -73,18 +73,18 @@ $(function() { ...@@ -73,18 +73,18 @@ $(function() {
function changeNodeStatus(data) { function changeNodeStatus(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) { success: function(re, textStatus, xhr) {
if(!data['redirect']) { if(!data.redirect) {
selected = []; selected = [];
addMessage(re['message'], 'success'); addMessage(re.message, 'success');
} else { } else {
window.location.replace('/dashboard'); window.location.replace('/dashboard');
} }
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger') addMessage('Uh oh :(', 'danger');
} }
}); });
} }
...@@ -4,12 +4,10 @@ $(function() { ...@@ -4,12 +4,10 @@ $(function() {
}); });
// find disabled nodes, set danger (red) on the rows // find disabled nodes, set danger (red) on the rows
function colortable() function colortable()
{ {
var tr= $('.false').closest("tr"); $('.false').closest("tr").addClass('danger');
tr.addClass('danger'); $('.true').closest("tr").removeClass('danger');
var tr= $('.true').closest("tr");
tr.removeClass('danger');
} }
/* rename */ /* rename */
...@@ -20,7 +18,7 @@ $(function() { ...@@ -20,7 +18,7 @@ $(function() {
/* rename ajax */ /* rename ajax */
$('.node-list-rename-submit').click(function() { $('.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 name = $('#node-list-rename-name', row).val();
var url = '/dashboard/node/' + row.children("td:first-child").text().replace(" ", "") + '/'; var url = '/dashboard/node/' + row.children("td:first-child").text().replace(" ", "") + '/';
$.ajax({ $.ajax({
...@@ -29,12 +27,12 @@ $(function() { ...@@ -29,12 +27,12 @@ $(function() {
data: {'new_name': name}, data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) { success: function(data, textStatus, xhr) {
$("#node-list-column-name", row).html( $("#node-list-column-name", row).html(
$("<a/>", { $("<a/>", {
'class': "real-link", 'class': "real-link",
href: "/dashboard/node/" + data['node_pk'] + "/", href: "/dashboard/node/" + data.node_pk + "/",
text: data['new_name'] text: data.new_name
}) })
).show(); ).show();
$('#node-list-rename', row).hide(); $('#node-list-rename', row).hide();
...@@ -50,7 +48,7 @@ $(function() { ...@@ -50,7 +48,7 @@ $(function() {
function statuschangeSuccess(tr){ function statuschangeSuccess(tr){
var tspan=tr.children('.enabled').children(); var tspan=tr.children('.enabled').children();
var buttons=tr.children('.actions').children('.btn-group').children('.dropdown-menu').children('li').children('.node-enable'); var buttons=tr.children('.actions').children('.btn-group').children('.dropdown-menu').children('li').children('.node-enable');
buttons.each(function(index){ buttons.each(function(index){
if ($(this).css("display")=="block"){ if ($(this).css("display")=="block"){
$(this).css("display","none"); $(this).css("display","none");
...@@ -58,12 +56,12 @@ $(function() { ...@@ -58,12 +56,12 @@ $(function() {
else{ else{
$(this).css("display","block"); $(this).css("display","block");
} }
}); });
if(tspan.hasClass("false")){ if(tspan.hasClass("false")){
tspan.removeClass("false"); tspan.removeClass("false");
tspan.addClass("true"); tspan.addClass("true");
tspan.text("✔"); tspan.text("✔");
} }
else{ else{
tspan.removeClass("true"); tspan.removeClass("true");
tspan.addClass("false"); tspan.addClass("false");
......
...@@ -7,10 +7,10 @@ $(function() { ...@@ -7,10 +7,10 @@ $(function() {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url:"/dashboard/profile/" + user + "/use_gravatar/", url:"/dashboard/profile/" + user + "/use_gravatar/",
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re) { success: function(re) {
if(re.new_avatar_url) { 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) { error: function(xhr, textStatus, error) {
......
...@@ -25,18 +25,18 @@ $(function() { ...@@ -25,18 +25,18 @@ $(function() {
$('#store-upload-form button[type="submit"] i').addClass("fa-spinner fa-spin"); $('#store-upload-form button[type="submit"] i').addClass("fa-spinner fa-spin");
var current_dir = $("#store-upload-form").find('[name="current_dir"]').val(); var current_dir = $("#store-upload-form").find('[name="current_dir"]').val();
$.get($("#store-upload-form").data("action") + "?current_dir=" + current_dir, function(result) { $.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(); $("#store-upload-form").submit();
}); });
return false; return false;
}); });
/* "fake" browse button */ /* "fake" browse button */
$("#store-list-container").on("click", "#store-upload-browse", function() { $("#store-list-container").on("click", "#store-upload-browse", function() {
$('#store-upload-form input[type="file"]').click(); $('#store-upload-form input[type="file"]').click();
}); });
$("#store-list-container").on("change", "#store-upload-file", function() { $("#store-list-container").on("change", "#store-upload-file", function() {
var input = $(this); var input = $(this);
var numFiles = input.get(0).files ? input.get(0).files.length : 1; var numFiles = input.get(0).files ? input.get(0).files.length : 1;
......
...@@ -20,7 +20,7 @@ $(function() { ...@@ -20,7 +20,7 @@ $(function() {
}); });
return false; return false;
}); });
/* template table sort */ /* template table sort */
var ttable = $(".template-list-table").stupidtable(); var ttable = $(".template-list-table").stupidtable();
...@@ -37,7 +37,7 @@ $(function() { ...@@ -37,7 +37,7 @@ $(function() {
// only if js is enabled // only if js is enabled
$(".template-list-table thead th").css("cursor", "pointer"); $(".template-list-table thead th").css("cursor", "pointer");
$(".template-list-table th a").on("click", function(event) { $(".template-list-table th a").on("click", function(event) {
event.preventDefault(); event.preventDefault();
}); });
...@@ -48,16 +48,16 @@ $(function() { ...@@ -48,16 +48,16 @@ $(function() {
function deleteTemplate(data) { function deleteTemplate(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) { success: function(re, textStatus, xhr) {
addMessage(re['message'], 'success'); addMessage(re.message, 'success');
$('a[data-template-pk="' + data['template_pk'] + '"]').closest('tr').fadeOut(function() { $('a[data-template-pk="' + data.template_pk + '"]').closest('tr').fadeOut(function() {
$(this).remove(); $(this).remove();
}); });
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger') addMessage('Uh oh :(', 'danger');
} }
}); });
} }
...@@ -67,16 +67,16 @@ function deleteTemplate(data) { ...@@ -67,16 +67,16 @@ function deleteTemplate(data) {
function deleteLease(data) { function deleteLease(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) { success: function(re, textStatus, xhr) {
addMessage(re['message'], 'success'); addMessage(re.message, 'success');
$('a[data-lease-pk="' + data['lease_pk'] + '"]').closest('tr').fadeOut(function() { $('a[data-lease-pk="' + data.lease_pk + '"]').closest('tr').fadeOut(function() {
$(this).remove(); $(this).remove();
}); });
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger') addMessage('Uh oh :(', 'danger');
} }
}); });
} }
...@@ -74,7 +74,7 @@ $(function() { ...@@ -74,7 +74,7 @@ $(function() {
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
$('#confirmation-modal').modal("hide"); $('#confirmation-modal').modal("hide");
if (xhr.status == 500) { if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger"); addMessage("500 Internal Server Error", "danger");
} else { } else {
......
...@@ -6,7 +6,7 @@ $(function() { ...@@ -6,7 +6,7 @@ $(function() {
var rfb; var rfb;
function updateState(rfb, state, oldstate, msg) { 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 rfb.sendKey(0xffe3); // press and release ctrl to kill screensaver
if (typeof(msg) !== 'undefined') { if (typeof(msg) !== 'undefined') {
...@@ -42,13 +42,13 @@ $(function() { ...@@ -42,13 +42,13 @@ $(function() {
if (window.location.port == 8080) { if (window.location.port == 8080) {
port = 9999; port = 9999;
} else { } else {
port = window.location.port == "" ? "443" : window.location.port; port = window.location.port === "" ? "443" : window.location.port;
} }
password = ''; password = '';
$('#_console .btn-toolbar button').attr('disabled', true); $('#_console .btn-toolbar button').attr('disabled', true);
$('#noVNC_status').html('Retreiving authorization token.'); $('#noVNC_status').html('Retreiving authorization token.');
$.get(VNC_URL, function(data) { $.get(VNC_URL, function(data) {
if (data.indexOf('vnc') != 0) { if (data.indexOf('vnc') !== 0) {
$('#noVNC_status').html('No authorization token received.'); $('#noVNC_status').html('No authorization token received.');
} }
else { else {
......
...@@ -18,7 +18,7 @@ function vmCreateLoaded() { ...@@ -18,7 +18,7 @@ function vmCreateLoaded() {
$(".customize-vm").click(function() { $(".customize-vm").click(function() {
var template = $(this).data("template-pk"); var template = $(this).data("template-pk");
$.get("/dashboard/vm/create/?template=" + template, function(data) { $.get("/dashboard/vm/create/?template=" + template, function(data) {
var r = $('#create-modal'); r.next('div').remove(); r.remove(); var r = $('#create-modal'); r.next('div').remove(); r.remove();
$('body').append(data); $('body').append(data);
...@@ -34,7 +34,7 @@ function vmCreateLoaded() { ...@@ -34,7 +34,7 @@ function vmCreateLoaded() {
}); });
return false; return false;
}); });
/* start vm button clicks */ /* start vm button clicks */
$('.vm-create-start').click(function() { $('.vm-create-start').click(function() {
template = $(this).data("template-pk"); template = $(this).data("template-pk");
...@@ -60,7 +60,7 @@ function vmCreateLoaded() { ...@@ -60,7 +60,7 @@ function vmCreateLoaded() {
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
var r = $('#create-modal'); r.next('div').remove(); r.remove(); var r = $('#create-modal'); r.next('div').remove(); r.remove();
if (xhr.status == 500) { if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger"); addMessage("500 Internal Server Error", "danger");
} else { } else {
...@@ -77,7 +77,7 @@ function vmCreateLoaded() { ...@@ -77,7 +77,7 @@ function vmCreateLoaded() {
var now = $(this).attr('aria-valuenow'); var now = $(this).attr('aria-valuenow');
var siz = (now-min)*100/(max-min); var siz = (now-min)*100/(max-min);
$(this).css('width', siz+'%'); $(this).css('width', siz+'%');
}); });
} }
...@@ -93,18 +93,18 @@ function vmCustomizeLoaded() { ...@@ -93,18 +93,18 @@ function vmCustomizeLoaded() {
// remove the hex chars // remove the hex chars
name = name.substring(name.indexOf(" "), name.length); 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').html('');
} }
$('#vm-create-network-list').append( $('#vm-create-network-list').append(
vmCreateNetworkLabel(vlan_pk, name, managed) vmCreateNetworkLabel(vlan_pk, name, managed)
); );
/* select the network in the hidden network select */ /* select the network in the hidden network select */
$('#vm-create-network-add-vlan option[value="' + vlan_pk + '"]').prop('selected', true); $('#vm-create-network-add-vlan option[value="' + vlan_pk + '"]').prop('selected', true);
$('option:selected', $('#vm-create-network-add-select')).remove(); $('option:selected', $('#vm-create-network-add-select')).remove();
/* add dummy text if no more networks are available */ /* add dummy text if no more networks are available */
if($('#vm-create-network-add-select option').length < 1) { if($('#vm-create-network-add-select option').length < 1) {
$('#vm-create-network-add-button').attr('disabled', true); $('#vm-create-network-add-button').attr('disabled', true);
...@@ -117,23 +117,23 @@ function vmCustomizeLoaded() { ...@@ -117,23 +117,23 @@ function vmCustomizeLoaded() {
/* remove network */ /* remove network */
// event for network remove button (icon, X) // event for network remove button (icon, X)
$('body').on('click', '.vm-create-remove-network', function() { $('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 // if it's "blue" then it's managed, kinda not cool
var managed = $(this).parent('span').hasClass('label-primary'); var managed = $(this).parent('span').hasClass('label-primary');
$(this).parent('span').fadeOut(500, function() { $(this).parent('span').fadeOut(500, function() {
/* if ther are no more vlans disabled the add button */ /* if ther are no more vlans disabled the add button */
if($('#vm-create-network-add-select option')[0].value == -1) { if($('#vm-create-network-add-select option')[0].value == -1) {
$('#vm-create-network-add-button').attr('disabled', false); $('#vm-create-network-add-button').attr('disabled', false);
$('#vm-create-network-add-select').html(''); $('#vm-create-network-add-select').html('');
} }
/* remove the network label */ /* remove the network label */
$(this).remove(); $(this).remove();
var vlan_name = $(this).text(); 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>'; (managed ? "&#xf0ac;": "&#xf0c1;") + vlan_name + '</option>';
$('#vm-create-network-add-select').append(html); $('#vm-create-network-add-select').append(html);
...@@ -148,7 +148,7 @@ function vmCustomizeLoaded() { ...@@ -148,7 +148,7 @@ function vmCustomizeLoaded() {
/* copy networks from hidden select */ /* copy networks from hidden select */
$('#vm-create-network-add-vlan option').each(function() { $('#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 raw_text = $(this).text();
var pk = $(this).val(); var pk = $(this).val();
if(managed) { if(managed) {
...@@ -157,7 +157,7 @@ function vmCustomizeLoaded() { ...@@ -157,7 +157,7 @@ function vmCustomizeLoaded() {
text = raw_text.replace("unmanaged -", "&#xf0c1;"); text = raw_text.replace("unmanaged -", "&#xf0c1;");
} }
var html = '<option data-managed="' + (managed ? 1 : 0) + '" value="' + pk + '">' + text + '</option>'; var html = '<option data-managed="' + (managed ? 1 : 0) + '" value="' + pk + '">' + text + '</option>';
if($('#vm-create-network-list span').length < 1) { if($('#vm-create-network-list span').length < 1) {
$("#vm-create-network-list").html(""); $("#vm-create-network-list").html("");
} }
...@@ -180,7 +180,7 @@ function vmCustomizeLoaded() { ...@@ -180,7 +180,7 @@ function vmCustomizeLoaded() {
vlans.push({ vlans.push({
'name': $(this).text().replace("unmanaged -", "&#xf0c1;").replace("managed -", "&#xf0ac;"), 'name': $(this).text().replace("unmanaged -", "&#xf0c1;").replace("managed -", "&#xf0ac;"),
'pk': parseInt($(this).val()), 'pk': parseInt($(this).val()),
'managed': $(this).text().indexOf("mana") == 0, 'managed': $(this).text().indexOf("mana") === 0,
}); });
}); });
...@@ -248,7 +248,7 @@ function vmCustomizeLoaded() { ...@@ -248,7 +248,7 @@ function vmCustomizeLoaded() {
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
var r = $('#create-modal'); r.next('div').remove(); r.remove(); var r = $('#create-modal'); r.next('div').remove(); r.remove();
if (xhr.status == 500) { if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger"); addMessage("500 Internal Server Error", "danger");
} else { } else {
...@@ -260,8 +260,8 @@ function vmCustomizeLoaded() { ...@@ -260,8 +260,8 @@ function vmCustomizeLoaded() {
}); });
/* for no js stuff */ /* for no js stuff */
$('.no-js-hidden').show(); $('.no-js-hidden').show();
$('.js-hidden').hide(); $('.js-hidden').hide();
} }
......
...@@ -41,7 +41,7 @@ $(function() { ...@@ -41,7 +41,7 @@ $(function() {
var vm = $(this).data("vm"); var vm = $(this).data("vm");
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: "/dashboard/vm/" + vm + "/op/resources_change/", url: "/dashboard/vm/" + vm + "/op/resources_change/",
data: $('#vm-details-resources-form').serialize(), data: $('#vm-details-resources-form').serialize(),
success: function(data, textStatus, xhr) { success: function(data, textStatus, xhr) {
if(data.success) { if(data.success) {
...@@ -57,7 +57,7 @@ $(function() { ...@@ -57,7 +57,7 @@ $(function() {
addMessage("500 Internal Server Error", "danger"); addMessage("500 Internal Server Error", "danger");
} else { } else {
addMessage(xhr.status + " Unknown Error", "danger"); addMessage(xhr.status + " Unknown Error", "danger");
} }
} }
}); });
return false; return false;
...@@ -70,17 +70,17 @@ $(function() { ...@@ -70,17 +70,17 @@ $(function() {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: location.href, url: location.href,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
data: {'to_remove': to_remove}, data: {'to_remove': to_remove},
success: function(re) { success: function(re) {
if(re['message'].toLowerCase() == "success") { if(re.message.toLowerCase() == "success") {
$(clicked).closest(".label").fadeOut(500, function() { $(clicked).closest(".label").fadeOut(500, function() {
$(this).remove(); $(this).remove();
}); });
} }
}, },
error: function() { error: function() {
addMessage(re['message'], 'danger'); addMessage(re.message, 'danger');
} }
}); });
...@@ -89,7 +89,7 @@ $(function() { ...@@ -89,7 +89,7 @@ $(function() {
/* remove port */ /* remove port */
$('.vm-details-remove-port').click(function() { $('.vm-details-remove-port').click(function() {
addModalConfirmation(removePort, addModalConfirmation(removePort,
{ {
'url': $(this).prop("href"), 'url': $(this).prop("href"),
'data': [], 'data': [],
...@@ -100,13 +100,13 @@ $(function() { ...@@ -100,13 +100,13 @@ $(function() {
/* for js fallback */ /* for js fallback */
$("#vm-details-pw-show").parent("div").children("input").prop("type", "password"); $("#vm-details-pw-show").parent("div").children("input").prop("type", "password");
/* show password */ /* show password */
$("#vm-details-pw-show").click(function() { $("#vm-details-pw-show").click(function() {
var input = $(this).parent("div").children("input"); var input = $(this).parent("div").children("input");
var eye = $(this).children("#vm-details-pw-eye"); var eye = $(this).children("#vm-details-pw-eye");
eye.tooltip("destroy") eye.tooltip("destroy");
if(eye.hasClass("fa-eye")) { if(eye.hasClass("fa-eye")) {
eye.removeClass("fa-eye").addClass("fa-eye-slash"); eye.removeClass("fa-eye").addClass("fa-eye-slash");
input.prop("type", "text"); input.prop("type", "text");
...@@ -148,7 +148,7 @@ $(function() { ...@@ -148,7 +148,7 @@ $(function() {
} }
}); });
} else { } else {
$("#vm-details-pw-confirm").fadeOut(); $("#vm-details-pw-confirm").fadeOut();
} }
return false; return false;
}); });
...@@ -168,7 +168,7 @@ $(function() { ...@@ -168,7 +168,7 @@ $(function() {
/* for interface remove buttons */ /* for interface remove buttons */
$('.interface-remove').click(function() { $('.interface-remove').click(function() {
var interface_pk = $(this).data('interface-pk'); var interface_pk = $(this).data('interface-pk');
addModalConfirmation(removeInterface, addModalConfirmation(removeInterface,
{ 'url': '/dashboard/interface/' + interface_pk + '/delete/', { 'url': '/dashboard/interface/' + interface_pk + '/delete/',
'data': [], 'data': [],
'pk': interface_pk, 'pk': interface_pk,
...@@ -181,15 +181,15 @@ $(function() { ...@@ -181,15 +181,15 @@ $(function() {
function removeInterface(data) { function removeInterface(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) { success: function(re, textStatus, xhr) {
/* remove the html element */ /* remove the html element */
$('a[data-interface-pk="' + data.pk + '"]').closest("div").fadeOut(); $('a[data-interface-pk="' + data.pk + '"]').closest("div").fadeOut();
location.reload(); location.reload();
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger') addMessage('Uh oh :(', 'danger');
} }
}); });
} }
...@@ -219,12 +219,12 @@ $(function() { ...@@ -219,12 +219,12 @@ $(function() {
data: {'new_name': name}, data: {'new_name': name},
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) { 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").parent("div").show();
$(".vm-details-home-edit-name-click").show(); $(".vm-details-home-edit-name-click").show();
$(".vm-details-home-rename-form-div").hide(); $(".vm-details-home-rename-form-div").hide();
// update the inputs too // 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) { error: function(xhr, textStatus, error) {
addMessage("Error during renaming!", "danger"); addMessage("Error during renaming!", "danger");
...@@ -232,7 +232,7 @@ $(function() { ...@@ -232,7 +232,7 @@ $(function() {
}); });
return false; return false;
}); });
/* update description click */ /* update description click */
$(".vm-details-home-edit-description-click").click(function() { $(".vm-details-home-edit-description-click").click(function() {
$(".vm-details-home-edit-description-click").hide(); $(".vm-details-home-edit-description-click").hide();
...@@ -241,10 +241,10 @@ $(function() { ...@@ -241,10 +241,10 @@ $(function() {
var tmp = ta.val(); var tmp = ta.val();
ta.val(""); ta.val("");
ta.focus(); ta.focus();
ta.val(tmp) ta.val(tmp);
return false; return false;
}); });
/* description update ajax */ /* description update ajax */
$('.vm-details-description-submit').click(function() { $('.vm-details-description-submit').click(function() {
var description = $(this).prev("textarea").val(); var description = $(this).prev("textarea").val();
...@@ -254,14 +254,14 @@ $(function() { ...@@ -254,14 +254,14 @@ $(function() {
data: {'new_description': description}, data: {'new_description': description},
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(data, textStatus, xhr) { success: function(data, textStatus, xhr) {
var new_desc = data['new_description']; var new_desc = data.new_description;
/* we can't simply use $.text, because we need new lines */ /* we can't simply use $.text, because we need new lines */
var tagsToReplace = { var tagsToReplace = {
'&': "&amp;", '&': "&amp;",
'<': "&lt;", '<': "&lt;",
'>': "&gt;", '>': "&gt;",
}; };
new_desc = new_desc.replace(/[&<>]/g, function(tag) { new_desc = new_desc.replace(/[&<>]/g, function(tag) {
return tagsToReplace[tag] || tag; return tagsToReplace[tag] || tag;
}); });
...@@ -271,7 +271,7 @@ $(function() { ...@@ -271,7 +271,7 @@ $(function() {
$(".vm-details-home-edit-description-click").show(); $(".vm-details-home-edit-description-click").show();
$("#vm-details-home-description").hide(); $("#vm-details-home-description").hide();
// update the textareia // 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) { error: function(xhr, textStatus, error) {
addMessage("Error during renaming!", "danger"); addMessage("Error during renaming!", "danger");
...@@ -298,8 +298,8 @@ $(function() { ...@@ -298,8 +298,8 @@ $(function() {
.find("i").removeClass("fa-spinner fa-spin"); .find("i").removeClass("fa-spinner fa-spin");
}); });
// screenshot close // screenshot close
$("#vm-console-screenshot button").click(function() { $("#vm-console-screenshot button").click(function() {
$(this).parent("div").slideUp(); $(this).parent("div").slideUp();
...@@ -320,15 +320,15 @@ $(function() { ...@@ -320,15 +320,15 @@ $(function() {
function removePort(data) { function removePort(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
success: function(re, textStatus, xhr) { 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).closest("tr").fadeOut(500, function() {
$(this).remove(); $(this).remove();
}); });
}); });
addMessage(re['message'], "success"); addMessage(re.message, "success");
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
...@@ -345,7 +345,7 @@ function decideActivityRefresh() { ...@@ -345,7 +345,7 @@ function decideActivityRefresh() {
/* if there is only one activity */ /* if there is only one activity */
if($('#activity-timeline div[class="activity"]').length < 2) if($('#activity-timeline div[class="activity"]').length < 2)
check = true; check = true;
return check; return check;
} }
...@@ -357,32 +357,32 @@ function checkNewActivity(runs) { ...@@ -357,32 +357,32 @@ function checkNewActivity(runs) {
url: '/dashboard/vm/' + instance + '/activity/', url: '/dashboard/vm/' + instance + '/activity/',
data: {'show_all': show_all}, data: {'show_all': show_all},
success: function(data) { success: function(data) {
var new_activity_hash = (data['activities'] + "").hashCode(); var new_activity_hash = (data.activities + "").hashCode();
if(new_activity_hash != activity_hash) { if(new_activity_hash != activity_hash) {
$("#activity-refresh").html(data['activities']); $("#activity-refresh").html(data.activities);
} }
activity_hash = new_activity_hash; activity_hash = new_activity_hash;
$("#ops").html(data['ops']); $("#ops").html(data.ops);
$("#disk-ops").html(data['disk_ops']); $("#disk-ops").html(data.disk_ops);
$("[title]").tooltip(); $("[title]").tooltip();
/* changing the status text */ /* changing the status text */
var icon = $("#vm-details-state i"); var icon = $("#vm-details-state i");
if(data['is_new_state']) { if(data.is_new_state) {
if(!icon.hasClass("fa-spin")) if(!icon.hasClass("fa-spin"))
icon.prop("class", "fa fa-spinner fa-spin"); icon.prop("class", "fa fa-spinner fa-spin");
} else { } else {
icon.prop("class", "fa " + data['icon']); icon.prop("class", "fa " + data.icon);
} }
$("#vm-details-state span").html(data['human_readable_status'].toUpperCase()); $("#vm-details-state span").html(data.human_readable_status.toUpperCase());
if(data['status'] == "RUNNING") { if(data.status == "RUNNING") {
$("[data-target=#_console]").attr("data-toggle", "pill").attr("href", "#console").parent("li").removeClass("disabled"); $("[data-target=#_console]").attr("data-toggle", "pill").attr("href", "#console").parent("li").removeClass("disabled");
} else { } else {
$("[data-target=#_console]").attr("data-toggle", "_pill").attr("href", "#").parent("li").addClass("disabled"); $("[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-button").prop("disabled", false);
$(".change-resources-help").hide(); $(".change-resources-help").hide();
} else { } else {
...@@ -392,7 +392,7 @@ function checkNewActivity(runs) { ...@@ -392,7 +392,7 @@ function checkNewActivity(runs) {
if(runs > 0 && decideActivityRefresh()) { if(runs > 0 && decideActivityRefresh()) {
setTimeout( setTimeout(
function() {checkNewActivity(runs + 1)}, function() {checkNewActivity(runs + 1);},
1000 + Math.exp(runs * 0.05) 1000 + Math.exp(runs * 0.05)
); );
} else { } else {
...@@ -408,7 +408,7 @@ function checkNewActivity(runs) { ...@@ -408,7 +408,7 @@ function checkNewActivity(runs) {
String.prototype.hashCode = function() { String.prototype.hashCode = function() {
var hash = 0, i, chr, len; var hash = 0, i, chr, len;
if (this.length == 0) return hash; if (this.length === 0) return hash;
for (i = 0, len = this.length; i < len; i++) { for (i = 0, len = this.length; i < len; i++) {
chr = this.charCodeAt(i); chr = this.charCodeAt(i);
hash = ((hash << 5) - hash) + chr; hash = ((hash << 5) - hash) + chr;
......
...@@ -25,7 +25,7 @@ $(function() { ...@@ -25,7 +25,7 @@ $(function() {
retval = false; retval = false;
} else if(shiftDown) { } else if(shiftDown) {
if(selected.length > 0) { if(selected.length > 0) {
start = selected[selected.length - 1]['index'] + 1; start = selected[selected.length - 1].index + 1;
end = $(this).index(); end = $(this).index();
if(start > end) { if(start > end) {
...@@ -115,7 +115,7 @@ $(function() { ...@@ -115,7 +115,7 @@ $(function() {
$('#confirmation-modal').modal("hide"); $('#confirmation-modal').modal("hide");
updateStatuses(1); updateStatuses(1);
/* if there are messages display them */ /* if there are messages display them */
if(data.messages && data.messages.length > 0) { if(data.messages && data.messages.length > 0) {
addMessage(data.messages.join("<br />"), "danger"); addMessage(data.messages.join("<br />"), "danger");
...@@ -123,7 +123,7 @@ $(function() { ...@@ -123,7 +123,7 @@ $(function() {
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
$('#confirmation-modal').modal("hide"); $('#confirmation-modal').modal("hide");
if (xhr.status == 500) { if (xhr.status == 500) {
addMessage("500 Internal Server Error", "danger"); addMessage("500 Internal Server Error", "danger");
} else { } else {
...@@ -145,7 +145,7 @@ $(function() { ...@@ -145,7 +145,7 @@ $(function() {
// this didn't work ;; // this didn't work ;;
// var th = $("this").find("th"); // var th = $("this").find("th");
$(".table-sorting").hide(); $(".table-sorting").hide();
$(".vm-list-table thead th i").remove(); $(".vm-list-table thead th i").remove();
var icon_html = '<i class="fa fa-sort-' + (data.direction == "desc" ? "desc" : "asc") + ' pull-right"></i>'; var icon_html = '<i class="fa fa-sort-' + (data.direction == "desc" ? "desc" : "asc") + ' pull-right"></i>';
...@@ -160,7 +160,7 @@ $(function() { ...@@ -160,7 +160,7 @@ $(function() {
}); });
$(document).on("click", ".mass-migrate-node", function() { $(document).on("click", ".mass-migrate-node", function() {
$(this).find('input[type="radio"]').prop("checked", true); $(this).find('input[type="radio"]').prop("checked", true);
}); });
if(checkStatusUpdate()) { if(checkStatusUpdate()) {
...@@ -206,10 +206,10 @@ function updateStatuses(runs) { ...@@ -206,10 +206,10 @@ function updateStatuses(runs) {
$(this).remove(); $(this).remove();
} }
}); });
if(checkStatusUpdate()) { if(checkStatusUpdate()) {
setTimeout( setTimeout(
function() {updateStatuses(runs + 1)}, function() {updateStatuses(runs + 1)},
1000 + Math.exp(runs * 0.05) 1000 + Math.exp(runs * 0.05)
); );
} }
...@@ -236,7 +236,7 @@ function collectIds(rows) { ...@@ -236,7 +236,7 @@ function collectIds(rows) {
for(var i = 0; i < rows.length; i++) { for(var i = 0; i < rows.length; i++) {
ids.push(rows[i].vm); ids.push(rows[i].vm);
} }
return ids; return ids;
} }
function setRowColor(row) { function setRowColor(row) {
......
...@@ -42,7 +42,7 @@ function createTemplateTour() { ...@@ -42,7 +42,7 @@ function createTemplateTour() {
ttour.addStep({ ttour.addStep({
backdrop: true, backdrop: true,
element: 'a[href="#home"]', element: 'a[href="#home"]',
title: gettext("Home tab"), title: gettext("Home tab"),
content: gettext("In this tab you can tag your virtual machine and modify the name and description."), content: gettext("In this tab you can tag your virtual machine and modify the name and description."),
placement: 'top', placement: 'top',
onShow: function() { onShow: function() {
...@@ -66,9 +66,9 @@ function createTemplateTour() { ...@@ -66,9 +66,9 @@ function createTemplateTour() {
placement: 'top', placement: 'top',
backdrop: true, backdrop: true,
title: gettext("Resources"), title: gettext("Resources"),
content: '<p><strong>' + gettext("CPU priority") + ":</strong> " + gettext("higher is better") + "</p>" + content: '<p><strong>' + gettext("CPU priority") + ":</strong> " + gettext("higher is better") + "</p>" +
'<p><strong>' + gettext("CPU count") + ":</strong> " + gettext("number of CPU cores.") + "</p>" + '<p><strong>' + gettext("CPU count") + ":</strong> " + gettext("number of CPU cores.") + "</p>" +
'<p><strong>' + gettext("RAM amount") + ":</strong> " + gettext("amount of RAM.") + "</p>", '<p><strong>' + gettext("RAM amount") + ":</strong> " + gettext("amount of RAM.") + "</p>",
onShow: function() { onShow: function() {
$('a[href="#resources"]').trigger("click"); $('a[href="#resources"]').trigger("click");
}, },
...@@ -111,7 +111,7 @@ function createTemplateTour() { ...@@ -111,7 +111,7 @@ function createTemplateTour() {
placement: "top", placement: "top",
backdrop: true, backdrop: true,
content: gettext("Use the connection string or connect with your choice of client!"), content: gettext("Use the connection string or connect with your choice of client!"),
}); });
ttour.addStep({ ttour.addStep({
...@@ -128,8 +128,8 @@ function createTemplateTour() { ...@@ -128,8 +128,8 @@ function createTemplateTour() {
backdrop: true, backdrop: true,
content: gettext('Press the "Save as template" button and wait until the activity finishes.'), content: gettext('Press the "Save as template" button and wait until the activity finishes.'),
}); });
ttour.addStep({ ttour.addStep({
element: ".alert-new-template", element: ".alert-new-template",
title: gettext("Finish"), title: gettext("Finish"),
...@@ -137,6 +137,6 @@ function createTemplateTour() { ...@@ -137,6 +137,6 @@ function createTemplateTour() {
placement: "bottom", placement: "bottom",
content: gettext("This is the last message, if something is not clear you can do the the tour again!"), content: gettext("This is the last message, if something is not clear you can do the the tour again!"),
}); });
return ttour; return ttour;
} }
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 sign in to comment