tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

New maps in progress... (click control)

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-03-08 13:02:51 +01:00
parent 3f6e8d15fb
commit c990dac63b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/javascript/map/MapController.js
View File

@ -156,7 +156,10 @@ MapController.prototype.init_map = function() {
.property("step", Math.log(MAX_ZOOM_LEVEL) * 2 / MAX_ZOOM_LEVEL) .property("step", Math.log(MAX_ZOOM_LEVEL) * 2 / MAX_ZOOM_LEVEL)
.on("input", slided); .on("input", slided);
$("svg").on("contextmenu", function() {
return false;
});
d3.select("#map .zoom_box .home_zoom") d3.select("#map .zoom_box .home_zoom")
.on("click", home_zoom); .on("click", home_zoom);
@ -165,8 +168,7 @@ MapController.prototype.init_map = function() {
d3.select("#map .zoom_box .zoom_out") d3.select("#map .zoom_box .zoom_out")
.on("click", zoom_out); .on("click", zoom_out);
self.paint_nodes(); self.paint_nodes();
this.init_events(); this.init_events();
@ -513,6 +515,11 @@ MapController.prototype.init_events = function(principalObject) {
.attr("style", "fill: rgb(50, 50, 128);"); .attr("style", "fill: rgb(50, 50, 128);");
}) })
.on("click", function(d) { .on("click", function(d) {
if (d3.event.button != 0) {
d3.event.stopPropagation();
d3.event.preventDefault();
}
if (d3.event.defaultPrevented) return; if (d3.event.defaultPrevented) return;
self.tooltip_map_create(self, this); self.tooltip_map_create(self, this);
@ -527,7 +534,10 @@ MapController.prototype.init_events = function(principalObject) {
d3.selectAll(".draggable").call(drag); d3.selectAll(".draggable").call(drag);
function dragstarted(d) { function dragstarted(d) {
d3.event.sourceEvent.stopPropagation(); if (d3.event.sourceEvent.button == 0) {
d3.event.sourceEvent.stopPropagation();
d3.event.sourceEvent.preventDefault();
}
if ($("#node_" + d['graph_id']).hasClass("tooltipstered")) { if ($("#node_" + d['graph_id']).hasClass("tooltipstered")) {
$("#node_" + d['graph_id']).tooltipster('destroy'); $("#node_" + d['graph_id']).tooltipster('destroy');