Fix linking of remote hashtags in UI, add public view of hashtags
parent
cb22dce970
commit
814907e870
|
@ -23,7 +23,7 @@ const StatusContent = React.createClass({
|
||||||
|
|
||||||
if (mention) {
|
if (mention) {
|
||||||
link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
|
link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
|
||||||
} else if (link.text[0] === '#' || (link.previousSibling && link.previousSibling.text === '#')) {
|
} else if (link.text[0] === '#' || (link.previousSibling && link.previousSibling.text[link.previousSibling.text.length - 1] === '#')) {
|
||||||
link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
|
link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
|
||||||
} else {
|
} else {
|
||||||
link.setAttribute('target', '_blank');
|
link.setAttribute('target', '_blank');
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
class TagsController < ApplicationController
|
class TagsController < ApplicationController
|
||||||
|
layout 'public'
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
@statuses = Tag.find_by!(name: params[:id].downcase).statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
- if @statuses.empty?
|
||||||
|
.accounts-grid
|
||||||
|
= render partial: 'accounts/nothing_here'
|
||||||
|
- else
|
||||||
|
.activity-stream
|
||||||
|
= render partial: 'stream_entries/status', collection: @statuses, as: :status, cached: true
|
||||||
|
|
||||||
|
= will_paginate @statuses, pagination_options
|
Loading…
Reference in New Issue