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

fixes #1675

Browse Source
This commit is contained in:
Toks
2013-08-08 16:35:18 -04:00
parent 248d008c8c
commit a1ab9603db
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,10 +123,6 @@ Danbooru.Note = {
}, },
toggle_all: function() { toggle_all: function() {
// Ignore the click event when adding a note
if ((new Date).getTime() < Danbooru.Note.ignore_click_until) {
return;
}
var $note_container = $("#note-container"); var $note_container = $("#note-container");
var is_hidden = ($note_container.css('visibility') === 'hidden'); var is_hidden = ($note_container.css('visibility') === 'hidden');
@@ -476,7 +472,7 @@ Danbooru.Note = {
$("#image").bind("mousedown", Danbooru.Note.TranslationMode.Drag.start); $("#image").bind("mousedown", Danbooru.Note.TranslationMode.Drag.start);
$(window).bind("mouseup", Danbooru.Note.TranslationMode.Drag.stop); $(window).bind("mouseup", Danbooru.Note.TranslationMode.Drag.stop);
Danbooru.notice('Translation mode is on. Click or drag on the image to create notes. <a href="#">Turn translation mode off</a> (shortcut is <span class="key">n</span>).'); Danbooru.notice('Translation mode is on. Drag on the image to create notes. <a href="#">Turn translation mode off</a> (shortcut is <span class="key">n</span>).');
$("#notice a:contains(Turn translation mode off)").click(Danbooru.Note.TranslationMode.stop); $("#notice a:contains(Turn translation mode off)").click(Danbooru.Note.TranslationMode.stop);
}, },
@@ -489,20 +485,16 @@ Danbooru.Note = {
$("#close-notice-link").click(); $("#close-notice-link").click();
}, },
create_note: function(e,dragged,x,y,w,h) { create_note: function(e, x, y, w, h) {
var offset = $("#image").offset(); var offset = $("#image").offset();
if (dragged) { if (w > 9 || h > 9) { /* minimum note size: 10px */
if (w > 9 || h > 9) { /* minimum note size: 10px */ if (w <= 9) {
if (w <= 9) { w = 10;
w = 10; } else if (h <= 9) {
} else if (h <= 9) { h = 10;
h = 10;
}
Danbooru.Note.create(x - offset.left, y - offset.top, w, h);
} }
} else { Danbooru.Note.create(x - offset.left, y - offset.top, w, h);
Danbooru.Note.create(e.pageX - offset.left, e.pageY - offset.top);
} }
$("#note-container").css('visibility', 'visible'); $("#note-container").css('visibility', 'visible');
@@ -592,10 +584,10 @@ Danbooru.Note = {
if (Danbooru.Note.TranslationMode.Drag.dragging) { if (Danbooru.Note.TranslationMode.Drag.dragging) {
$('#note-preview').css({display:'none'}); $('#note-preview').css({display:'none'});
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.create_note(e, 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 -> toggle display of notes */
Danbooru.Note.TranslationMode.create_note(e); Danbooru.Note.toggle_all();
} }
Danbooru.Note.TranslationMode.Drag.dragStartX = 0; Danbooru.Note.TranslationMode.Drag.dragStartX = 0;
@@ -676,6 +668,11 @@ $(function() {
$(document).bind("keypress", "n", Danbooru.Note.TranslationMode.toggle); $(document).bind("keypress", "n", Danbooru.Note.TranslationMode.toggle);
} }
Danbooru.Note.load_all(); Danbooru.Note.load_all();
$("#image").click(Danbooru.Note.Box.toggle_all); $("#image").click(function(e) {
// Ignore the click event when adding a note
if ((new Date).getTime() >= Danbooru.Note.ignore_click_until) {
Danbooru.Note.Box.toggle_all();
}
});
} }
}); });