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

notes: allow deleting new notes.

Browse Source 
Allow new unsaved notes to be deleted. Before trying to delete a new
note did nothing.
This commit is contained in:
evazion
2020-07-29 02:40:59 -05:00
parent 2cbce9a525
commit fe557e7e85
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/src/javascripts/notes.js
View File

@@ -15,7 +15,7 @@ class Note {
// Notes must be at least 10x10 in size so they're big enough to drag and resize. // Notes must be at least 10x10 in size so they're big enough to drag and resize.
static MIN_NOTE_SIZE = 10; static MIN_NOTE_SIZE = 10;
static notes = []; static notes = new Set();
static timeouts = []; static timeouts = [];
id = null; id = null;
@@ -657,16 +657,19 @@ class Note {
} }
static async destroy($dialog, note) { static async destroy($dialog, note) {
if (!confirm("Do you really want to delete this note?")) { if (!note.is_new() && !confirm("Do you really want to delete this note?")) {
return; return;
} }
if (!note.is_new()) { if (!note.is_new()) {
await $.ajax(`/notes/${note.id}.json`, { type: "DELETE" }); await $.ajax(`/notes/${note.id}.json`, { type: "DELETE" });
note.box.$note_box.remove();
note.body.$note_body.remove();
$dialog.dialog("close");
} }
note.box.$note_box.remove();
note.body.$note_body.remove();
Note.notes.delete(note);
$dialog.dialog("close");
} }
static history($dialog, note) { static history($dialog, note) {
@@ -786,7 +789,7 @@ class Note {
this.box.place_note(x, y, w, h); this.box.place_note(x, y, w, h);
this.body.display_text(sanitized_body); this.body.display_text(sanitized_body);
Note.notes.push(this); Note.notes.add(this);
} }
is_new() { is_new() {
@@ -861,7 +864,7 @@ class Note {
} }
static find(id) { static find(id) {
return Note.notes.find(note => note.id === id); return Array.from(Note.notes).find(note => note.id === id);
} }
static load_all() { static load_all() {