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

Fix @mention autocomplete for comments & forum posts.

Browse Source 
Fix comment autocomplete (broken in 1257639). Also fix forum post
autocomplete (didn't work when editing forum posts).
This commit is contained in:
evazion
2017-01-02 12:49:14 -06:00
parent 3d2b81d1e8
commit 469f48a118
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/autocomplete.js
View File

@@ -37,7 +37,7 @@
} }
Danbooru.Autocomplete.initialize_mention_autocomplete = function() { Danbooru.Autocomplete.initialize_mention_autocomplete = function() {
var $fields = $("#forum_post_body,#forum_post_body_for_,.comment-form textarea"); var $fields = $(".autocomplete-mentions textarea");
$fields.autocomplete({ $fields.autocomplete({
delay: 500, delay: 500,
minLength: 2, minLength: 2,

1
app/helpers/application_helper.rb
View File

@@ -127,6 +127,7 @@ module ApplicationHelper
options[:input_name] ||= "#{object}[#{name}]" options[:input_name] ||= "#{object}[#{name}]"
options[:value] ||= instance_variable_get("@#{object}").try(name) options[:value] ||= instance_variable_get("@#{object}").try(name)
options[:preview_id] ||= "dtext-preview" options[:preview_id] ||= "dtext-preview"
options[:classes] ||= ""
render "dtext/form", options render "dtext/form", options
end end

2
app/views/comments/_form.html.erb
View File

@@ -2,7 +2,7 @@
<%= simple_form_for(comment, :html => {:class => "edit_comment"}) do |f| %> <%= simple_form_for(comment, :html => {:class => "edit_comment"}) do |f| %>
<%= f.hidden_field :post_id %> <%= f.hidden_field :post_id %>
<%= dtext_field "comment", "body", :value => comment.body, :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %> <%= dtext_field "comment", "body", :classes => "autocomplete-mentions", :value => comment.body, :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %>
<%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %> <%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
<%= dtext_preview_button "comment", "body", :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %> <%= dtext_preview_button "comment", "body", :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %>
<% if comment.new_record? %> <% if comment.new_record? %>

2
app/views/dtext/_form.html.erb
View File

@@ -5,7 +5,7 @@
- preview_id - preview_id
- value - value
--> -->
<div class="input text optional"> <div class="input text optional <%= classes %>">
<label class="text optional" for="<%= input_id %>"><%= name %></label> <label class="text optional" for="<%= input_id %>"><%= name %></label>
<div class="dtext-previewable"> <div class="dtext-previewable">

2
app/views/forum_posts/partials/edit/_form.html.erb
View File

@@ -2,7 +2,7 @@
<%= simple_form_for(forum_post) do |f| %> <%= simple_form_for(forum_post) do |f| %>
<%= f.input :topic_id, :as => :hidden %> <%= f.input :topic_id, :as => :hidden %>
<%= dtext_field "forum_post", "body", :value => forum_post.body, :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %> <%= dtext_field "forum_post", "body", :value => forum_post.body, :classes => "autocomplete-mentions", :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
<%= f.button :submit, "Submit" %> <%= f.button :submit, "Submit" %>
<%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %> <%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>

2
app/views/forum_posts/partials/new/_form.html.erb
View File

@@ -2,7 +2,7 @@
<%= simple_form_for(forum_post) do |f| %> <%= simple_form_for(forum_post) do |f| %>
<%= f.input :topic_id, :as => :hidden %> <%= f.input :topic_id, :as => :hidden %>
<%= dtext_field "forum_post", "body" %> <%= dtext_field "forum_post", "body", :classes => "autocomplete-mentions" %>
<%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %> <%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
<%= dtext_preview_button "forum_post", "body" %> <%= dtext_preview_button "forum_post", "body" %>

2
app/views/forum_topics/_form.html.erb
View File

@@ -14,7 +14,7 @@
<%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", forum_topic.id %> <%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", forum_topic.id %>
<% end %> <% end %>
<%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => forum_topic.original_post.body, :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %> <%= dtext_field "forum_post", "body", :classes => "autocomplete-mentions", :input_name => "forum_topic[original_post_attributes][body]", :value => forum_topic.original_post.body, :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
<% end %> <% end %>
<% if CurrentUser.is_moderator? %> <% if CurrentUser.is_moderator? %>