Commit 6cb335d7 by Őry Máté

fix js code style

parent 411a478b
...@@ -219,7 +219,7 @@ $(function () { ...@@ -219,7 +219,7 @@ $(function () {
}); });
/* search for vms */ /* search for vms */
var my_vms = [] var my_vms = [];
$("#dashboard-vm-search-input").keyup(function(e) { $("#dashboard-vm-search-input").keyup(function(e) {
// if my_vms is empty get a list of our vms // if my_vms is empty get a list of our vms
if(my_vms.length < 1) { if(my_vms.length < 1) {
...@@ -241,7 +241,7 @@ $(function () { ...@@ -241,7 +241,7 @@ $(function () {
} }
input = $("#dashboard-vm-search-input").val().toLowerCase(); input = $("#dashboard-vm-search-input").val().toLowerCase();
var search_result = [] var search_result = [];
var html = ''; var html = '';
for(var i in my_vms) { for(var i in my_vms) {
if(my_vms[i].name.indexOf(input) != -1) { if(my_vms[i].name.indexOf(input) != -1) {
...@@ -249,12 +249,12 @@ $(function () { ...@@ -249,12 +249,12 @@ $(function () {
} }
} }
search_result.sort(compareVmByFav); search_result.sort(compareVmByFav);
for(var i=0; i<5 && i<search_result.length; i++) for(i=0; i<5 && i<search_result.length; i++)
html += generateVmHTML(search_result[i].pk, search_result[i].name, html += generateVmHTML(search_result[i].pk, search_result[i].name,
search_result[i].host, search_result[i].icon, search_result[i].host, search_result[i].icon,
search_result[i].status, search_result[i].fav, search_result[i].status, search_result[i].fav,
(search_result.length < 5)); (search_result.length < 5));
if(search_result.length == 0) if(search_result.length === 0)
html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>'; html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>';
$("#dashboard-vm-list").html(html); $("#dashboard-vm-list").html(html);
$('.title-favourite').tooltip({'placement': 'right'}); $('.title-favourite').tooltip({'placement': 'right'});
...@@ -270,7 +270,7 @@ $(function () { ...@@ -270,7 +270,7 @@ $(function () {
}); });
/* search for nodes */ /* search for nodes */
var my_nodes = [] var my_nodes = [];
$("#dashboard-node-search-input").keyup(function(e) { $("#dashboard-node-search-input").keyup(function(e) {
// if my_nodes is empty get a list of our nodes // if my_nodes is empty get a list of our nodes
if(my_nodes.length < 1) { if(my_nodes.length < 1) {
...@@ -290,29 +290,29 @@ $(function () { ...@@ -290,29 +290,29 @@ $(function () {
} }
input = $("#dashboard-node-search-input").val().toLowerCase(); input = $("#dashboard-node-search-input").val().toLowerCase();
var search_result = [] var search_result = [];
var html = ''; var html = '';
for(var i in my_nodes) { for(var i in my_nodes) {
if(my_nodes[i].name.indexOf(input) != -1) { if(my_nodes[i].name.indexOf(input) != -1) {
search_result.push(my_nodes[i]); search_result.push(my_nodes[i]);
} }
} }
for(var i=0; i<5 && i<search_result.length; i++) for(i=0; i<5 && i<search_result.length; i++)
html += generateNodeHTML(search_result[i].name, html += generateNodeHTML(search_result[i].name,
search_result[i].icon, search_result[i].status, search_result[i].icon, search_result[i].status,
search_result[i].url, search_result[i].url,
(search_result.length < 5)); (search_result.length < 5));
if(search_result.length == 0) if(search_result.length === 0)
html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>'; html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>';
$("#dashboard-node-list").html(html); $("#dashboard-node-list").html(html);
html = ''; html = '';
for(var i=0; i<5 && i<search_result.length; i++) for(i=0; i<5 && i<search_result.length; i++)
html += generateNodeTagHTML(search_result[i].name, html += generateNodeTagHTML(search_result[i].name,
search_result[i].icon, search_result[i].status, search_result[i].icon, search_result[i].status,
search_result[i].label, search_result[i].url); search_result[i].label, search_result[i].url);
if(search_result.length == 0) if(search_result.length === 0)
html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>'; html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>';
$("#dashboard-node-taglist").html(html); $("#dashboard-node-taglist").html(html);
...@@ -326,7 +326,7 @@ $(function () { ...@@ -326,7 +326,7 @@ $(function () {
}); });
/* search for groups */ /* search for groups */
var my_groups = [] var my_groups = [];
$("#dashboard-group-search-input").keyup(function(e) { $("#dashboard-group-search-input").keyup(function(e) {
// if my_groups is empty get a list of our groups // if my_groups is empty get a list of our groups
if(my_groups.length < 1) { if(my_groups.length < 1) {
...@@ -343,16 +343,16 @@ $(function () { ...@@ -343,16 +343,16 @@ $(function () {
} }
input = $("#dashboard-group-search-input").val().toLowerCase(); input = $("#dashboard-group-search-input").val().toLowerCase();
var search_result = [] var search_result = [];
var html = ''; var html = '';
for(var i in my_groups) { for(var i in my_groups) {
if(my_groups[i].name.indexOf(input) != -1) { if(my_groups[i].name.indexOf(input) != -1) {
search_result.push(my_groups[i]); search_result.push(my_groups[i]);
} }
} }
for(var i=0; i<5 && i<search_result.length; i++) for(i=0; i<5 && i<search_result.length; i++)
html += generateGroupHTML(search_result[i].url, search_result[i].name, search_result.length < 5); html += generateGroupHTML(search_result[i].url, search_result[i].name, search_result.length < 5);
if(search_result.length == 0) if(search_result.length === 0)
html += '<div class="list-group-item list-group-item-last">No result</div>'; html += '<div class="list-group-item list-group-item-last">No result</div>';
$("#dashboard-group-list").html(html); $("#dashboard-group-list").html(html);
...@@ -374,7 +374,7 @@ $(function () { ...@@ -374,7 +374,7 @@ $(function () {
/* don't close notifications window on missclick */ /* don't close notifications window on missclick */
$(document).on("click", ".notification-messages", function(e) { $(document).on("click", ".notification-messages", function(e) {
if($(e.target).closest("a").length) if($(e.target).closest("a").length)
return true return true;
else else
return false; return false;
}); });
...@@ -439,7 +439,7 @@ function compareVmByFav(a, b) { ...@@ -439,7 +439,7 @@ function compareVmByFav(a, b) {
$(document).on('shown.bs.tab', 'a[href="#resources"]', function (e) { $(document).on('shown.bs.tab', 'a[href="#resources"]', function (e) {
$(".cpu-priority-input").trigger("change"); $(".cpu-priority-input").trigger("change");
$(".cpu-count-input, .ram-input").trigger("input"); $(".cpu-count-input, .ram-input").trigger("input");
}) });
function addSliderMiscs() { function addSliderMiscs() {
// set max values based on inputs // set max values based on inputs
...@@ -508,20 +508,20 @@ function setDefaultSliderValues() { ...@@ -508,20 +508,20 @@ function setDefaultSliderValues() {
function deleteObject(data) { function deleteObject(data) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
data: {'redirect': data['redirect']}, data: {'redirect': data.redirect},
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');
if(data.type === "disk") { if(data.type === "disk") {
// no need to remove them from DOM // no need to remove them from DOM
$('a[data-disk-pk="' + data.pk + '"]').parent("li").fadeOut(); $('a[data-disk-pk="' + data.pk + '"]').parent("li").fadeOut();
$('a[data-disk-pk="' + data.pk + '"]').parent("h4").fadeOut(); $('a[data-disk-pk="' + data.pk + '"]').parent("h4").fadeOut();
} }
else { else {
$('a[data-'+data['type']+'-pk="' + data['pk'] + '"]').closest('tr').fadeOut(function() { $('a[data-'+data.type+'-pk="' + data.pk + '"]').closest('tr').fadeOut(function() {
$(this).remove(); $(this).remove();
}); });
} }
...@@ -530,27 +530,28 @@ function deleteObject(data) { ...@@ -530,27 +530,28 @@ function deleteObject(data) {
} }
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
addMessage('Uh oh :(', 'danger') addMessage('Uh oh :(', 'danger');
} }
}); });
} }
function massDeleteVm(data) { function massDeleteVm(data) {
f = function() {
selected = [];
// reset group buttons
$('.vm-list-group-control a').attr('disabled', true);
$(this).remove();
};
$.ajax({ $.ajax({
traditional: true, traditional: true,
url: data['url'], url: data.url,
headers: {"X-CSRFToken": getCookie('csrftoken')}, headers: {"X-CSRFToken": getCookie('csrftoken')},
type: 'POST', type: 'POST',
data: {'vms': data['data']['v']}, data: {'vms': data.data.v},
success: function(re, textStatus, xhr) { success: function(re, textStatus, xhr) {
for(var i=0; i< data['data']['v'].length; i++) for(var i=0; i< data.data.v.length; i++)
$('.vm-list-table tbody tr[data-vm-pk="' + data['data']['v'][i] + '"]').fadeOut(500, function() { $('.vm-list-table tbody tr[data-vm-pk="' + data.data.v[i] + '"]').fadeOut(500, f);
selected = []; addMessage(re.message, 'success');
// reset group buttons
$('.vm-list-group-control a').attr('disabled', true);
$(this).remove();
});
addMessage(re['message'], 'success');
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
// TODO this // TODO this
...@@ -573,8 +574,8 @@ function addMessage(text, type) { ...@@ -573,8 +574,8 @@ function addMessage(text, type) {
function addModalConfirmation(func, data) { function addModalConfirmation(func, data) {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: data['url'], url: data.url,
data: jQuery.param(data['data']), data: jQuery.param(data.data),
success: function(result) { success: function(result) {
$('body').append(result); $('body').append(result);
$('#confirmation-modal').modal('show'); $('#confirmation-modal').modal('show');
...@@ -598,7 +599,7 @@ function addModalConfirmation(func, data) { ...@@ -598,7 +599,7 @@ function addModalConfirmation(func, data) {
function getCookie(name) { function getCookie(name) {
var cookieValue = null; var cookieValue = null;
if (document.cookie && document.cookie != '') { if (document.cookie && document.cookie !== '') {
var cookies = document.cookie.split(';'); var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) { for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]); var cookie = jQuery.trim(cookies[i]);
......
...@@ -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({
...@@ -20,8 +20,8 @@ $(function() { ...@@ -20,8 +20,8 @@ $(function() {
$("#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");
...@@ -54,14 +54,14 @@ $(function() { ...@@ -54,14 +54,14 @@ $(function() {
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');
} }
}); });
} }
...@@ -6,10 +6,8 @@ $(function() { ...@@ -6,10 +6,8 @@ $(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({
...@@ -33,8 +31,8 @@ $(function() { ...@@ -33,8 +31,8 @@ $(function() {
$("#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();
......
...@@ -25,7 +25,7 @@ $(function() { ...@@ -25,7 +25,7 @@ $(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();
}); });
......
...@@ -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');
} }
}); });
} }
...@@ -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 {
......
...@@ -117,7 +117,7 @@ function vmCustomizeLoaded() { ...@@ -117,7 +117,7 @@ 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');
...@@ -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) {
...@@ -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,
}); });
}); });
......
...@@ -73,14 +73,14 @@ $(function() { ...@@ -73,14 +73,14 @@ $(function() {
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');
} }
}); });
...@@ -106,7 +106,7 @@ $(function() { ...@@ -106,7 +106,7 @@ $(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");
...@@ -181,7 +181,7 @@ $(function() { ...@@ -181,7 +181,7 @@ $(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 */
...@@ -189,7 +189,7 @@ $(function() { ...@@ -189,7 +189,7 @@ $(function() {
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");
...@@ -241,7 +241,7 @@ $(function() { ...@@ -241,7 +241,7 @@ $(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;
}); });
...@@ -254,7 +254,7 @@ $(function() { ...@@ -254,7 +254,7 @@ $(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;",
...@@ -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");
...@@ -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) {
...@@ -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) {
......
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