diff --git a/media/js/event_inspector/eventInspector.js b/media/js/event_inspector/eventInspector.js index 635e89d5dab57605f0b0b6bbca3f5822bdc364c1..8e903447eb664dcacfef38932a4ad840c74b2b77 100644 --- a/media/js/event_inspector/eventInspector.js +++ b/media/js/event_inspector/eventInspector.js @@ -6,13 +6,12 @@ var inspectorList; $(function () { $('body').append('<div class="EventInspectorList"></div>'); inspectorList = $('div.EventInspectorList'); - inspectorList.on('click', 'div.EventItem', _ => $(this).remove()); + inspectorList.on('click', 'div.EventItem', () => $(this).remove()); - $(window).scroll(function () { + $(window).scroll(() => { let size = $(this).scrollTop() > 40 ? '20px' : '50px'; inspectorList.css('top', size); }); - }); var EventInspector = { @@ -22,13 +21,20 @@ var EventInspector = { ++inspectorCounter; - var MsgDiv = inspectorList.append(`<div class="EventItem ${type}">${text}</div>`).children().last(); + var $msg = inspectorList.append(`<div class="EventItem ${type}">${text}</div>`).children().last(); - let hideMsg = () => MsgDiv.animate({ opacity: 0 }, 1000, _ => MsgDiv.remove()); + let hideMsg = () => $msg.animate({ opacity: 0 }, 1000, () => $msg.remove()); setTimeout(() => { --inspectorCounter, hideMsg() }, 4000); }, + message: function(isSuccess, successMsg, failMsg) { + if (isSuccess) + this.show(successMsg, 'success'); + else + this.show(failMsg, 'error'); + }, + error: function (text) { this.show(text, 'error'); }, diff --git a/media/js/requests.js b/media/js/requests.js index 165bf3c993de764f3ead894a80b3c31adfc07928..d6707dbb23b5c9fed5bb333f49c06cd1a8929dba 100644 --- a/media/js/requests.js +++ b/media/js/requests.js @@ -1,21 +1,21 @@ $(function () { var $statusFilter = $('#statusFilter'); - $('.RequestTitle').click(function (e) { - var currentID = e.target.id; - var descriptionID = currentID.replace('requestTitle', '#requestContent'); + $('.RequestTitle').click(e => { + let currentID = e.target.id; + let descriptionID = currentID.replace('requestTitle', '#requestContent'); $(descriptionID).slideToggle(300); }); - var changeFilter = e => location.href = "?filter=" + $(e.target).val(); - $statusFilter.change(changeFilter); + let updatePage = status => location.href = `?filter=${status}`; + $statusFilter.change(e => updatePage($(e.target).val())); $('.RequestStatus').change(function (e) { - var requestId = e.target.id.replace('requestStatus', ''); - var status = $(this).val(); - var filter = $statusFilter.val(); - var $statusSelect = $(this); - var $issue = $("#requestIssue".concat(requestId)); + let requestId = e.target.id.replace('requestStatus', ''); + let status = $(this).val(); + let filter = $statusFilter.val(); + let $statusSelect = $(this); + let $issue = $("#requestIssue".concat(requestId)); $statusSelect.turnOff(); @@ -23,19 +23,14 @@ $(function () { requestID: requestId, status: status }).always(_ => $statusSelect.turnOn()) - .done(res => { - if (res.success === true) - Popup.success('Статус изменён!'); - else - Popup.error('Ошибка!'); - }); + .done(res => Popup.message(!!res.success, 'Статус изменён!', 'Ошибка!')); - var isSatisfyFilter = filter == 'all' || status == filter; + let isSatisfyFilter = filter == 'all' || status == filter; $issue.attr('style', isSatisfyFilter ? '' : 'border: 3px solid #B70400'); }); $('.RefreshButton').click(function () { $(this).attr('class', 'fa fa-refresh fa-spin fa-md RefreshButton'); - changeFilter(); + updatePage($statusFilter.val()); }); });