frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Touch: double tap to edit rather than long-touch

Browse Source
This commit is contained in:
Nick O'Leary 2014-05-09 23:46:36 +01:00
parent a3dea6ec0d
commit ec5985eaa3
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/red/ui/view.js
View File

@ -38,7 +38,6 @@ RED.view = function() {
moving_set = [], moving_set = [],
dirty = false, dirty = false,
lasso = null, lasso = null,
pressTimer = null,
clickTime = 0, clickTime = 0,
clickElapsed = 0; clickElapsed = 0;
@ -243,9 +242,8 @@ RED.view = function() {
} }
function canvasMouseMove() { function canvasMouseMove() {
clearTimeout(pressTimer);
mouse_position = d3.touches(this)[0]||d3.mouse(this); mouse_position = d3.touches(this)[0]||d3.mouse(this);
// Prevent touch scrolling... // Prevent touch scrolling...
//if (d3.touches(this)[0]) { //if (d3.touches(this)[0]) {
// d3.event.preventDefault(); // d3.event.preventDefault();
@ -316,14 +314,13 @@ RED.view = function() {
(mousePos[0]-sc*(scale)*node_width)+" "+(mousePos[1]-scaleY*node_height)+" "+ (mousePos[0]-sc*(scale)*node_width)+" "+(mousePos[1]-scaleY*node_height)+" "+
mousePos[0]+" "+mousePos[1] mousePos[0]+" "+mousePos[1]
); );
} else if (mouse_mode == RED.state.MOVING) { } else if (mouse_mode == RED.state.MOVING) {
var m = mouse_position; var m = mouse_position;
var d = (mouse_offset[0]-m[0])*(mouse_offset[0]-m[0]) + (mouse_offset[1]-m[1])*(mouse_offset[1]-m[1]); var d = (mouse_offset[0]-m[0])*(mouse_offset[0]-m[0]) + (mouse_offset[1]-m[1])*(mouse_offset[1]-m[1]);
if (d > 2) { if (d > 2) {
mouse_mode = RED.state.MOVING_ACTIVE; mouse_mode = RED.state.MOVING_ACTIVE;
clickElapsed = 0; clickElapsed = 0;
clearTimeout(pressTimer);
} }
} else if (mouse_mode == RED.state.MOVING_ACTIVE || mouse_mode == RED.state.IMPORT_DRAGGING) { } else if (mouse_mode == RED.state.MOVING_ACTIVE || mouse_mode == RED.state.IMPORT_DRAGGING) {
var mousePos = mouse_position; var mousePos = mouse_position;
@ -369,7 +366,6 @@ RED.view = function() {
} }
function canvasMouseUp() { function canvasMouseUp() {
clearTimeout(pressTimer);
if (mousedown_node && mouse_mode == RED.state.JOINING) { if (mousedown_node && mouse_mode == RED.state.JOINING) {
drag_line.attr("class", "drag_line_hidden"); drag_line.attr("class", "drag_line_hidden");
} }
@ -725,9 +721,6 @@ RED.view = function() {
} }
function nodeMouseDown(d) { function nodeMouseDown(d) {
if (typeof d3.touches(this)[0] == "object") {
pressTimer = setTimeout(function() { RED.editor.edit(d); }, 1500);
}
if (mouse_mode == RED.state.IMPORT_DRAGGING) { if (mouse_mode == RED.state.IMPORT_DRAGGING) {
RED.keyboard.remove(/* ESCAPE */ 27); RED.keyboard.remove(/* ESCAPE */ 27);
updateSelection(); updateSelection();
@ -889,7 +882,7 @@ RED.view = function() {
//node.append("rect").attr("class", "node-gradient-bottom").attr("rx", 6).attr("ry", 6).attr("height",30).attr("stroke","none").attr("fill","url(#gradient-bottom)").style("pointer-events","none"); //node.append("rect").attr("class", "node-gradient-bottom").attr("rx", 6).attr("ry", 6).attr("height",30).attr("stroke","none").attr("fill","url(#gradient-bottom)").style("pointer-events","none");
mainRect.on("mouseup",nodeMouseUp); mainRect.on("mouseup",nodeMouseUp);
mainRect.on("touchend",function(){ clearTimeout(pressTimer); nodeMouseUp; }); mainRect.on("touchend",nodeMouseUp);
//mainRect.on("touchend",nodeMouseUp); //mainRect.on("touchend",nodeMouseUp);
if (d._def.icon) { if (d._def.icon) {
@ -1109,9 +1102,7 @@ RED.view = function() {
updateSelection(); updateSelection();
redraw(); redraw();
d3.event.stopPropagation(); d3.event.stopPropagation();
pressTimer = setTimeout(function() { deleteSelection(); }, 1500); });
})
.on("touchend",function() { clearTimeout(pressTimer); });
link.exit().remove(); link.exit().remove();