From 0672cd0483febdda7171e303ad73e6989d56150e Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 8 Mar 2019 18:36:05 +0100
Subject: [PATCH] clean, move jquery-bootgrid converters now included in
 library

---
 .../views/OPNsense/CaptivePortal/clients.volt |  7 ------
 .../OPNsense/Diagnostics/systemactivity.volt  | 25 -------------------
 .../mvc/app/views/OPNsense/Proxy/index.volt   | 11 --------
 .../views/OPNsense/TrafficShaper/index.volt   | 11 --------
 4 files changed, 54 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt b/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
index 56cf78ac9..92d87d4cc 100644
--- a/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
@@ -64,13 +64,6 @@ POSSIBILITY OF SUCH DAMAGE.
                     "commands": function (column, row) {
                         return  "<button type=\"button\" class=\"btn btn-xs btn-default command-disconnect\" data-row-id=\"" + row.sessionid + "\"><span class=\"fa fa-trash-o\"></span></button>";
                     }
-                },
-                converters: {
-                    // convert datetime type fields from unix timestamp to readable format
-                    datetime: {
-                        from: function (value) { return moment(parseInt(value)*1000); },
-                        to: function (value) { return value.format("lll"); }
-                    }
                 }
             };
             $("#grid-clients").bootgrid('destroy');
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt
index 533bf103d..e40d61fa7 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt
@@ -29,7 +29,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 <script>
     'use strict';
-    const modifiers = ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
 
     $( document ).ready(function() {
         /**
@@ -40,30 +39,6 @@ POSSIBILITY OF SUCH DAMAGE.
                 ajax: false,
                 selection: true,
                 multiSelect: true,
-                converters: {
-                    memsize: {
-                        from: function (value) {
-                            let ret = parseInt(value);
-                            let modifier = value.slice(-1);
-
-                            for (let exponent = modifiers.length - 1; exponent >= 0; exponent--) {
-                                if (modifier === modifiers[exponent]) {
-                                    ret *= Math.pow(1024, exponent);
-                                    break;
-                                }
-                            }
-                            return ret;
-                        },
-                        to: function (value) {
-                            for (let exponent = modifiers.length - 1; exponent >= 0; exponent--) {
-                                if (value >= (5 * Math.pow(1024, exponent))) {
-                                    return parseInt(value / Math.pow(1024, exponent)) + modifiers[exponent];
-                                }
-                            }
-                            return parseInt(value) + '';
-                        }
-                    }
-                }
             };
             $("#grid-top").bootgrid('destroy');
             ajaxGet("/api/diagnostics/activity/getActivity", {}, function (data, status) {
diff --git a/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt b/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt
index 7c034ed16..bc4887e33 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt
@@ -58,17 +58,6 @@
                     'add':'/api/proxy/settings/addPACMatch/',
                     'del':'/api/proxy/settings/delPACMatch/',
                     'options': {
-                        converters: {
-                            notprefixable: {
-                                to: function (value) {
-                                    if (value.not) {
-                                        return '<i class="fa fa-exclamation"></i> ' + value.val;
-                                    } else {
-                                        return value.val;
-                                    }
-                                }
-                            }
-                        },
                         responseHandler: function (response) {
                             // concatenate fields for not.
                             if ('rows' in response) {
diff --git a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
index 086510cc6..c805ac4ff 100644
--- a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
@@ -67,17 +67,6 @@ POSSIBILITY OF SUCH DAMAGE.
                     del:'/api/trafficshaper/settings/delRule/',
                     toggle:'/api/trafficshaper/settings/toggleRule/',
                     options: {
-                        converters: {
-                            notprefixable: {
-                                to: function (value) {
-                                    if (value.not) {
-                                        return '<i class="fa fa-exclamation"></i> ' + value.val;
-                                    } else {
-                                        return value.val;
-                                    }
-                                }
-                            }
-                        },
                         responseHandler: function (response) {
                             // concatenate fields for not.
                             if ('rows' in response) {