mrflos/memo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #52 from tboronczyk/drag-cancel

Browse source 
ESC key cancels card drag
This commit is contained in:
ali asaria 2013-12-08 07:16:24 -08:00
commit 92e5469ea4
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
client/script.js
View file

@ -3,7 +3,7 @@ var totalcolumns = 0;
var columns = []; var columns = [];
var currentTheme = "bigcards"; var currentTheme = "bigcards";
var boardInitialized = false; var boardInitialized = false;
var keyTrap = null;
var socket = io.connect(); var socket = io.connect();
@ -154,7 +154,9 @@ function getMessage( m )
} }
$(document).bind('keyup', function(event) {
keyTrap = event.which;
});
function drawNewCard(id, text, x, y, rot, colour, sticker, animationspeed) function drawNewCard(id, text, x, y, rot, colour, sticker, animationspeed)
{ {
@ -185,12 +187,25 @@ function drawNewCard(id, text, x, y, rot, colour, sticker, animationspeed)
snap: false, snap: false,
snapTolerance: 5, snapTolerance: 5,
containment: [0,0,2000,2000], containment: [0,0,2000,2000],
stack: ".card" stack: ".card",
start: function (event, ui) {
keyTrap = null;
},
drag: function (event, ui) {
if (keyTrap == 27) {
ui.helper.css(ui.originalPosition);
return false;
}
}
} }
); );
//After a drag: //After a drag:
card.bind( "dragstop", function(event, ui) { card.bind( "dragstop", function(event, ui) {
if (keyTrap == 27) {
keyTrap = null;
return;
}
var data = { var data = {
id: this.id, id: this.id,