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

more #1925 fixes

Browse Source 
Fix for newly created notes, and for notes resized up/left (#1509)
This commit is contained in:
Toks
2015-05-31 03:21:34 -04:00
parent 1949a48070
commit 19622348c4
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,28 +30,14 @@ Danbooru.Note = {
$note_box.draggable({ $note_box.draggable({
containment: $("#image"), containment: $("#image"),
stop: function(e, ui) { stop: function(e, ui) {
var $image = $("#image"); Danbooru.Note.Box.update_data_attributes($note_box);
var ratio = $image.width() / parseFloat($image.data("original-width"));
var new_x = parseFloat($note_box.css("left"));
var new_y = parseFloat($note_box.css("top"));
new_x = parseInt(new_x / ratio);
new_y = parseInt(new_y / ratio);
$note_box.data("x", new_x);
$note_box.data("y", new_y);
} }
}); });
$note_box.resizable({ $note_box.resizable({
containment: $("#image"), containment: $("#image"),
handles: "se, nw", handles: "se, nw",
stop: function(e, ui) { stop: function(e, ui) {
var $image = $("#image"); Danbooru.Note.Box.update_data_attributes($note_box);
var ratio = $image.width() / parseFloat($image.data("original-width"));
var new_width = parseFloat($note_box.css("width"));
var new_height = parseFloat($note_box.css("height"));
new_width = parseInt(new_width / ratio);
new_height = parseInt(new_height / ratio);
$note_box.data("width", new_width);
$note_box.data("height", new_height);
} }
}); });
$note_box.css({position: "absolute"}); $note_box.css({position: "absolute"});
@@ -61,6 +47,23 @@ Danbooru.Note = {
return $note_box; return $note_box;
}, },
update_data_attributes: function($note_box) {
var $image = $("#image");
var ratio = $image.width() / parseFloat($image.data("original-width"));
var new_x = parseFloat($note_box.css("left"));
var new_y = parseFloat($note_box.css("top"));
var new_width = parseFloat($note_box.css("width"));
var new_height = parseFloat($note_box.css("height"));
new_x = parseInt(new_x / ratio);
new_y = parseInt(new_y / ratio);
new_width = parseInt(new_width / ratio);
new_height = parseInt(new_height / ratio);
$note_box.data("x", new_x);
$note_box.data("y", new_y);
$note_box.data("width", new_width);
$note_box.data("height", new_height);
},
bind_events: function($note_box) { bind_events: function($note_box) {
$note_box.bind( $note_box.bind(
"dragstart resizestart", "dragstart resizestart",
@@ -731,6 +734,7 @@ Danbooru.Note = {
width: w, width: w,
height: h height: h
}); });
Danbooru.Note.Box.update_data_attributes($note_box);
$note_box.find(".note-box-inner-border").addClass("unsaved"); $note_box.find(".note-box-inner-border").addClass("unsaved");
$note_body.html("<em>Click to edit</em>"); $note_body.html("<em>Click to edit</em>");
$("#note-container").append($note_box); $("#note-container").append($note_box);