From af8059acaab677d2f7bf8075776c28e3ed046b82 Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Sat, 9 Jul 2016 15:50:13 +0300
Subject: [PATCH] Refactor requests.js code

---
 media/js/requests.js | 51 +++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/media/js/requests.js b/media/js/requests.js
index 8a2a6de0a..7c819332c 100644
--- a/media/js/requests.js
+++ b/media/js/requests.js
@@ -1,20 +1,14 @@
 $(function () {
 
-    var $statusFilter = $("#statusFilter");
-
-    $(".RequestTitle").click(function (e) {
+    
+    $('.RequestTitle').click(function (e) {
         var currentID = e.target.id;
         var descriptionID = currentID.replace('requestTitle', '#requestContent');
         $(descriptionID).slideToggle(300);
     });
 
-
-    $statusFilter.change(function () {
-            location.href = "?filter=" + $(this).val();
-        }
-    );
-
-
+    $('#statusFilter').change(e => location.href = "?filter=" + $(e.target).val());
+    
     $(".RequestStatus").change(function (e) {
         var requestId = e.target.id.replace('requestStatus', '');
         var status = $(this).val();
@@ -22,35 +16,24 @@ $(function () {
         var $statusSelect = $(this);
         var $issue = $("#requestIssue".concat(requestId));
         $statusSelect.prop( "disabled", true );
-        $.ajax({
-            type: "POST",
-            url: URLdir + "handler/RequestsProcessing/setStatus",
-            data: {
-                requestID: requestId,
-                status: status
-            },
-            success: function (data) {
-                data = $.parseJSON(data);
-                if (data.success === true) {
-                    EventInspector.success('Статус изменен!');
-                }
-                else {
-                    EventInspector.error('Ошибка!');
-                }
-                $statusSelect.prop( "disabled", false );
-            }
-        });
 
-        if (filter != 'all' && status != filter) {
+        $.postJSON(URLdir + 'handler/RequestsProcessing/setStatus', {
+            requestID: requestId,
+            status:    status
+        }).always(_ => $statusSelect.turnOn())
+            .done(res => {
+                if (res.success === true)
+                    Popup.success('Статус изменён!');
+                else
+                    Popup.error('Ошибка!');
+            });
+        if (filter != 'all' && status != filter)
             $issue.attr('style', 'border: 3px solid #B70400');
-        }
-        else {
+        else
             $issue.attr('style', '');
-        }
-
     });
 
-    $(".RefreshButton").click(function () {
+    $('.RefreshButton').click(function () {
         $(this).attr('class', 'fa fa-refresh fa-spin fa-md RefreshButton');
         $statusFilter.change();
     });
-- 
GitLab