Use native browser support for JSON

It's there in anything recent (only not supported in IE 6 and 7 which we
don't support anyway).

Signed-off-by: Michal Čihař <michal@cihar.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 1047ce51e0..6a22f0f63e 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -569,7 +569,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             $('<input />', {
                 type: "hidden",
                 name: "monitorconfig",
-                value: $.toJSON(exportData)
+                value: JSON.stringify(exportData)
             })
         )
         .appendTo('body')
@@ -616,8 +616,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
                 // If json ok, try applying config
                 try {
-                    window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts);
-                    window.localStorage['monitorSettings'] = $.toJSON(json.monitorSettings);
+                    window.localStorage['monitorCharts'] = JSON.stringify(json.monitorCharts);
+                    window.localStorage['monitorSettings'] = JSON.stringify(json.monitorSettings);
                     rebuildGrid();
                 } catch (err) {
                     alert(PMA_messages.strFailedBuildingGrid);
@@ -1316,7 +1316,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             ajax_request: true,
             chart_data: 1,
             type: 'chartgrid',
-            requiredData: $.toJSON(runtime.dataList)
+            requiredData: JSON.stringify(runtime.dataList)
         }, function (data) {
             var chartData;
             if (data.success === true) {
@@ -2076,8 +2076,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         });
 
         if (window.localStorage) {
-            window.localStorage['monitorCharts'] = $.toJSON(gridCopy);
-            window.localStorage['monitorSettings'] = $.toJSON(monitorSettings);
+            window.localStorage['monitorCharts'] = JSON.stringify(gridCopy);
+            window.localStorage['monitorSettings'] = JSON.stringify(monitorSettings);
             window.localStorage['monitorVersion'] = monitorProtocolVersion;
         }
 
diff --git a/setup/scripts.js b/setup/scripts.js
index a5a19d827d..2aefdf03f6 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -46,7 +46,7 @@ $(document).ready(function(){
      $('body').css('min-width', width);
      $('.tabs_contents').css('min-width', contentWidth);
 });
- 
+
 //
 // END: Messages
 // ------------------------------------------------------------------
@@ -84,7 +84,7 @@ function ajaxValidate(parent, id, values)
         data: {
             token: parent.closest('form').find('input[name=token]').val(),
             id: id,
-            values: $.toJSON(values)
+            values: JSON.stringify(values)
         },
         success: function (response) {
             if (response === null) {