jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1498

Browse Source
This commit is contained in:
Toks
2013-05-01 16:09:35 -04:00
parent f2fc7370d2
commit 45cd8fd839
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/assets/javascripts/notes.js
View File

@@ -451,6 +451,10 @@ Danbooru.Note = {
dragStartY: 0, dragStartY: 0,
dragDistanceY: 0, dragDistanceY: 0,
dragDistanceY: 0, dragDistanceY: 0,
x: 0,
y: 0,
w: 0,
h: 0,
start: function (e) { start: function (e) {
e.preventDefault(); /* don't drag the image */ e.preventDefault(); /* don't drag the image */
@@ -462,18 +466,35 @@ Danbooru.Note = {
drag: function (e) { drag: function (e) {
Danbooru.Note.TranslationMode.Drag.dragDistanceX = e.pageX - Danbooru.Note.TranslationMode.Drag.dragStartX; Danbooru.Note.TranslationMode.Drag.dragDistanceX = e.pageX - Danbooru.Note.TranslationMode.Drag.dragStartX;
Danbooru.Note.TranslationMode.Drag.dragDistanceY = e.pageY - Danbooru.Note.TranslationMode.Drag.dragStartY; Danbooru.Note.TranslationMode.Drag.dragDistanceY = e.pageY - Danbooru.Note.TranslationMode.Drag.dragStartY;
if(Danbooru.Note.TranslationMode.Drag.dragDistanceX > 9 && Danbooru.Note.TranslationMode.Drag.dragDistanceY > 9) { if (Danbooru.Note.TranslationMode.Drag.dragDistanceX > 9 && Danbooru.Note.TranslationMode.Drag.dragDistanceY > 9) {
Danbooru.Note.TranslationMode.Drag.dragging = true; /* must drag at least 10pixels (minimum note size) in both dimensions. */ Danbooru.Note.TranslationMode.Drag.dragging = true; /* must drag at least 10pixels (minimum note size) in both dimensions. */
} }
if(Danbooru.Note.TranslationMode.Drag.dragging) { if (Danbooru.Note.TranslationMode.Drag.dragging) {
var offset = $("#image").offset(); var offset = $("#image").offset();
if (Danbooru.Note.TranslationMode.Drag.dragDistanceX < 0) {
Danbooru.Note.TranslationMode.Drag.x = Danbooru.Note.TranslationMode.Drag.dragStartX + Danbooru.Note.TranslationMode.Drag.dragDistanceX;
Danbooru.Note.TranslationMode.Drag.w = -Danbooru.Note.TranslationMode.Drag.dragDistanceX;
} else {
Danbooru.Note.TranslationMode.Drag.x = Danbooru.Note.TranslationMode.Drag.dragStartX;
Danbooru.Note.TranslationMode.Drag.w = Danbooru.Note.TranslationMode.Drag.dragDistanceX;
}
if (Danbooru.Note.TranslationMode.Drag.dragDistanceY < 0) {
Danbooru.Note.TranslationMode.Drag.y = Danbooru.Note.TranslationMode.Drag.dragStartY + Danbooru.Note.TranslationMode.Drag.dragDistanceY;
Danbooru.Note.TranslationMode.Drag.h = -Danbooru.Note.TranslationMode.Drag.dragDistanceY;
} else {
Danbooru.Note.TranslationMode.Drag.y = Danbooru.Note.TranslationMode.Drag.dragStartY;
Danbooru.Note.TranslationMode.Drag.h = Danbooru.Note.TranslationMode.Drag.dragDistanceY;
}
$('#note-helper').css({ /* preview of the note you are dragging */ $('#note-helper').css({ /* preview of the note you are dragging */
display: 'block', display: 'block',
left: (Danbooru.Note.TranslationMode.Drag.dragStartX - offset.left + 1), left: (Danbooru.Note.TranslationMode.Drag.x - offset.left + 1),
top: (Danbooru.Note.TranslationMode.Drag.dragStartY - offset.top + 1), top: (Danbooru.Note.TranslationMode.Drag.y - offset.top + 1),
width: (Danbooru.Note.TranslationMode.Drag.dragDistanceX - 3), width: (Danbooru.Note.TranslationMode.Drag.w - 3),
height: (Danbooru.Note.TranslationMode.Drag.dragDistanceY - 3) height: (Danbooru.Note.TranslationMode.Drag.h - 3)
}); });
} }
}, },
@@ -482,7 +503,7 @@ Danbooru.Note = {
$(window).unbind("mousemove"); $(window).unbind("mousemove");
if(Danbooru.Note.TranslationMode.Drag.dragging) { if(Danbooru.Note.TranslationMode.Drag.dragging) {
$('#note-helper').css({display:'none'}); $('#note-helper').css({display:'none'});
Danbooru.Note.TranslationMode.create_note(e, true, Danbooru.Note.TranslationMode.Drag.dragStartX, Danbooru.Note.TranslationMode.Drag.dragStartY, Danbooru.Note.TranslationMode.Drag.dragDistanceX-1, Danbooru.Note.TranslationMode.Drag.dragDistanceY-1); Danbooru.Note.TranslationMode.create_note(e, true, Danbooru.Note.TranslationMode.Drag.x, Danbooru.Note.TranslationMode.Drag.y, Danbooru.Note.TranslationMode.Drag.w-1, Danbooru.Note.TranslationMode.Drag.h-1);
Danbooru.Note.TranslationMode.Drag.dragging = false; /* border of the note is pixel-perfect on the preview border */ Danbooru.Note.TranslationMode.Drag.dragging = false; /* border of the note is pixel-perfect on the preview border */
} else { /* no dragging -> create a normal note */ } else { /* no dragging -> create a normal note */
Danbooru.Note.TranslationMode.create_note(e); Danbooru.Note.TranslationMode.create_note(e);