github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-26 22:14:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove more views and deprecations.

Browse Source
This commit is contained in:
Robin Ward 2016-04-28 16:13:34 -04:00
parent 04ec679d82
commit 187d7d6f96
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
19 changed files with 216 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
View File

@ -3,8 +3,6 @@ import LoadMore from "discourse/mixins/load-more";
import UrlRefresh from 'discourse/mixins/url-refresh';
const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, {
_viaComponent: true,
classNames: ['contents'],
eyelineSelector: '.topic-list-item',

2
app/assets/javascripts/discourse/components/load-more.js.es6
View File

@ -1,8 +1,6 @@
import LoadMore from "discourse/mixins/load-more";
export default Ember.Component.extend(LoadMore, {
_viaComponent: true,
init() {
this._super();
this.set('eyelineSelector', this.get('selector'));

24
app/assets/javascripts/discourse/components/user-stream.js.es6 Normal file
View File

@ -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();
});
}
}
});

2
app/assets/javascripts/discourse/ember/resolver.js.es6
View File

@ -151,11 +151,13 @@ export default Ember.DefaultResolver.extend({
const withoutType = parsedName.fullNameWithoutType,
slashedType = withoutType.replace(/\./g, '/'),
decamelized = withoutType.decamelize(),
dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'),
templates = Ember.TEMPLATES;
return this._super(parsedName) ||
templates[slashedType] ||
templates[withoutType] ||
templates[dashed] ||
templates[decamelized.replace(/\./, '/')] ||
templates[decamelized.replace(/\_/, '/')] ||
this.findAdminTemplate(parsedName) ||

2
app/assets/javascripts/discourse/lib/plugin-api.js.es6
View File

@ -49,7 +49,7 @@ class PluginApi {
if (!opts.onlyStream) {
decorate(ComposerEditor, 'previewRefreshed', callback);
decorate(this.container.lookupFactory('view:user-stream'), 'didInsertElement', callback);
decorate(this.container.lookupFactory('component:user-stream'), 'didInsertElement', callback);
}
}

8
app/assets/javascripts/discourse/mixins/load-more.js.es6
View File

@ -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.
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() {
const eyeline = this.get('eyeline');
return eyeline && eyeline.update();

0
app/assets/javascripts/discourse/templates/group/members.hbs → app/assets/javascripts/discourse/templates/group-members.hbs
View File

2
app/assets/javascripts/discourse/templates/user-invited-show.hbs
View File

@ -1,4 +1,5 @@
{{#if canInviteToForum}}
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}}
<section class='user-content'>
<h2>{{i18n 'user.invited.title'}}</h2>
@ -97,4 +98,5 @@
</div>
{{/if}}
</section>
{{/load-more}}
{{/if}}

3
app/assets/javascripts/discourse/templates/user-topics-list.hbs
View File

@ -1,4 +1,4 @@
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}}
{{basic-topic-list topicList=model
hideCategory=hideCategory
showParticipants=showParticipants
@ -7,3 +7,4 @@
bulkSelectEnabled=bulkSelectEnabled
selected=selected
postsAction="showTopicEntrance"}}
{{/load-more}}

2
app/assets/javascripts/discourse/templates/user/posts.hbs
View File

@ -1,3 +1,4 @@
{{#user-stream stream=model}}
{{#each p in model.content}}
<div {{bind-attr class=":item p.hidden p.deleted p.moderator_action"}}>
<div class="clearfix info">
@ -26,3 +27,4 @@
</p>
</div>
{{/each}}
{{/user-stream}}

2
app/assets/javascripts/discourse/templates/user/stream.hbs
View File

@ -1,3 +1,5 @@
{{#user-stream stream=model}}
{{#each model.content as |item|}}
{{stream-item item=item removeBookmark="removeBookmark"}}
{{/each}}
{{/user-stream}}

2
app/assets/javascripts/discourse/templates/users.hbs
View File

@ -1,3 +1,4 @@
{{#load-more selector=".directory tbody tr" action="loadMore"}}
<div class="container">
<div class='directory'>
@ -54,3 +55,4 @@
</div>
</div>
{{/load-more}}

27
app/assets/javascripts/discourse/views/user-activity-stream.js.es6
View File

@ -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();
});
}
}
});

7
app/assets/javascripts/discourse/views/user-invited-show.js.es6
View File

@ -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'
});

20
app/assets/javascripts/discourse/views/user-posts.js.es6
View File

@ -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 () { });
}
}
});

27
app/assets/javascripts/discourse/views/user-stream.js.es6
View File

@ -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();
});
}
}
});

6
app/assets/javascripts/discourse/views/user-topics-list.js.es6
View File

@ -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',
});

5
app/assets/javascripts/discourse/views/users.js.es6
View File

@ -1,5 +0,0 @@
import LoadMore from 'discourse/mixins/load-more';
export default Ember.View.extend(LoadMore, {
eyelineSelector: '.directory tbody tr'
});

2
test/javascripts/lib/click-track-test.js.es6
View File

@ -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) {
clickEvent.which = 2;
clickEvent.button = 2;
});
test("tracks via AJAX if we're on the same site", function() {