mirror of
https://github.com/discourse/discourse.git
synced 2025-06-25 00:31:34 +08:00
Remove more views and deprecations.
This commit is contained in:
Robin Ward
@ -3,8 +3,6 @@ import LoadMore from "discourse/mixins/load-more";
|
|||||||
import UrlRefresh from 'discourse/mixins/url-refresh';
|
import UrlRefresh from 'discourse/mixins/url-refresh';
|
||||||
|
|
||||||
const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, {
|
const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, {
|
||||||
_viaComponent: true,
|
|
||||||
|
|
||||||
classNames: ['contents'],
|
classNames: ['contents'],
|
||||||
eyelineSelector: '.topic-list-item',
|
eyelineSelector: '.topic-list-item',
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
import LoadMore from "discourse/mixins/load-more";
|
import LoadMore from "discourse/mixins/load-more";
|
||||||
|
|
||||||
export default Ember.Component.extend(LoadMore, {
|
export default Ember.Component.extend(LoadMore, {
|
||||||
_viaComponent: true,
|
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
this._super();
|
this._super();
|
||||||
this.set('eyelineSelector', this.get('selector'));
|
this.set('eyelineSelector', this.get('selector'));
|
||||||
|
|||||||
@ -0,0 +1,24 @@
|
|||||||
|
import LoadMore from "discourse/mixins/load-more";
|
||||||
|
|
||||||
|
export default Ember.Component.extend(LoadMore, {
|
||||||
|
loading: false,
|
||||||
|
eyelineSelector: '.user-stream .item',
|
||||||
|
classNames: ['user-stream'],
|
||||||
|
|
||||||
|
_scrollTopOnModelChange: function() {
|
||||||
|
Em.run.schedule('afterRender', () => $(document).scrollTop(0));
|
||||||
|
}.observes('stream.user.id'),
|
||||||
|
|
||||||
|
actions: {
|
||||||
|
loadMore() {
|
||||||
|
if (this.get('loading')) { return; }
|
||||||
|
|
||||||
|
this.set('loading', true);
|
||||||
|
const stream = this.get('stream');
|
||||||
|
stream.findItems().then(() => {
|
||||||
|
this.set('loading', false);
|
||||||
|
this.get('eyeline').flushRest();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
@ -151,11 +151,13 @@ export default Ember.DefaultResolver.extend({
|
|||||||
const withoutType = parsedName.fullNameWithoutType,
|
const withoutType = parsedName.fullNameWithoutType,
|
||||||
slashedType = withoutType.replace(/\./g, '/'),
|
slashedType = withoutType.replace(/\./g, '/'),
|
||||||
decamelized = withoutType.decamelize(),
|
decamelized = withoutType.decamelize(),
|
||||||
|
dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'),
|
||||||
templates = Ember.TEMPLATES;
|
templates = Ember.TEMPLATES;
|
||||||
|
|
||||||
return this._super(parsedName) ||
|
return this._super(parsedName) ||
|
||||||
templates[slashedType] ||
|
templates[slashedType] ||
|
||||||
templates[withoutType] ||
|
templates[withoutType] ||
|
||||||
|
templates[dashed] ||
|
||||||
templates[decamelized.replace(/\./, '/')] ||
|
templates[decamelized.replace(/\./, '/')] ||
|
||||||
templates[decamelized.replace(/\_/, '/')] ||
|
templates[decamelized.replace(/\_/, '/')] ||
|
||||||
this.findAdminTemplate(parsedName) ||
|
this.findAdminTemplate(parsedName) ||
|
||||||
|
|||||||
@ -49,7 +49,7 @@ class PluginApi {
|
|||||||
|
|
||||||
if (!opts.onlyStream) {
|
if (!opts.onlyStream) {
|
||||||
decorate(ComposerEditor, 'previewRefreshed', callback);
|
decorate(ComposerEditor, 'previewRefreshed', callback);
|
||||||
decorate(this.container.lookupFactory('view:user-stream'), 'didInsertElement', callback);
|
decorate(this.container.lookupFactory('component:user-stream'), 'didInsertElement', callback);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,14 +5,6 @@ import { on } from 'ember-addons/ember-computed-decorators';
|
|||||||
// Provides the ability to load more items for a view which is scrolled to the bottom.
|
// Provides the ability to load more items for a view which is scrolled to the bottom.
|
||||||
export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, {
|
export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, {
|
||||||
|
|
||||||
init() {
|
|
||||||
this._super();
|
|
||||||
if (!this._viaComponent) {
|
|
||||||
console.warn('Using `LoadMore` as a view mixin is deprecated. Use `{{load-more}}` instead');
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
|
||||||
|
|
||||||
scrolled() {
|
scrolled() {
|
||||||
const eyeline = this.get('eyeline');
|
const eyeline = this.get('eyeline');
|
||||||
return eyeline && eyeline.update();
|
return eyeline && eyeline.update();
|
||||||
|
|||||||
@ -1,100 +1,102 @@
|
|||||||
{{#if canInviteToForum}}
|
{{#if canInviteToForum}}
|
||||||
<section class='user-content'>
|
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}}
|
||||||
<h2>{{i18n 'user.invited.title'}}</h2>
|
<section class='user-content'>
|
||||||
|
<h2>{{i18n 'user.invited.title'}}</h2>
|
||||||
|
|
||||||
{{#if model.can_see_invite_details}}
|
{{#if model.can_see_invite_details}}
|
||||||
<div class='user-invite-controls'>
|
<div class='user-invite-controls'>
|
||||||
<div class='span15'>
|
<div class='span15'>
|
||||||
<ul class="nav nav-pills">
|
<ul class="nav nav-pills">
|
||||||
{{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}}
|
{{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}}
|
||||||
{{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}}
|
{{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
{{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
|
{{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
|
||||||
{{#if canBulkInvite}}
|
{{#if canBulkInvite}}
|
||||||
{{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
|
{{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
|
||||||
{{/if}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{#if showSearch}}
|
|
||||||
<div class="user-invite-search">
|
|
||||||
<form>{{text-field value=searchTerm placeholderKey="user.invited.search"}}</form>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{#if model.invites}}
|
|
||||||
<table class='table user-invite-list'>
|
|
||||||
<tr>
|
|
||||||
{{#if inviteRedeemed}}
|
|
||||||
<th>{{i18n 'user.invited.user'}}</th>
|
|
||||||
<th>{{i18n 'user.invited.redeemed_at'}}</th>
|
|
||||||
{{#if model.can_see_invite_details}}
|
|
||||||
<th>{{i18n 'user.last_seen'}}</th>
|
|
||||||
<th>{{i18n 'user.invited.topics_entered'}}</th>
|
|
||||||
<th>{{i18n 'user.invited.posts_read_count'}}</th>
|
|
||||||
<th>{{i18n 'user.invited.time_read'}}</th>
|
|
||||||
<th>{{i18n 'user.invited.days_visited'}}</th>
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{else}}
|
</div>
|
||||||
<th colspan="1">{{i18n 'user.invited.user'}}</th>
|
</div>
|
||||||
<th colspan="6">{{i18n 'user.invited.sent'}}</th>
|
{{/if}}
|
||||||
{{/if}}
|
|
||||||
</tr>
|
{{#if showSearch}}
|
||||||
{{#each invite in model.invites}}
|
<div class="user-invite-search">
|
||||||
|
<form>{{text-field value=searchTerm placeholderKey="user.invited.search"}}</form>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
|
{{#if model.invites}}
|
||||||
|
<table class='table user-invite-list'>
|
||||||
<tr>
|
<tr>
|
||||||
{{#if invite.user}}
|
{{#if inviteRedeemed}}
|
||||||
<td>
|
<th>{{i18n 'user.invited.user'}}</th>
|
||||||
{{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
|
<th>{{i18n 'user.invited.redeemed_at'}}</th>
|
||||||
{{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}}
|
|
||||||
</td>
|
|
||||||
<td>{{format-date invite.redeemed_at}}</td>
|
|
||||||
{{#if model.can_see_invite_details}}
|
{{#if model.can_see_invite_details}}
|
||||||
<td>{{format-date invite.user.last_seen_at}}</td>
|
<th>{{i18n 'user.last_seen'}}</th>
|
||||||
<td>{{number invite.user.topics_entered}}</td>
|
<th>{{i18n 'user.invited.topics_entered'}}</th>
|
||||||
<td>{{number invite.user.posts_read_count}}</td>
|
<th>{{i18n 'user.invited.posts_read_count'}}</th>
|
||||||
<td>{{{unbound invite.user.time_read}}}</td>
|
<th>{{i18n 'user.invited.time_read'}}</th>
|
||||||
<td><span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
|
<th>{{i18n 'user.invited.days_visited'}}</th>
|
||||||
/
|
|
||||||
<span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span></td>
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{else}}
|
{{else}}
|
||||||
<td>{{unbound invite.email}}</td>
|
<th colspan="1">{{i18n 'user.invited.user'}}</th>
|
||||||
<td>{{format-date invite.created_at}}</td>
|
<th colspan="6">{{i18n 'user.invited.sent'}}</th>
|
||||||
<td colspan='5'>
|
|
||||||
{{#if invite.expired}}
|
|
||||||
{{i18n 'user.invited.expired'}}
|
|
||||||
|
|
||||||
{{/if}}
|
|
||||||
{{#if invite.rescinded}}
|
|
||||||
{{i18n 'user.invited.rescinded'}}
|
|
||||||
{{else}}
|
|
||||||
{{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}}
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{#if invite.reinvited}}
|
|
||||||
{{i18n 'user.invited.reinvited'}}
|
|
||||||
{{else}}
|
|
||||||
{{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}}
|
|
||||||
{{/if}}
|
|
||||||
</td>
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</tr>
|
</tr>
|
||||||
{{/each}}
|
{{#each invite in model.invites}}
|
||||||
</table>
|
<tr>
|
||||||
{{conditional-loading-spinner condition=invitesLoading}}
|
{{#if invite.user}}
|
||||||
|
<td>
|
||||||
|
{{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
|
||||||
|
{{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}}
|
||||||
|
</td>
|
||||||
|
<td>{{format-date invite.redeemed_at}}</td>
|
||||||
|
{{#if model.can_see_invite_details}}
|
||||||
|
<td>{{format-date invite.user.last_seen_at}}</td>
|
||||||
|
<td>{{number invite.user.topics_entered}}</td>
|
||||||
|
<td>{{number invite.user.posts_read_count}}</td>
|
||||||
|
<td>{{{unbound invite.user.time_read}}}</td>
|
||||||
|
<td><span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
|
||||||
|
/
|
||||||
|
<span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span></td>
|
||||||
|
{{/if}}
|
||||||
|
{{else}}
|
||||||
|
<td>{{unbound invite.email}}</td>
|
||||||
|
<td>{{format-date invite.created_at}}</td>
|
||||||
|
<td colspan='5'>
|
||||||
|
{{#if invite.expired}}
|
||||||
|
{{i18n 'user.invited.expired'}}
|
||||||
|
|
||||||
|
{{/if}}
|
||||||
|
{{#if invite.rescinded}}
|
||||||
|
{{i18n 'user.invited.rescinded'}}
|
||||||
|
{{else}}
|
||||||
|
{{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}}
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
|
{{#if invite.reinvited}}
|
||||||
|
{{i18n 'user.invited.reinvited'}}
|
||||||
|
{{else}}
|
||||||
|
{{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}}
|
||||||
|
{{/if}}
|
||||||
|
</td>
|
||||||
|
{{/if}}
|
||||||
|
</tr>
|
||||||
|
{{/each}}
|
||||||
|
</table>
|
||||||
|
{{conditional-loading-spinner condition=invitesLoading}}
|
||||||
|
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="user-invite-none">
|
<div class="user-invite-none">
|
||||||
{{#if canBulkInvite}}
|
{{#if canBulkInvite}}
|
||||||
{{{i18n 'user.invited.bulk_invite.none'}}}
|
{{{i18n 'user.invited.bulk_invite.none'}}}
|
||||||
{{else}}
|
{{else}}
|
||||||
{{i18n 'user.invited.none'}}
|
{{i18n 'user.invited.none'}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</section>
|
</section>
|
||||||
|
{{/load-more}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|||||||
@ -1,9 +1,10 @@
|
|||||||
|
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}}
|
||||||
{{basic-topic-list topicList=model
|
{{basic-topic-list topicList=model
|
||||||
hideCategory=hideCategory
|
hideCategory=hideCategory
|
||||||
showParticipants=showParticipants
|
showParticipants=showParticipants
|
||||||
showPosters=showPosters
|
showPosters=showPosters
|
||||||
canBulkSelect=canBulkSelect
|
canBulkSelect=canBulkSelect
|
||||||
bulkSelectEnabled=bulkSelectEnabled
|
bulkSelectEnabled=bulkSelectEnabled
|
||||||
selected=selected
|
selected=selected
|
||||||
postsAction="showTopicEntrance"}}
|
postsAction="showTopicEntrance"}}
|
||||||
|
{{/load-more}}
|
||||||
|
|||||||
@ -1,28 +1,30 @@
|
|||||||
{{#each p in model.content}}
|
{{#user-stream stream=model}}
|
||||||
<div {{bind-attr class=":item p.hidden p.deleted p.moderator_action"}}>
|
{{#each p in model.content}}
|
||||||
<div class="clearfix info">
|
<div {{bind-attr class=":item p.hidden p.deleted p.moderator_action"}}>
|
||||||
<a href="{{unbound p.usernameUrl}}" class="avatar-link">
|
<div class="clearfix info">
|
||||||
<div class="avatar-wrapper">
|
<a href="{{unbound p.usernameUrl}}" class="avatar-link">
|
||||||
{{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}}
|
<div class="avatar-wrapper">
|
||||||
</div>
|
{{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}}
|
||||||
</a>
|
</div>
|
||||||
<span class="time">
|
</a>
|
||||||
{{format-date p.created_at leaveAgo="true"}}
|
<span class="time">
|
||||||
</span>
|
{{format-date p.created_at leaveAgo="true"}}
|
||||||
<span class="title">
|
|
||||||
<a href="{{unbound p.url}}">{{unbound p.topic_title}}</a>
|
|
||||||
</span>
|
|
||||||
<span class="category">
|
|
||||||
{{category-link p.category}}
|
|
||||||
</span>
|
|
||||||
{{#if p.deleted}}
|
|
||||||
<span class="delete-info">
|
|
||||||
<i class="fa fa-trash-o"></i> {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}}
|
|
||||||
</span>
|
</span>
|
||||||
{{/if}}
|
<span class="title">
|
||||||
|
<a href="{{unbound p.url}}">{{unbound p.topic_title}}</a>
|
||||||
|
</span>
|
||||||
|
<span class="category">
|
||||||
|
{{category-link p.category}}
|
||||||
|
</span>
|
||||||
|
{{#if p.deleted}}
|
||||||
|
<span class="delete-info">
|
||||||
|
<i class="fa fa-trash-o"></i> {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}}
|
||||||
|
</span>
|
||||||
|
{{/if}}
|
||||||
|
</div>
|
||||||
|
<p class="excerpt">
|
||||||
|
{{{p.excerpt}}}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<p class="excerpt">
|
{{/each}}
|
||||||
{{{p.excerpt}}}
|
{{/user-stream}}
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
{{/each}}
|
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
{{#each model.content as |item|}}
|
{{#user-stream stream=model}}
|
||||||
{{stream-item item=item removeBookmark="removeBookmark"}}
|
{{#each model.content as |item|}}
|
||||||
{{/each}}
|
{{stream-item item=item removeBookmark="removeBookmark"}}
|
||||||
|
{{/each}}
|
||||||
|
{{/user-stream}}
|
||||||
|
|||||||
@ -1,56 +1,58 @@
|
|||||||
<div class="container">
|
{{#load-more selector=".directory tbody tr" action="loadMore"}}
|
||||||
<div class='directory'>
|
<div class="container">
|
||||||
|
<div class='directory'>
|
||||||
|
|
||||||
|
<div class='clearfix'>
|
||||||
|
{{period-chooser period=period}}
|
||||||
|
{{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name"}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{#conditional-loading-spinner condition=model.loading}}
|
||||||
|
{{#if model.length}}
|
||||||
|
<div class='total-rows'>{{i18n "directory.total_rows" count=model.totalRows}}</div>
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<th> </th>
|
||||||
|
{{directory-toggle field="likes_received" order=order asc=asc icon="heart"}}
|
||||||
|
{{directory-toggle field="likes_given" order=order asc=asc icon="heart"}}
|
||||||
|
{{directory-toggle field="topic_count" order=order asc=asc}}
|
||||||
|
{{directory-toggle field="post_count" order=order asc=asc}}
|
||||||
|
{{directory-toggle field="topics_entered" order=order asc=asc}}
|
||||||
|
{{directory-toggle field="posts_read" order=order asc=asc}}
|
||||||
|
{{directory-toggle field="days_visited" order=order asc=asc}}
|
||||||
|
{{#if showTimeRead}}
|
||||||
|
<th>{{i18n "directory.time_read"}}</th>
|
||||||
|
{{/if}}
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{{#each ic in model itemController="directory-item"}}
|
||||||
|
<tr class="{{if ic.me 'me'}}">
|
||||||
|
{{#with ic.model as |it|}}
|
||||||
|
<td>{{user-info user=it.user}}</td>
|
||||||
|
<td>{{number it.likes_received}}</td>
|
||||||
|
<td>{{number it.likes_given}}</td>
|
||||||
|
<td>{{number it.topic_count}}</td>
|
||||||
|
<td>{{number it.post_count}}</td>
|
||||||
|
<td>{{number it.topics_entered}}</td>
|
||||||
|
<td>{{number it.posts_read}}</td>
|
||||||
|
<td>{{number it.days_visited}}</td>
|
||||||
|
{{#if controller.parentController.showTimeRead}}
|
||||||
|
<td><span class='time-read'>{{unbound it.time_read}}</span></td>
|
||||||
|
{{/if}}
|
||||||
|
{{/with}}
|
||||||
|
</tr>
|
||||||
|
{{/each}}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
{{conditional-loading-spinner condition=model.loadingMore}}
|
||||||
|
{{else}}
|
||||||
|
<div class='clearfix'></div>
|
||||||
|
<p>{{i18n "directory.no_results"}}</p>
|
||||||
|
{{/if}}
|
||||||
|
{{/conditional-loading-spinner}}
|
||||||
|
|
||||||
<div class='clearfix'>
|
|
||||||
{{period-chooser period=period}}
|
|
||||||
{{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name"}}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{#conditional-loading-spinner condition=model.loading}}
|
|
||||||
{{#if model.length}}
|
|
||||||
<div class='total-rows'>{{i18n "directory.total_rows" count=model.totalRows}}</div>
|
|
||||||
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<th> </th>
|
|
||||||
{{directory-toggle field="likes_received" order=order asc=asc icon="heart"}}
|
|
||||||
{{directory-toggle field="likes_given" order=order asc=asc icon="heart"}}
|
|
||||||
{{directory-toggle field="topic_count" order=order asc=asc}}
|
|
||||||
{{directory-toggle field="post_count" order=order asc=asc}}
|
|
||||||
{{directory-toggle field="topics_entered" order=order asc=asc}}
|
|
||||||
{{directory-toggle field="posts_read" order=order asc=asc}}
|
|
||||||
{{directory-toggle field="days_visited" order=order asc=asc}}
|
|
||||||
{{#if showTimeRead}}
|
|
||||||
<th>{{i18n "directory.time_read"}}</th>
|
|
||||||
{{/if}}
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{{#each ic in model itemController="directory-item"}}
|
|
||||||
<tr class="{{if ic.me 'me'}}">
|
|
||||||
{{#with ic.model as |it|}}
|
|
||||||
<td>{{user-info user=it.user}}</td>
|
|
||||||
<td>{{number it.likes_received}}</td>
|
|
||||||
<td>{{number it.likes_given}}</td>
|
|
||||||
<td>{{number it.topic_count}}</td>
|
|
||||||
<td>{{number it.post_count}}</td>
|
|
||||||
<td>{{number it.topics_entered}}</td>
|
|
||||||
<td>{{number it.posts_read}}</td>
|
|
||||||
<td>{{number it.days_visited}}</td>
|
|
||||||
{{#if controller.parentController.showTimeRead}}
|
|
||||||
<td><span class='time-read'>{{unbound it.time_read}}</span></td>
|
|
||||||
{{/if}}
|
|
||||||
{{/with}}
|
|
||||||
</tr>
|
|
||||||
{{/each}}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
{{conditional-loading-spinner condition=model.loadingMore}}
|
|
||||||
{{else}}
|
|
||||||
<div class='clearfix'></div>
|
|
||||||
<p>{{i18n "directory.no_results"}}</p>
|
|
||||||
{{/if}}
|
|
||||||
{{/conditional-loading-spinner}}
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{{/load-more}}
|
||||||
|
|||||||
@ -1,27 +0,0 @@
|
|||||||
import LoadMore from "discourse/mixins/load-more";
|
|
||||||
|
|
||||||
export default Ember.View.extend(LoadMore, {
|
|
||||||
loading: false,
|
|
||||||
eyelineSelector: '.user-stream .item',
|
|
||||||
classNames: ['user-stream'],
|
|
||||||
|
|
||||||
_scrollTopOnModelChange: function() {
|
|
||||||
Em.run.schedule('afterRender', function() {
|
|
||||||
$(document).scrollTop(0);
|
|
||||||
});
|
|
||||||
}.observes('controller.model.user.id'),
|
|
||||||
|
|
||||||
actions: {
|
|
||||||
loadMore() {
|
|
||||||
const self = this;
|
|
||||||
if (this.get('loading')) { return; }
|
|
||||||
|
|
||||||
this.set('loading', true);
|
|
||||||
const stream = this.get('controller.model');
|
|
||||||
stream.findItems().then(function() {
|
|
||||||
self.set('loading', false);
|
|
||||||
self.get('eyeline').flushRest();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
import LoadMore from "discourse/mixins/load-more";
|
|
||||||
|
|
||||||
export default Ember.View.extend(LoadMore, {
|
|
||||||
classNames: ['paginated-topics-list'],
|
|
||||||
eyelineSelector: '.paginated-topics-list .user-invite-list tr',
|
|
||||||
templateName: 'user-invited-show'
|
|
||||||
});
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
import LoadMore from "discourse/mixins/load-more";
|
|
||||||
|
|
||||||
export default Ember.View.extend(LoadMore, {
|
|
||||||
loading: false,
|
|
||||||
eyelineSelector: ".user-stream .item",
|
|
||||||
classNames: ["user-stream"],
|
|
||||||
|
|
||||||
actions: {
|
|
||||||
loadMore: function() {
|
|
||||||
var self = this;
|
|
||||||
if (this.get("loading")) { return; }
|
|
||||||
|
|
||||||
var postsStream = this.get("controller.model");
|
|
||||||
postsStream.findItems().then(function () {
|
|
||||||
self.set("loading", false);
|
|
||||||
self.get("eyeline").flushRest();
|
|
||||||
}).catch(function () { });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
import LoadMore from "discourse/mixins/load-more";
|
|
||||||
|
|
||||||
export default Ember.View.extend(LoadMore, {
|
|
||||||
loading: false,
|
|
||||||
eyelineSelector: '.user-stream .item',
|
|
||||||
classNames: ['user-stream'],
|
|
||||||
|
|
||||||
_scrollTopOnModelChange: function() {
|
|
||||||
Em.run.schedule('afterRender', function() {
|
|
||||||
$(document).scrollTop(0);
|
|
||||||
});
|
|
||||||
}.observes('controller.model.user.id'),
|
|
||||||
|
|
||||||
actions: {
|
|
||||||
loadMore() {
|
|
||||||
const self = this;
|
|
||||||
if (this.get('loading')) { return; }
|
|
||||||
|
|
||||||
this.set('loading', true);
|
|
||||||
const stream = this.get('controller.model');
|
|
||||||
stream.findItems().then(function() {
|
|
||||||
self.set('loading', false);
|
|
||||||
self.get('eyeline').flushRest();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
import LoadMore from "discourse/mixins/load-more";
|
|
||||||
|
|
||||||
export default Ember.View.extend(LoadMore, {
|
|
||||||
classNames: ['paginated-topics-list'],
|
|
||||||
eyelineSelector: '.paginated-topics-list .topic-list tr',
|
|
||||||
});
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
import LoadMore from 'discourse/mixins/load-more';
|
|
||||||
|
|
||||||
export default Ember.View.extend(LoadMore, {
|
|
||||||
eyelineSelector: '.directory tbody tr'
|
|
||||||
});
|
|
||||||
@ -167,7 +167,7 @@ testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEven
|
|||||||
});
|
});
|
||||||
|
|
||||||
testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) {
|
testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) {
|
||||||
clickEvent.which = 2;
|
clickEvent.button = 2;
|
||||||
});
|
});
|
||||||
|
|
||||||
test("tracks via AJAX if we're on the same site", function() {
|
test("tracks via AJAX if we're on the same site", function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user