From 5b7770bda48d17114f7f9ad84a5f2f968e962845 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Thu, 21 Dec 2017 00:56:11 -0700 Subject: [PATCH] Minor code formatting adjustments --- static/js/app.js | 2 +- static/js/edituser.js | 2 +- static/js/permissions.js | 146 +++++++++++++++++++-------------------- 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/static/js/app.js b/static/js/app.js index 4009728..2fe1a03 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -22,5 +22,5 @@ function getniceurl() { try { window.history.replaceState("", "", getniceurl()); } catch (ex) { - + } \ No newline at end of file diff --git a/static/js/edituser.js b/static/js/edituser.js index 2200cf9..7e3b16d 100644 --- a/static/js/edituser.js +++ b/static/js/edituser.js @@ -2,6 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -$('#name').on('input propertychange paste', function() { +$('#name').on('input propertychange paste', function () { $('#name_title').text($('#name').val()); }); \ No newline at end of file diff --git a/static/js/permissions.js b/static/js/permissions.js index 92e7ef0..b2f79f5 100644 --- a/static/js/permissions.js +++ b/static/js/permissions.js @@ -5,45 +5,45 @@ function addPermission(permcode, permdesc) { permcode = permcode.trim().toUpperCase(); if (permcode == "") { - return false; + return false; } if ($("#permslist div[data-permcode=" + permcode + "]").length) { - $("#permslist .list-group-item[data-permcode=" + permcode + "]").animate({ - backgroundColor: "#ff0000", - }, 500, "linear", function () { - $("#permslist .list-group-item[data-permcode=" + permcode + "]").animate({ - backgroundColor: "#ffffff", - }, 500); - }); - return false; + $("#permslist .list-group-item[data-permcode=" + permcode + "]").animate({ + backgroundColor: "#ff0000", + }, 500, "linear", function () { + $("#permslist .list-group-item[data-permcode=" + permcode + "]").animate({ + backgroundColor: "#ffffff", + }, 500); + }); + return false; } if (typeof permdesc == "undefined") { - $.post("action.php", { - action: 'autocomplete_permission', - q: $("#perms-box").val() - }, function (resp) { - if (resp.length === 0) { - return; - } - if (resp.length === 1) { - permdesc = resp[0].info; - } else { - for (var i = 0; i < resp.length; i++) { - if (resp[i].name == permcode) { - permdesc = resp[i].info; - break; - } - } - if (typeof permdesc == "undefined") { - return; - } - } - $('#permslist').append("
" + permcode + "

" + permdesc + "

"); - $("#perms-box").val(""); - }, "json"); + $.post("action.php", { + action: 'autocomplete_permission', + q: $("#perms-box").val() + }, function (resp) { + if (resp.length === 0) { + return; + } + if (resp.length === 1) { + permdesc = resp[0].info; + } else { + for (var i = 0; i < resp.length; i++) { + if (resp[i].name == permcode) { + permdesc = resp[i].info; + break; + } + } + if (typeof permdesc == "undefined") { + return; + } + } + $('#permslist').append("
" + permcode + "

" + permdesc + "

"); + $("#perms-box").val(""); + }, "json"); } else { - $('#permslist').append("
" + permcode + "

" + permdesc + "

"); - $("#perms-box").val(""); + $('#permslist').append("
" + permcode + "

" + permdesc + "

"); + $("#perms-box").val(""); } } @@ -54,30 +54,30 @@ function removePermission(permcode) { var options = { url: "action.php", ajaxSettings: { - dataType: "json", - method: "GET", - data: { - action: "autocomplete_user" - } + dataType: "json", + method: "GET", + data: { + action: "autocomplete_user" + } }, preparePostData: function (data) { - data.q = $("#user-box").val(); - return data; + data.q = $("#user-box").val(); + return data; }, getValue: function (element) { - return element.username; + return element.username; }, template: { - type: "custom", - method: function (value, item) { - return item.name + " " + item.username + ""; - } + type: "custom", + method: function (value, item) { + return item.name + " " + item.username + ""; + } }, list: { - onClickEvent: function () { - var value = $("#user-box").getSelectedItemData().username; - document.location.href = "app.php?page=permissions&user=" + value; - } + onClickEvent: function () { + var value = $("#user-box").getSelectedItemData().username; + document.location.href = "app.php?page=permissions&user=" + value; + } }, requestDelay: 500 }; @@ -85,31 +85,31 @@ var options = { $("#perms-box").easyAutocomplete({ url: "action.php", ajaxSettings: { - dataType: "json", - method: "GET", - data: { - action: "autocomplete_permission" - } + dataType: "json", + method: "GET", + data: { + action: "autocomplete_permission" + } }, preparePostData: function (data) { - data.q = $("#perms-box").val(); - return data; + data.q = $("#perms-box").val(); + return data; }, getValue: function (element) { - return element.name; + return element.name; }, template: { - type: "custom", - method: function (value, item) { - return item.name + " " + item.info + ""; - } + type: "custom", + method: function (value, item) { + return item.name + " " + item.info + ""; + } }, list: { - onClickEvent: function () { - var permcode = $("#perms-box").getSelectedItemData().name; - var permdesc = $("#perms-box").getSelectedItemData().info; - addPermission(permcode, permdesc); - } + onClickEvent: function () { + var permcode = $("#perms-box").getSelectedItemData().name; + var permdesc = $("#perms-box").getSelectedItemData().info; + addPermission(permcode, permdesc); + } }, requestDelay: 500 }); @@ -118,7 +118,7 @@ $("#user-box").easyAutocomplete(options); $("#user-box").keyup(function (e) { if (e.keyCode == 13) { - $("#selectuserbtn").click(); + $("#selectuserbtn").click(); } }); @@ -128,15 +128,15 @@ $("#selectuserbtn").click(function () { $("#perms-box").keyup(function (event) { if (event.keyCode == 13) { - $("#addpermbtn").click(); - event.preventDefault(); - return false; + $("#addpermbtn").click(); + event.preventDefault(); + return false; } }); $("#perms-box").keydown(function (event) { if (event.keyCode == 13) { - event.preventDefault(); - return false; + event.preventDefault(); + return false; } });