QA: Restore SpikeKill Menu

include/themes/dark/main.js

@@ -109,6 +109,10 @@ function themeReady() {
 			element = $(this);
 			clearTimeout(graphMenuTimer);
 			graphMenuTimer = setTimeout(function() { hideGraphMenu(element); }, 400);
+
+			if (typeof spikeKillClose == 'function') {
+				spikeKillClose();
+			}
 		}
 	);
 

include/themes/midwinter/main.js

@@ -798,6 +798,10 @@ function setupDefaultElements() {
 			element = $(this);
 			clearTimeout(graphMenuTimer);
 			graphMenuTimer = setTimeout(function() { hideGraphMenu(element); }, 400);
+
+			if (typeof spikeKillClose == 'function') {
+				spikeKillClose();
+			}
 		}
 	);
 

include/themes/sunrise/main.js

@@ -173,6 +173,10 @@ function themeReady() {
 			element = $(this);
 			clearTimeout(graphMenuTimer);
 			graphMenuTimer = setTimeout(function() { hideGraphMenu(element); }, 400);
+
+			if (typeof spikeKillClose == 'function') {
+				spikeKillClose();
+			}
 		}
 	);
 

lib/html.php

@@ -2921,20 +2921,18 @@ function html_spikekill_menu($local_graph_id) {
 function html_spikekill_js() {
 	?>
 	<script type='text/javascript'>
-	spikeKillOpen = false;
+	var spikeKillOpen = false;
+
 	$(function() {
 		$(document).click(function() {
-			if (spikeKillOpen) {
-				$(this).find('.spikekillMenu').menu('destroy').parent().remove();
-				spikeKillOpen = false;
-			}
+			spikeKillClose();
 		});
 
-		$('span.spikekill').children().contextmenu(function() {
+		$('div.spikekill').children().contextmenu(function() {
 			return false;
 		});
 
-		$('span.spikekill').unbind().click(function() {
+		$('div.spikekill').unbind().click(function() {
 			if (spikeKillOpen == false) {
 				local_graph_id = $(this).attr('data-graph');
 
@@ -2967,12 +2965,18 @@ function html_spikekill_js() {
 					});
 
 			} else {
-				spikeKillOpen = false;
-				$(this).find('.spikekillMenu').menu('destroy').parent().remove();
+				spikeKillClose();
 			}
 		});
 	});
 
+	function spikeKillClose() {
+		if (spikeKillOpen) {
+			$(document).find('.spikekillMenu').menu('destroy').parent().remove();
+			spikeKillOpen = false;
+		}
+	}
+
 	function spikeKillActions() {
 		$('.rstddev').unbind().click(function() {
 			removeSpikesStdDev($(this).attr('data-graph'));