tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed somethings in the selection box.

Browse Source
This commit is contained in:
mdtrooper 2016-04-01 12:52:46 +02:00
parent 408a68e6ab
commit 094c3d5cdb
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ MapController.prototype._minimap = null;
MapController.prototype._zoomManager = null; MapController.prototype._zoomManager = null;
MapController.prototype._slider = null; MapController.prototype._slider = null;
MapController.prototype._relation = null; MapController.prototype._relation = null;
MapController.prototype._start_flag_multiple_selection = false;
MapController.prototype._flag_multiple_selection = false; MapController.prototype._flag_multiple_selection = false;
MapController.prototype._cache_files = {}; MapController.prototype._cache_files = {};
MapController.prototype._last_event = null; MapController.prototype._last_event = null;
@ -96,7 +97,6 @@ MapController.prototype.init_map = function() {
} }
else { else {
self.last_event = null; self.last_event = null;
// Reset the zoom and panning actual // Reset the zoom and panning actual
@ -1337,12 +1337,14 @@ MapController.prototype.init_events = function(principalObject) {
.on("keydown", function() { .on("keydown", function() {
// ctrl key // ctrl key
if (d3.event.keyCode === CONTROL_KEY) { if (d3.event.keyCode === CONTROL_KEY) {
self._start_flag_multiple_selection = true;
self.multiple_selection_start(); self.multiple_selection_start();
} }
}) })
.on("keyup", function() { .on("keyup", function() {
if (d3.event.keyCode === CONTROL_KEY) { if (d3.event.keyCode === CONTROL_KEY) {
self.multiple_selection_end(); self.multiple_selection_end();
self._last_event = "multiple_selection_end";
} }
}); });
@ -1457,6 +1459,10 @@ MapController.prototype.init_events = function(principalObject) {
d3.select(self._target + " svg").on("mousedown", d3.select(self._target + " svg").on("mousedown",
function() { function() {
if (self._start_flag_multiple_selection) {
self._start_flag_multiple_selection = false;
self._flag_multiple_selection = true;
}
if (self._flag_multiple_selection) { if (self._flag_multiple_selection) {
self.multiple_selection_dragging( self.multiple_selection_dragging(
@ -1470,6 +1476,11 @@ MapController.prototype.init_events = function(principalObject) {
d3.select(self._target + " svg").on("mouseup", d3.select(self._target + " svg").on("mouseup",
function(d) { function(d) {
if (self._last_event == "multiple_selection_end") {
self._last_event = null;
return;
}
if (!self._flag_multiple_selection) { if (!self._flag_multiple_selection) {
if (self.last_event != "zoom") { if (self.last_event != "zoom") {
self.last_event = null; self.last_event = null;
@ -1507,11 +1518,14 @@ MapController.prototype.init_events = function(principalObject) {
self.last_event = null; self.last_event = null;
} }
} }
else {
self.multiple_selection_end();
}
}); });
d3.select(self._target + " svg").on("mousemove", d3.select(self._target + " svg").on("mousemove",
function() { function() {
if (self._flag_multiple_selection && self._start_multiple_selection) { if (self._flag_multiple_selection) {
self.multiple_selection_dragging( self.multiple_selection_dragging(
d3.event.offsetX, d3.event.offsetX,
d3.event.offsetY, false); d3.event.offsetY, false);
@ -1842,8 +1856,6 @@ MapController.prototype.get_status_selection_node = function(id_node) {
MapController.prototype.multiple_selection_start = function() { MapController.prototype.multiple_selection_start = function() {
var self = this; var self = this;
self._flag_multiple_selection = true;
if (!self._cache_files.hasOwnProperty("selection_box")) { if (!self._cache_files.hasOwnProperty("selection_box")) {
var selection_box = d3 var selection_box = d3
.select(self._target + " svg") .select(self._target + " svg")