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

fixes #1515; fixes #1405

Browse Source 
* Notes can be resized while the edit window is opened.
* Notes will remain dim when editing, except when one is hovered over.
* Only one note editing window can be open at a time (for any number of
notes).

Related: #78
This commit is contained in:
Toks
2013-05-12 13:01:41 -04:00
parent e99f3f1747
commit 31ffff1687
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,8 +66,18 @@ Danbooru.Note = {
var $note_box_inner = $(e.currentTarget); var $note_box_inner = $(e.currentTarget);
if (e.type === "mouseover") { if (e.type === "mouseover") {
Danbooru.Note.Body.show($note_box_inner.data("id")); Danbooru.Note.Body.show($note_box_inner.data("id"));
if (Danbooru.Note.editing) {
var $this = $(this);
$this.resizable("enable");
$this.draggable("enable");
}
} else if (e.type === "mouseout") { } else if (e.type === "mouseout") {
Danbooru.Note.Body.hide($note_box_inner.data("id")); Danbooru.Note.Body.hide($note_box_inner.data("id"));
if (Danbooru.Note.editing) {
var $this = $(this);
$this.resizable("disable");
$this.draggable("disable");
}
} }
e.stopPropagation(); e.stopPropagation();
@@ -162,10 +172,6 @@ Danbooru.Note = {
}, },
show: function(id) { show: function(id) {
if (Danbooru.Note.editing) {
return;
}
Danbooru.Note.Body.hide_all(); Danbooru.Note.Body.hide_all();
Danbooru.Note.clear_timeouts(); Danbooru.Note.clear_timeouts();
var $note_body = Danbooru.Note.Body.find(id); var $note_body = Danbooru.Note.Body.find(id);
@@ -312,7 +318,7 @@ Danbooru.Note = {
$(".note-box").resizable("enable"); $(".note-box").resizable("enable");
$(".note-box").draggable("enable"); $(".note-box").draggable("enable");
}); });
// Danbooru.Note.editing = true; Danbooru.Note.editing = true;
}, },
parameterize_note: function($note_box, $note_body) { parameterize_note: function($note_box, $note_body) {
@@ -410,7 +416,7 @@ Danbooru.Note = {
var id = $this.data("id"); var id = $this.data("id");
Danbooru.Note.Box.find(id).remove(); Danbooru.Note.Box.find(id).remove();
Danbooru.Note.Body.find(id).remove(); Danbooru.Note.Body.find(id).remove();
$(this).dialog("close"); $this.dialog("close");
if (id.match(/\d/)) { if (id.match(/\d/)) {
$.ajax("/notes/" + id + ".js", { $.ajax("/notes/" + id + ".js", {