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

embed text in note box

Browse Source
This commit is contained in:
r888888888
2015-01-27 16:59:12 -08:00
parent 1d57d37cd5
commit b7e138844a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,8 +267,9 @@ Danbooru.Note = {
} }
}, },
set_text: function($note_body, text) { set_text: function($note_body, $note_box, text) {
Danbooru.Note.Body.display_text($note_body, text); Danbooru.Note.Body.display_text($note_body, text);
Danbooru.Note.Body.display_text($note_box.children("div"), text);
Danbooru.Note.Body.resize($note_body); Danbooru.Note.Body.resize($note_body);
Danbooru.Note.Body.bound_position($note_body); Danbooru.Note.Body.bound_position($note_body);
}, },
@@ -416,9 +417,9 @@ Danbooru.Note = {
var $note_box = Danbooru.Note.Box.find(id); var $note_box = Danbooru.Note.Box.find(id);
var text = $textarea.val(); var text = $textarea.val();
$note_body.data("original-body", text); $note_body.data("original-body", text);
Danbooru.Note.Body.set_text($note_body, "Loading..."); Danbooru.Note.Body.set_text($note_body, $note_box, "Loading...");
$.get("/note_previews.json", {body: text}).success(function(data) { $.get("/note_previews.json", {body: text}).success(function(data) {
Danbooru.Note.Body.set_text($note_body, data.body); Danbooru.Note.Body.set_text($note_body, $note_box, data.body);
$note_body.show(); $note_body.show();
}); });
$this.dialog("close"); $this.dialog("close");
@@ -448,9 +449,9 @@ Danbooru.Note = {
var text = $textarea.val(); var text = $textarea.val();
var $note_box = Danbooru.Note.Box.find(id); var $note_box = Danbooru.Note.Box.find(id);
$note_box.find(".note-box-inner-border").addClass("unsaved"); $note_box.find(".note-box-inner-border").addClass("unsaved");
Danbooru.Note.Body.set_text($note_body, "Loading..."); Danbooru.Note.Body.set_text($note_body, $note_box, "Loading...");
$.get("/note_previews.json", {body: text}).success(function(data) { $.get("/note_previews.json", {body: text}).success(function(data) {
Danbooru.Note.Body.set_text($note_body, data.body); Danbooru.Note.Body.set_text($note_body, $note_box, data.body);
$note_body.show(); $note_body.show();
}); });
}, },
@@ -662,6 +663,7 @@ Danbooru.Note = {
$note_body.data("original-body", text); $note_body.data("original-body", text);
Danbooru.Note.Box.scale($note_box); Danbooru.Note.Box.scale($note_box);
Danbooru.Note.Body.display_text($note_body, text); Danbooru.Note.Body.display_text($note_body, text);
Danbooru.Note.Body.display_text($note_box.children("div"), text);
}, },
create: function(x, y, w, h) { create: function(x, y, w, h) {