From 1120bb597a1207074736a217a232de312af852df Mon Sep 17 00:00:00 2001
From: Tyron Madlener <tyronx@gmail.com>
Date: Thu, 11 Aug 2011 17:25:13 +0300
Subject: [PATCH] Fix: Don't show 'reset to default' if there is no config in
 localstorage

---
 js/server_status_monitor.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index a9449a3af0..0a5ad7b580 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -573,6 +573,7 @@ $(function() {
     $('a[href="#clearMonitorConfig"]').click(function() {
         window.localStorage.removeItem('monitorCharts');
         window.localStorage.removeItem('monitorSettings');
+        window.localStorage.removeItem('monitorVersion');
         $(this).hide();
         rebuildGrid();
     });
@@ -832,7 +833,7 @@ $(function() {
         var series;
 
         /* Apply default values & config */
-        if (window.localStorage && monitorProtocolVersion == window.localStorage['monitorVersion']) {
+        if (window.localStorage) {
             if (window.localStorage['monitorCharts']) {
                 runtime.charts = $.parseJSON(window.localStorage['monitorCharts']);
             }
@@ -841,19 +842,19 @@ $(function() {
             }
 
             $('a[href="#clearMonitorConfig"]').toggle(runtime.charts != null);
-        }
-        
-        if (window.localStorage && window.localStorage['monitorCharts'] && monitorProtocolVersion != window.localStorage['monitorVersion']) {
-            $('div#emptyDialog').attr('title',PMA_messages['strIncompatibleMonitorConfig']);
-            $('div#emptyDialog').html(PMA_messages['strIncompatibleMonitorConfigDescription']);
-            
-            var dlgBtns = {};
-            dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); };
-            
-            $('div#emptyDialog').dialog({ 
-                width: 400,
-                buttons: dlgBtns 
-            });
+
+            if (runtime.charts != null && monitorProtocolVersion != window.localStorage['monitorVersion']) {
+                $('div#emptyDialog').attr('title',PMA_messages['strIncompatibleMonitorConfig']);
+                $('div#emptyDialog').html(PMA_messages['strIncompatibleMonitorConfigDescription']);
+
+                var dlgBtns = {};
+                dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); };
+
+                $('div#emptyDialog').dialog({ 
+                    width: 400,
+                    buttons: dlgBtns 
+                });
+            }            
         }
 
         if (runtime.charts == null) {