merge esc key handler stuff and fixing dragging topics

This commit is contained in:
Devin Howard 2013-03-28 21:10:35 -04:00
commit c93c74094c

View file

@ -1,5 +1,4 @@
function selectEdgeOnClickHandler(adj, e) {
if (Mconsole.busy) return;
//editing overrides everything else
@ -47,6 +46,10 @@ function escKeyHandler() {
deselectAllNodes();
}//escKeyHandler
/*
* Make a node "in the commons" (with a green circle) lose its
* green circle so it stays on the console/map/...
*/
function keepFromCommons(node) {
if (userid == null) {
return;
@ -77,7 +80,6 @@ function keepFromCommons(node) {
node.setData('mappingid', data.id);
});
}
}//doubleClickNodeHandler
/*
@ -186,7 +188,11 @@ function onDragMoveTopicHandler(node, eventInfo, e) {
if ( e.touches || (e.button == 0 && !e.altKey && (e.buttons == 0 || e.buttons == 1 || e.buttons == undefined))) {
//if the node dragged isn't already selected, select it
var whatToDo = handleSelectionBeforeDragging(node, e);
if (whatToDo == 'only-drag-this-one') {
if (node.pos.rho || node.pos.rho === 0) {
var rho = Math.sqrt(pos.x * pos.x + pos.y * pos.y);
var theta = Math.atan2(pos.y, pos.x);
node.pos.setp(theta, rho);
} else if (whatToDo == 'only-drag-this-one') {
node.pos.setc(pos.x, pos.y);
node.setData('xloc', pos.x);
node.setData('yloc', pos.y);
@ -197,16 +203,18 @@ function onDragMoveTopicHandler(node, eventInfo, e) {
var xOffset = new Array();
var yOffset = new Array();
for (var i = 0; i < len; i += 1) {
n = MetamapsModel.selectedNodes[i];
xOffset[i] = n.pos.x - node.pos.x;
yOffset[i] = n.pos.y - node.pos.y;
var n = MetamapsModel.selectedNodes[i];
xOffset[i] = n.pos.x - node.pos.x;
yOffset[i] = n.pos.y - node.pos.y;
}//for
for (var i = 0; i < len; i += 1) {
n = MetamapsModel.selectedNodes[i];
n.pos.setc(pos.x + xOffset[i], pos.y + yOffset[i]);
n.setData('xloc', pos.x + xOffset[i]);
n.setData('yloc', pos.y + yOffset[i]);
var n = MetamapsModel.selectedNodes[i];
var x = pos.x + xOffset[i];
var y = pos.y + yOffset[i];
n.pos.setc(x, y);
n.setData('xloc', x);
n.setData('yloc', y);
}//for
}//if