notes are working
This commit is contained in:
@@ -7,13 +7,14 @@ Danbooru.Note = {
|
|||||||
|
|
||||||
var $note_box = $('<div/>');
|
var $note_box = $('<div/>');
|
||||||
$note_box.addClass("note-box");
|
$note_box.addClass("note-box");
|
||||||
$note_box.data("id", id);
|
$note_box.data("id", String(id));
|
||||||
$note_box.attr("data-id", id);
|
$note_box.attr("data-id", String(id));
|
||||||
$note_box.draggable({containment: "parent"});
|
$note_box.draggable({containment: "parent"});
|
||||||
$note_box.resizable({
|
$note_box.resizable({
|
||||||
containment: "parent",
|
containment: "parent",
|
||||||
handles: "se"
|
handles: "se"
|
||||||
});
|
});
|
||||||
|
$note_box.css({position: "absolute"});
|
||||||
$note_box.append($inner_border);
|
$note_box.append($inner_border);
|
||||||
Danbooru.Note.Box.bind_events($note_box);
|
Danbooru.Note.Box.bind_events($note_box);
|
||||||
|
|
||||||
@@ -120,8 +121,8 @@ Danbooru.Note = {
|
|||||||
create: function(id) {
|
create: function(id) {
|
||||||
var $note_body = $('<div></div>');
|
var $note_body = $('<div></div>');
|
||||||
$note_body.addClass("note-body");
|
$note_body.addClass("note-body");
|
||||||
$note_body.data("id", id);
|
$note_body.data("id", String(id));
|
||||||
$note_body.attr("data-id", id);
|
$note_body.attr("data-id", String(id));
|
||||||
$note_body.hide();
|
$note_body.hide();
|
||||||
Danbooru.Note.Body.bind_events($note_body);
|
Danbooru.Note.Body.bind_events($note_body);
|
||||||
return $note_body;
|
return $note_body;
|
||||||
@@ -172,6 +173,8 @@ Danbooru.Note = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
resize: function($note_body) {
|
resize: function($note_body) {
|
||||||
|
return;
|
||||||
|
|
||||||
var w = $note_body.width();
|
var w = $note_body.width();
|
||||||
var h = $note_body.height();
|
var h = $note_body.height();
|
||||||
var golden_ratio = 1.6180339887;
|
var golden_ratio = 1.6180339887;
|
||||||
@@ -285,8 +288,8 @@ Danbooru.Note = {
|
|||||||
if (data.html_id) {
|
if (data.html_id) {
|
||||||
var $note_body = Danbooru.Note.Body.find(data.html_id);
|
var $note_body = Danbooru.Note.Body.find(data.html_id);
|
||||||
var $note_box = Danbooru.Note.Box.find(data.html_id);
|
var $note_box = Danbooru.Note.Box.find(data.html_id);
|
||||||
$note_body.data("id", data.id).attr("data-id", data.id);
|
$note_body.data("id", String(data.id)).attr("data-id", data.id);
|
||||||
$note_box.data("id", data.id).attr("data-id", data.id);
|
$note_box.data("id", String(data.id)).attr("data-id", data.id);
|
||||||
$note_box.find(".note-box-inner-border").removeClass("unsaved");
|
$note_box.find(".note-box-inner-border").removeClass("unsaved");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -436,6 +439,20 @@ Danbooru.Note = {
|
|||||||
});
|
});
|
||||||
|
|
||||||
Danbooru.Note.timeouts = [];
|
Danbooru.Note.timeouts = [];
|
||||||
|
},
|
||||||
|
|
||||||
|
load_all: function() {
|
||||||
|
$.each($("section#notes article"), function(i, article) {
|
||||||
|
var $article = $(article);
|
||||||
|
Danbooru.Note.add(
|
||||||
|
$article.data("id"),
|
||||||
|
$article.data("x"),
|
||||||
|
$article.data("y"),
|
||||||
|
$article.data("width"),
|
||||||
|
$article.data("height"),
|
||||||
|
$article.html()
|
||||||
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,5 +471,7 @@ $(function() {
|
|||||||
Danbooru.Note.Image.resize();
|
Danbooru.Note.Image.resize();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Danbooru.Note.load_all();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -629,6 +629,10 @@ div#c-posts {
|
|||||||
color: $link_color;
|
color: $link_color;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
section#notes article {
|
||||||
|
margin-bottom: 1em;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -904,6 +908,8 @@ div#note-container {
|
|||||||
min-height: 1em;
|
min-height: 1em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
|
z-index: 1000;
|
||||||
|
overflow: auto;
|
||||||
|
|
||||||
p.tn {
|
p.tn {
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class NotesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@note = Note.find(params[:id])
|
@note = Note.find(params[:id])
|
||||||
@note.destroy
|
@note.update_attribute(:is_active, false)
|
||||||
respond_with(@note)
|
respond_with(@note)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<% notes.each do |note| %>
|
<% notes.each do |note| %>
|
||||||
<%= content_tag(:article, "", "data-width" => note.width, "data-height" => note.height, "data-x" => note.x, "data-y" => note.y, "data-body" => note.body) %>
|
<%= content_tag(:article, "", "data-width" => note.width, "data-height" => note.height, "data-x" => note.x, "data-y" => note.y, "data-body" => note.body, "data-id" => note.id) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user