From faa3d2c24cfc414090c4f4c3901c4723e7b2789e Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Fri, 24 May 2013 01:41:48 +0530
Subject: [PATCH] Merge commit e2163b39e9a5d17cab5c1ad4372ae491f08ae1fa

---
 js/server_status_monitor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 8cee9121af..25b8ecd16b 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1268,8 +1268,8 @@ AJAX.registerOnload('server_status_monitor.js', function() {
                 .fadeIn();
         });
 
-        $('#gridchart' + runtime.chartAI).bind('jqplotMouseUp', function(ev, gridpos, datapos, neighbor, plot) {
-            if (! drawTimeSpan) {
+        $('#gridchart' + runtime.chartAI).bind('jqplotMouseUp', function (ev, gridpos, datapos, neighbor, plot) {
+            if (! drawTimeSpan || editMode) {
                 return;
             }
 
@@ -1287,8 +1287,8 @@ AJAX.registerOnload('server_status_monitor.js', function() {
             drawTimeSpan = false;
         });
 
-        $('#gridchart' + runtime.chartAI).bind('jqplotMouseMove', function(ev, gridpos, datapos, neighbor, plot) {
-            if (! drawTimeSpan) {
+        $('#gridchart' + runtime.chartAI).bind('jqplotMouseMove', function (ev, gridpos, datapos, neighbor, plot) {
+            if (! drawTimeSpan || editMode) {
                 return;
             }
             if (selectionStartX != undefined) {