" +
- iconHTML('fa-trash-o') + ' ' +
- Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template'), {title: post.get('postDeletedBy.username')}) +
- autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) +
- "
");
- }
-
- buffer.push(""});
- },
-
- clickBookmark(post) {
- this.sendAction('toggleBookmark', post);
- },
-
- // Wiki button
- buttonForWiki(post) {
- if (!post.get('can_wiki')) return;
-
- if (post.get('wiki')) {
- return new Button('wiki', 'post.controls.unwiki', 'pencil-square-o', {className: 'wiki wikied'});
- } else {
- return new Button('wiki', 'post.controls.wiki', 'pencil-square-o', {className: 'wiki'});
- }
- },
-
- clickWiki(post) {
- this.sendAction('toggleWiki', post);
- },
-
- buttonForAdmin() {
- if (!Discourse.User.currentProp('canManageTopic')) { return; }
- return new Button('admin', 'post.controls.admin', 'wrench');
- },
-
- renderAdminPopup(post, buffer) {
- if (!Discourse.User.currentProp('canManageTopic')) { return; }
-
- const isModerator = post.get('post_type') === this.site.get('post_types.moderator_action'),
- postTypeIcon = iconHTML('shield'),
- postTypeText = isModerator ? I18n.t('post.controls.revert_to_regular') : I18n.t('post.controls.convert_to_moderator'),
- rebakePostIcon = iconHTML('cog'),
- rebakePostText = I18n.t('post.controls.rebake'),
- unhidePostIcon = iconHTML('eye'),
- unhidePostText = I18n.t('post.controls.unhide'),
- changePostOwnerIcon = iconHTML('user'),
- changePostOwnerText = I18n.t('post.controls.change_owner');
-
- const html = '';
-
- buffer.push(html);
- },
-
- clickAdmin() {
- const $postAdminMenu = this.$(".post-admin-menu");
- $postAdminMenu.show();
- $("html").on("mouseup.post-admin-menu", function() {
- $postAdminMenu.hide();
- $("html").off("mouseup.post-admin-menu");
- });
- },
-
- clickTogglePostType() {
- this.sendAction("togglePostType", this.get("post"));
- },
-
- clickRebakePost() {
- this.sendAction("rebakePost", this.get("post"));
- },
-
- clickUnhidePost() {
- this.sendAction("unhidePost", this.get("post"));
- },
-
- clickChangePostOwner() {
- this.sendAction("changePostOwner", this.get("post"));
- },
-
- buttonForShowMoreActions() {
- return new Button('showMoreActions', 'show_more', 'ellipsis-h');
- },
-
- clickShowMoreActions() {
- this.set('collapsed', false);
- }
-
-});
-
-PostMenuComponent.reopenClass({
- registerButton(callback){
- this._registerButtonCallbacks = this._registerButtonCallbacks || [];
- this._registerButtonCallbacks.push(callback);
- }
-});
-
-export default PostMenuComponent;
diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6
deleted file mode 100644
index 7f213f7c0..000000000
--- a/app/assets/javascripts/discourse/components/poster-name.js.es6
+++ /dev/null
@@ -1,77 +0,0 @@
-import { setting } from 'discourse/lib/computed';
-
-const PosterNameComponent = Em.Component.extend({
- classNames: ['names', 'trigger-user-card'],
- displayNameOnPosts: setting('display_name_on_posts'),
-
- // sanitize name for comparison
- sanitizeName(name){
- return name.toLowerCase().replace(/[\s_-]/g,'');
- },
-
- render(buffer) {
- const post = this.get('post');
-
- if (post) {
- const username = post.get('username'),
- primaryGroupName = post.get('primary_group_name'),
- url = post.get('usernameUrl');
-
- var linkClass = 'username',
- name = post.get('name');
-
- if (post.get('staff')) { linkClass += ' staff'; }
- if (post.get('admin')) { linkClass += ' admin'; }
- if (post.get('moderator')) { linkClass += ' moderator'; }
- if (post.get('new_user')) { linkClass += ' new-user'; }
-
- if (!Em.isEmpty(primaryGroupName)) {
- linkClass += ' ' + primaryGroupName;
- }
- // Main link
- buffer.push("
" + username + "");
-
- // Add a glyph if we have one
- const glyph = this.posterGlyph(post);
- if (!Em.isEmpty(glyph)) {
- buffer.push(glyph);
- }
- buffer.push("");
-
- // Are we showing full names?
- if (name && this.get('displayNameOnPosts') && (this.sanitizeName(name) !== this.sanitizeName(username))) {
- name = Discourse.Utilities.escapeExpression(name);
- buffer.push("
" + name + "");
- }
-
- // User titles
- let title = post.get('user_title');
- if (!Em.isEmpty(title)) {
-
- title = Discourse.Utilities.escapeExpression(title);
- buffer.push('
');
- if (Em.isEmpty(primaryGroupName)) {
- buffer.push(title);
- } else {
- buffer.push("" + title + "");
- }
- buffer.push("");
- }
-
- PosterNameComponent.trigger('renderedName', buffer, post);
- }
- },
-
- // Overwrite this to give a user a custom font awesome glyph.
- posterGlyph(post) {
- if(post.get('moderator')) {
- const desc = I18n.t('user.moderator_tooltip');
- return '
';
- }
- }
-});
-
-// Support for event triggering
-PosterNameComponent.reopenClass(Em.Evented);
-
-export default PosterNameComponent;
diff --git a/app/assets/javascripts/discourse/components/private-message-map.js.es6 b/app/assets/javascripts/discourse/components/private-message-map.js.es6
deleted file mode 100644
index 0d01910c7..000000000
--- a/app/assets/javascripts/discourse/components/private-message-map.js.es6
+++ /dev/null
@@ -1,27 +0,0 @@
-export default Ember.Component.extend({
- layoutName: 'components/private-message-map',
- tagName: 'section',
- classNames: ['information'],
- details: Em.computed.alias('topic.details'),
-
- actions: {
- removeAllowedUser: function(user) {
- var self = this;
- bootbox.dialog(I18n.t("private_message_info.remove_allowed_user", {name: user.get('username')}), [
- {label: I18n.t("no_value"),
- 'class': 'btn-danger right'},
- {label: I18n.t("yes_value"),
- 'class': 'btn-primary',
- callback: function() {
- self.get('topic.details').removeAllowedUser(user);
- }
- }
- ]);
- },
-
- showPrivateInvite: function() {
- this.sendAction('showPrivateInviteAction');
- }
- }
-
-});
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
new file mode 100644
index 000000000..a8ae4b7af
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -0,0 +1,145 @@
+import { keyDirty } from 'discourse/widgets/widget';
+import MountWidget from 'discourse/components/mount-widget';
+
+function findTopView($posts, viewportTop, min, max) {
+ if (max < min) { return min; }
+
+ while(max>min){
+ const mid = Math.floor((min + max) / 2);
+ const $post = $($posts[mid]);
+ const viewBottom = $post.position().top + $post.height();
+
+ if (viewBottom > viewportTop) {
+ max = mid-1;
+ } else {
+ min = mid+1;
+ }
+ }
+
+ return min;
+}
+
+export default MountWidget.extend({
+ widget: 'post-stream',
+ _topVisible: null,
+ _bottomVisible: null,
+
+ args: Ember.computed(function() {
+ return this.getProperties('posts',
+ 'canCreatePost',
+ 'multiSelect',
+ 'selectedQuery',
+ 'selectedPostsCount',
+ 'searchService');
+ }).volatile(),
+
+ scrolled() {
+ const $w = $(window);
+ const windowHeight = window.innerHeight ? window.innerHeight : $w.height();
+ const slack = Math.round(windowHeight * 15);
+ const onscreen = [];
+
+ let windowTop = $w.scrollTop();
+
+ const $posts = this.$('article.boxed');
+ const viewportTop = windowTop - slack;
+ const topView = findTopView($posts, viewportTop, 0, $posts.length-1);
+
+ let windowBottom = windowTop + windowHeight;
+ let viewportBottom = windowBottom + slack;
+
+ const bodyHeight = $('body').height();
+ if (windowBottom > bodyHeight) { windowBottom = bodyHeight; }
+ if (viewportBottom > bodyHeight) { viewportBottom = bodyHeight; }
+
+ let bottomView = topView;
+ while (bottomView < $posts.length) {
+ const post = $posts[bottomView];
+ const $post = $(post);
+
+ if (!$post) { break; }
+
+ const viewTop = $post.offset().top;
+ const viewBottom = viewTop + $post.height();
+
+ if (viewTop > viewportBottom) { break; }
+
+ if (viewBottom > windowTop && viewTop <= windowBottom) {
+ onscreen.push(bottomView);
+ }
+
+ bottomView++;
+ }
+
+ const posts = this.posts;
+ if (onscreen.length) {
+
+ const refresh = () => this.queueRerender();
+ const first = posts.objectAt(onscreen[0]);
+ if (this._topVisible !== first) {
+ this._topVisible = first;
+ const $body = $('body');
+ const elem = $posts[onscreen[0]];
+ const elemId = elem.id;
+ const $elem = $(elem);
+ const elemPos = $elem.position();
+ const distToElement = elemPos ? $body.scrollTop() - elemPos.top : 0;
+
+ const topRefresh = () => {
+ refresh();
+
+ Ember.run.next(() => {
+ const $refreshedElem = $(elemId);
+
+ // Quickly going back might mean the element is destroyed
+ const position = $refreshedElem.position();
+ if (position && position.top) {
+ $('html, body').scrollTop(position.top + distToElement);
+ }
+ });
+ };
+ this.sendAction('topVisibleChanged', { post: first, refresh: topRefresh });
+ }
+
+ const last = posts.objectAt(onscreen[onscreen.length-1]);
+ if (this._bottomVisible !== last) {
+ this._bottomVisible = last;
+ this.sendAction('bottomVisibleChanged', { post: last, refresh });
+ }
+ } else {
+ this._topVisible = null;
+ this._bottomVisible = null;
+ }
+
+ const onscreenPostNumbers = onscreen.map(idx => posts.objectAt(idx).post_number);
+ this.screenTrack.setOnscreen(onscreenPostNumbers);
+ },
+
+ _scrollTriggered() {
+ Ember.run.scheduleOnce('afterRender', this, this.scrolled);
+ },
+
+ didInsertElement() {
+ this._super();
+ const debouncedScroll = () => Ember.run.debounce(this, this._scrollTriggered, 10);
+
+ $(document).bind('touchmove.post-stream', debouncedScroll);
+ $(window).bind('scroll.post-stream', debouncedScroll);
+ this._scrollTriggered();
+
+ this.appEvents.on('post-stream:refresh', postId => {
+ if (postId) {
+ keyDirty(`post-${postId}`);
+ }
+ this.queueRerender();
+ });
+ },
+
+ willDestroyElement() {
+ this._super();
+ $(document).unbind('touchmove.post-stream');
+ $(window).unbind('scroll.post-stream');
+ this.appEvents.off('post-stream:refresh');
+ }
+
+});
diff --git a/app/assets/javascripts/discourse/components/small-action.js.es6 b/app/assets/javascripts/discourse/components/small-action.js.es6
index 567436348..b66024987 100644
--- a/app/assets/javascripts/discourse/components/small-action.js.es6
+++ b/app/assets/javascripts/discourse/components/small-action.js.es6
@@ -1,33 +1,17 @@
import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
-import computed from 'ember-addons/ember-computed-decorators';
-const icons = {
- 'closed.enabled': 'lock',
- 'closed.disabled': 'unlock-alt',
- 'autoclosed.enabled': 'lock',
- 'autoclosed.disabled': 'unlock-alt',
- 'archived.enabled': 'folder',
- 'archived.disabled': 'folder-open',
- 'pinned.enabled': 'thumb-tack',
- 'pinned.disabled': 'thumb-tack unpinned',
- 'pinned_globally.enabled': 'thumb-tack',
- 'pinned_globally.disabled': 'thumb-tack unpinned',
- 'visible.enabled': 'eye',
- 'visible.disabled': 'eye-slash',
- 'split_topic': 'sign-out',
- 'invited_user': 'plus-circle',
- 'removed_user': 'minus-circle'
-};
+export function actionDescriptionHtml(actionCode, createdAt, username) {
+ const dt = new Date(createdAt);
+ const when = autoUpdatingRelativeAge(dt, { format: 'medium-with-ago' });
+ const who = username ? `
@${username}` : "";
+ return I18n.t(`action_codes.${actionCode}`, { who, when }).htmlSafe();
+}
export function actionDescription(actionCode, createdAt, username) {
return function() {
const ac = this.get(actionCode);
if (ac) {
- const dt = new Date(this.get(createdAt));
- const when = autoUpdatingRelativeAge(dt, { format: 'medium-with-ago' });
- const u = this.get(username);
- const who = u ? `
@${u}` : "";
- return I18n.t(`action_codes.${ac}`, { who, when }).htmlSafe();
+ return actionDescriptionHtml(ac, this.get(createdAt), this.get(username));
}
}.property(actionCode, createdAt);
}
@@ -38,11 +22,6 @@ export default Ember.Component.extend({
description: actionDescription('actionCode', 'post.created_at', 'post.action_code_who'),
- @computed("actionCode")
- icon(actionCode) {
- return icons[actionCode] || 'exclamation';
- },
-
actions: {
edit() {
this.sendAction('editPost', this.get('post'));
diff --git a/app/assets/javascripts/discourse/components/time-gap.js.es6 b/app/assets/javascripts/discourse/components/time-gap.js.es6
deleted file mode 100644
index 9e410c4b7..000000000
--- a/app/assets/javascripts/discourse/components/time-gap.js.es6
+++ /dev/null
@@ -1,21 +0,0 @@
-import SmallActionComponent from 'discourse/components/small-action';
-
-export default SmallActionComponent.extend({
- classNames: ['time-gap'],
- classNameBindings: ['hideTimeGap::hidden'],
- hideTimeGap: Em.computed.alias('postStream.hasNoFilters'),
- icon: 'clock-o',
-
- description: function() {
- const gapDays = this.get('daysAgo');
- if (gapDays < 30) {
- return I18n.t('dates.later.x_days', {count: gapDays});
- } else if (gapDays < 365) {
- const gapMonths = Math.floor(gapDays / 30);
- return I18n.t('dates.later.x_months', {count: gapMonths});
- } else {
- const gapYears = Math.floor(gapDays / 365);
- return I18n.t('dates.later.x_years', {count: gapYears});
- }
- }.property(),
-});
diff --git a/app/assets/javascripts/discourse/components/toggle-summary.js.es6 b/app/assets/javascripts/discourse/components/toggle-summary.js.es6
deleted file mode 100644
index 45dad2660..000000000
--- a/app/assets/javascripts/discourse/components/toggle-summary.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export default Ember.Component.extend({
- layoutName: 'components/toggle-summary',
- tagName: 'section',
- classNames: ['information'],
- postStream: Em.computed.alias('topic.postStream'),
-
- actions: {
- toggleSummary() {
- this.get('postStream').toggleSummary();
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-map.js.es6 b/app/assets/javascripts/discourse/components/topic-map.js.es6
deleted file mode 100644
index b09d1a2d8..000000000
--- a/app/assets/javascripts/discourse/components/topic-map.js.es6
+++ /dev/null
@@ -1,46 +0,0 @@
-var LINKS_SHOWN = 5;
-
-export default Ember.Component.extend({
- mapCollapsed: true,
- layoutName: 'components/topic-map',
- details: Em.computed.alias('topic.details'),
- allLinksShown: false,
-
- init: function() {
- this._super();
-
- // If the topic has a summary, expand the map by default
- this.set('mapCollapsed', Discourse.Mobile.mobileView || (!this.get('topic.has_summary')));
- },
-
- showPosterAvatar: Em.computed.gt('topic.posts_count', 2),
-
- toggleMapClass: function() {
- return this.get('mapCollapsed') ? 'chevron-down' : 'chevron-up';
- }.property('mapCollapsed'),
-
- showAllLinksControls: function() {
- if (this.get('allLinksShown')) return false;
- if ((this.get('details.links.length') || 0) <= LINKS_SHOWN) return false;
- return true;
- }.property('allLinksShown', 'topic.details.links'),
-
- infoLinks: function() {
- var allLinks = this.get('details.links');
- if (Em.isNone(allLinks)) return [];
-
- if (this.get('allLinksShown')) return allLinks;
- return allLinks.slice(0, LINKS_SHOWN);
-
- }.property('details.links', 'allLinksShown'),
-
- actions: {
- toggleMap: function() {
- this.toggleProperty('mapCollapsed');
- },
-
- showAllLinks: function() {
- this.set('allLinksShown', true);
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-participant.js.es6 b/app/assets/javascripts/discourse/components/topic-participant.js.es6
deleted file mode 100644
index e8e58ea34..000000000
--- a/app/assets/javascripts/discourse/components/topic-participant.js.es6
+++ /dev/null
@@ -1,18 +0,0 @@
-export default Ember.Component.extend({
-
- postStream: Em.computed.alias('participant.topic.postStream'),
- showPostCount: Em.computed.gte('participant.post_count', 2),
-
- toggled: function() {
- return this.get('postStream.userFilters').contains(this.get('participant.username'));
- }.property('postStream.userFilters.[]'),
-
- actions: {
- toggle() {
- const postStream = this.get('postStream');
- if (postStream) {
- postStream.toggleParticipant(this.get('participant.username'));
- }
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/components/who-liked.js.es6 b/app/assets/javascripts/discourse/components/who-liked.js.es6
deleted file mode 100644
index 412dfecde..000000000
--- a/app/assets/javascripts/discourse/components/who-liked.js.es6
+++ /dev/null
@@ -1,26 +0,0 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-
-export default Ember.Component.extend(StringBuffer, {
- rerenderTriggers: ['users.length'],
-
- renderString(buffer) {
- const users = this.get('users');
- if (users && users.get('length') > 0) {
- buffer.push("
");
- } else {
- buffer.push("
");
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 88e6c532b..b7c1ae0d0 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -289,6 +289,7 @@ export default Ember.Controller.extend({
self.destroyDraft();
}
+ self.appEvents.trigger('post-stream:refresh');
self.close();
const currentUser = Discourse.User.current();
@@ -587,14 +588,6 @@ export default Ember.Controller.extend({
$('.d-editor-input').autocomplete({ cancel: true });
},
- showOptions() {
- var _ref;
- return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.ArchetypeOptionsModalView.create({
- archetype: this.get('model.archetype'),
- metaData: this.get('model.metaData')
- })) : void 0;
- },
-
canEdit: function() {
return this.get("model.action") === "edit" && Discourse.User.current().get("can_edit");
}.property("model.action"),
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 2fe9e6ee7..b4bb45fd0 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -19,7 +19,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
loadedAllPosts: Em.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'),
enteredAt: null,
retrying: false,
- firstPostExpanded: false,
adminMenuVisible: false,
showRecover: Em.computed.and('model.deleted', 'model.details.can_recover'),
@@ -100,7 +99,60 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
DiscourseURL.routeTo(url);
},
+ selectedQuery: function() {
+ return post => this.postSelected(post);
+ }.property(),
+
actions: {
+
+ fillGapBefore(args) {
+ return this.get('model.postStream').fillGapBefore(args.post, args.gap);
+ },
+
+ fillGapAfter(args) {
+ return this.get('model.postStream').fillGapAfter(args.post, args.gap);
+ },
+
+ // Called the the topmost visible post on the page changes.
+ topVisibleChanged(event) {
+ const { post, refresh } = event;
+
+ if (!post) { return; }
+
+ const postStream = this.get('model.postStream');
+ const firstLoadedPost = postStream.get('posts.firstObject');
+
+ this.set('model.currentPost', post.get('post_number'));
+
+ if (post.get('post_number') === 1) { return; }
+
+ if (firstLoadedPost && firstLoadedPost === post) {
+ postStream.prependMore().then(() => refresh());
+ }
+ },
+
+ // Called the the bottommost visible post on the page changes.
+ bottomVisibleChanged(event) {
+ const { post, refresh } = event;
+
+ const postStream = this.get('model.postStream');
+ const lastLoadedPost = postStream.get('posts.lastObject');
+
+ this.set('controllers.topic-progress.progressPosition', postStream.progressIndexOfPost(post));
+
+ if (lastLoadedPost && lastLoadedPost === post) {
+ postStream.appendMore().then(() => refresh());
+ }
+ },
+
+ toggleSummary() {
+ return this.get('model.postStream').toggleSummary();
+ },
+
+ removeAllowedUser(user) {
+ return this.get('model.details').removeAllowedUser(user);
+ },
+
showTopicAdminMenu() {
this.set('adminMenuVisible', true);
},
@@ -113,7 +165,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
this.deleteTopic();
},
-
archiveMessage() {
const topic = this.get('model');
topic.archiveMessage().then(()=>{
@@ -176,8 +227,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
// Deleting the first post deletes the topic
if (post.get('post_number') === 1) {
- this.deleteTopic();
- return;
+ return this.deleteTopic();
} else if (!post.can_delete) {
// check if current user can delete post
return false;
@@ -210,7 +260,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}
]);
} else {
- post.destroy(user).catch(function(error) {
+ return post.destroy(user).then(() => {
+ this.appEvents.trigger('post-stream:refresh');
+ }).catch(error => {
popupAjaxError(error);
post.undoDeleteState();
});
@@ -245,7 +297,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
},
toggleBookmark(post) {
- if (!Discourse.User.current()) {
+ if (!this.currentUser) {
alert(I18n.t("bookmarks.not_bookmarked"));
return;
}
@@ -261,18 +313,20 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
},
selectAll() {
- const posts = this.get('model.postStream.posts'),
- selectedPosts = this.get('selectedPosts');
+ const posts = this.get('model.postStream.posts');
+ const selectedPosts = this.get('selectedPosts');
if (posts) {
selectedPosts.addObjects(posts);
}
this.set('allPostsSelected', true);
+ this.appEvents.trigger('post-stream:refresh');
},
deselectAll() {
this.get('selectedPosts').clear();
this.get('selectedReplies').clear();
this.set('allPostsSelected', false);
+ this.appEvents.trigger('post-stream:refresh');
},
toggleParticipant(user) {
@@ -293,6 +347,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
toggleMultiSelect() {
this.toggleProperty('multiSelect');
+ this.appEvents.trigger('post-stream:refresh');
},
finishedEditingTopic() {
@@ -447,18 +502,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
});
},
- expandFirstPost(post) {
- const self = this;
- this.set('loadingExpanded', true);
- post.expand().then(function() {
- self.set('firstPostExpanded', true);
- }).catch(function(error) {
- bootbox.alert($.parseJSON(error.responseText).errors);
- }).finally(function() {
- self.set('loadingExpanded', false);
- });
- },
-
retryLoading() {
const self = this;
self.set('retrying', true);
@@ -470,22 +513,22 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
},
toggleWiki(post) {
- post.updatePostField('wiki', !post.get('wiki'));
+ return post.updatePostField('wiki', !post.get('wiki'));
},
togglePostType(post) {
const regular = this.site.get('post_types.regular');
const moderator = this.site.get('post_types.moderator_action');
- post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator);
+ return post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator);
},
rebakePost(post) {
- post.rebake();
+ return post.rebake();
},
unhidePost(post) {
- post.unhide();
+ return post.unhide();
},
changePostOwner(post) {
@@ -498,11 +541,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
this.send('togglePinnedForUser');
},
- showExpandButton: function() {
- const post = this.get('post');
- return post.get('post_number') === 1 && post.get('topic.expandable_first_post');
- }.property(),
-
canMergeTopic: function() {
if (!this.get('model.details.can_move_posts')) return false;
return this.get('selectedPostsCount') > 0;
@@ -598,9 +636,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
// Unsubscribe before subscribing again
this.unsubscribe();
- const self = this;
- this.messageBus.subscribe("/topic/" + this.get('model.id'), function(data) {
- const topic = self.get('model');
+ const refresh = (id) => this.appEvents.trigger('post-stream:refresh', id);
+
+ this.messageBus.subscribe("/topic/" + this.get('model.id'), data => {
+ const topic = this.get('model');
if (data.notification_level_change) {
topic.set('details.notification_level', data.notification_level_change);
@@ -608,26 +647,26 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
return;
}
- const postStream = self.get('model.postStream');
+ const postStream = this.get('model.postStream');
switch (data.type) {
case "revised":
case "acted":
case "rebaked": {
// TODO we could update less data for "acted" (only post actions)
- postStream.triggerChangedPost(data.id, data.updated_at);
+ postStream.triggerChangedPost(data.id, data.updated_at).then(() => refresh(data.id));
return;
}
case "deleted": {
- postStream.triggerDeletedPost(data.id, data.post_number);
+ postStream.triggerDeletedPost(data.id, data.post_number).then(() => refresh(data.id));
return;
}
case "recovered": {
- postStream.triggerRecoveredPost(data.id, data.post_number);
+ postStream.triggerRecoveredPost(data.id, data.post_number).then(() => refresh(data.id));
return;
}
case "created": {
- postStream.triggerNewPostInStream(data.id);
- if (self.get('currentUser.id') !== data.user_id) {
+ postStream.triggerNewPostInStream(data.id).then(() => refresh());
+ if (this.get('currentUser.id') !== data.user_id) {
Discourse.notifyBackgroundCountIncrement();
}
return;
@@ -709,59 +748,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}
},
- // Called the the topmost visible post on the page changes.
- topVisibleChanged(post) {
- if (!post) { return; }
-
- const postStream = this.get('model.postStream');
- const firstLoadedPost = postStream.get('posts.firstObject');
-
- this.set('model.currentPost', post.get('post_number'));
-
- if (post.get('post_number') === 1) { return; }
-
- if (firstLoadedPost && firstLoadedPost === post) {
- // Note: jQuery shouldn't be done in a controller, but how else can we
- // trigger a scroll after a promise resolves in a controller? We need
- // to do this to preserve upwards infinte scrolling.
- const $body = $('body');
- const elemId = `#post_${post.get('post_number')}`;
- const $elem = $(elemId).closest('.post-cloak');
- const elemPos = $elem.position();
- const distToElement = elemPos ? $body.scrollTop() - elemPos.top : 0;
-
- postStream.prependMore().then(function() {
- Em.run.next(function () {
- const $refreshedElem = $(elemId).closest('.post-cloak');
-
- // Quickly going back might mean the element is destroyed
- const position = $refreshedElem.position();
- if (position && position.top) {
- $('html, body').scrollTop(position.top + distToElement);
- }
- });
- });
- }
- },
-
- /**
- Called the the bottommost visible post on the page changes.
-
- @method bottomVisibleChanged
- @params {Discourse.Post} post that is at the bottom
- **/
- bottomVisibleChanged(post) {
- if (!post) { return; }
-
- const postStream = this.get('model.postStream');
- const lastLoadedPost = postStream.get('posts.lastObject');
-
- this.set('controllers.topic-progress.progressPosition', postStream.progressIndexOfPost(post));
-
- if (lastLoadedPost && lastLoadedPost === post) {
- postStream.appendMore();
- }
- },
_showFooter: function() {
const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts");
diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index c8c2a3eee..85d3ce61a 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -22,13 +22,11 @@ function loadingResolver(cb) {
}
function parseName(fullName) {
- /*jshint validthis:true */
-
const nameParts = fullName.split(":"),
- type = nameParts[0], fullNameWithoutType = nameParts[1],
- name = fullNameWithoutType,
- namespace = get(this, 'namespace'),
- root = namespace;
+ type = nameParts[0], fullNameWithoutType = nameParts[1],
+ name = fullNameWithoutType,
+ namespace = get(this, 'namespace'),
+ root = namespace;
return {
fullName: fullName,
@@ -85,6 +83,10 @@ export default Ember.DefaultResolver.extend({
return module;
},
+ resolveWidget(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
resolveAdapter(parsedName) {
return this.customResolve(parsedName) || this._super(parsedName);
},
diff --git a/app/assets/javascripts/discourse/helpers/as-hash.js.es6 b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
new file mode 100644
index 000000000..c5c67a64e
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
@@ -0,0 +1,8 @@
+// Note: Later versions of ember include `hash`
+export default function hashHelper(params) {
+ const hash = {};
+ Object.keys(params.hash).forEach(k => {
+ hash[k] = params.data.view.getStream(params.hash[k]).value();
+ });
+ return hash;
+}
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon.js.es6
index 456f87605..fa35b02d9 100644
--- a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6
+++ b/app/assets/javascripts/discourse/helpers/fa-icon.js.es6
@@ -1,3 +1,4 @@
+import { h } from 'virtual-dom';
import registerUnbound from 'discourse/helpers/register-unbound';
function iconClasses(icon, params) {
@@ -7,7 +8,7 @@ function iconClasses(icon, params) {
return classes;
}
-function iconHTML(icon, params) {
+export function iconHTML(icon, params) {
params = params || {};
var html = "
" + domain + "");
- }
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/helpers/node.js.es6 b/app/assets/javascripts/discourse/helpers/node.js.es6
new file mode 100644
index 000000000..3f34a804c
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/node.js.es6
@@ -0,0 +1,25 @@
+import { h } from 'virtual-dom';
+import { relativeAge, longDate } from 'discourse/lib/formatter';
+import { number } from 'discourse/lib/formatter';
+
+export function dateNode(dt) {
+ if (typeof dt === "string") { dt = new Date(dt); }
+ if (dt) {
+ return h('span', { attributes: { title: longDate(dt) } }, relativeAge(dt));
+ }
+}
+
+export function numberNode(num, opts) {
+ opts = opts || {};
+ num = parseInt(num, 10);
+ if (isNaN(num)) { num = 0; }
+
+ const numString = num.toString();
+ const attributes = { };
+ const formatted = number(num);
+ if (formatted !== numString) {
+ attributes.title = numString;
+ }
+
+ return h('span.number', { className: opts.className, attributes }, formatted);
+}
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 b/app/assets/javascripts/discourse/initializers/signup-cta.js.es6
index fad9e4563..4074d293f 100644
--- a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/initializers/signup-cta.js.es6
@@ -1,25 +1,23 @@
-import ScreenTrack from 'discourse/lib/screen-track';
import Session from 'discourse/models/session';
-const ANON_TOPIC_IDS = 2,
- ANON_PROMPT_READ_TIME = 2 * 60 * 1000,
- ONE_DAY = 24 * 60 * 60 * 1000,
- PROMPT_HIDE_DURATION = ONE_DAY;
+const ANON_TOPIC_IDS = 2;
+const ANON_PROMPT_READ_TIME = 2 * 60 * 1000;
+const ONE_DAY = 24 * 60 * 60 * 1000;
+const PROMPT_HIDE_DURATION = ONE_DAY;
export default {
name: "signup-cta",
initialize(container) {
- const screenTrack = ScreenTrack.current(),
- session = Session.current(),
- siteSettings = container.lookup('site-settings:main'),
- keyValueStore = container.lookup('key-value-store:main'),
- user = container.lookup('current-user:main');
+ const screenTrack = container.lookup('screen-track:main');
+ const session = Session.current();
+ const siteSettings = container.lookup('site-settings:main');
+ const keyValueStore = container.lookup('key-value-store:main');
+ const user = container.lookup('current-user:main');
- screenTrack.set('keyValueStore', keyValueStore);
+ screenTrack.keyValueStore = keyValueStore;
// Preconditions
-
if (user) return; // must not be logged in
if (keyValueStore.get('anon-cta-never')) return; // "never show again"
if (!siteSettings.allow_new_registrations) return;
@@ -63,7 +61,7 @@ export default {
session.set('showSignupCta', true);
}
- screenTrack.set('anonFlushCallback', checkSignupCtaRequirements);
+ screenTrack.registerAnonCallback(checkSignupCtaRequirements);
checkSignupCtaRequirements();
}
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
index a126bf783..48e7ef4aa 100644
--- a/app/assets/javascripts/discourse/lib/discourse-location.js.es6
+++ b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
@@ -1,5 +1,3 @@
-import CloakedCollectionView from 'discourse/views/cloaked-collection';
-
/**
@module Discourse
*/
@@ -221,36 +219,4 @@ const DiscourseLocation = Ember.Object.extend({
});
-/**
- Since we're using pushState/replaceState let's add extra hooks to cloakedView to
- eject itself when the popState occurs. This results in better back button
- behavior.
-**/
-CloakedCollectionView.reopen({
- _watchForPopState: function() {
- const self = this,
- cb = function() {
- // Sam: This is a hack, but a very important one
- // Due to the way we use replace state the back button works strangely
- //
- // If you visit a topic from the front page, scroll a bit around and then hit back
- // you notice that first the page scrolls a bit (within the topic) and then it goes back
- // this transition is jarring and adds uneeded rendering costs.
- //
- // To repro comment the hack out and wack a debugger statement here and in
- // topic_route deactivate
- $('.posts,#topic-title').hide();
- self.cleanUp();
- self.set('controller.model.postStream.loaded', false);
- };
- this.set('_callback', cb);
- popstateCallbacks.addObject(cb);
- }.on('didInsertElement'),
-
- _disbandWatcher: function() {
- popstateCallbacks.removeObject(this.get('_callback'));
- this.set('_callback', null);
- }.on('willDestroyElement')
-});
-
export default DiscourseLocation;
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index b7a7ece91..8b51a87fa 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -12,6 +12,5 @@ export function decorateCooked(container, cb) {
decorate(postView, 'postViewInserted', cb);
decorate(postView, 'postViewUpdated', cb);
decorate(ComposerEditor, 'previewRefreshed', cb);
- decorate(container.lookupFactory('view:embedded-post'), 'didInsertElement', cb);
decorate(container.lookupFactory('view:user-stream'), 'didInsertElement', cb);
}
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
index db7f1238a..d6d62ee1d 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -1,6 +1,8 @@
-import { Placeholder } from 'discourse/views/cloaked';
import { default as computed } from 'ember-addons/ember-computed-decorators';
+export function Placeholder(viewName) {
+ this.viewName = viewName;
+}
export default Ember.Object.extend(Ember.Array, {
posts: null,
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 93e584f23..3506b06d6 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -37,8 +37,6 @@ function positioningWorkaround($fixedElement) {
if (evt) {
evt.target.removeEventListener('blur', blurred);
}
-
- $('body').removeData('disable-cloaked-view');
};
var blurred = _.debounce(blurredNow, 250);
@@ -63,7 +61,6 @@ function positioningWorkaround($fixedElement) {
// take care of body
- $('body').data('disable-cloaked-view',true);
$('#main-outlet').hide();
$('header').hide();
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index 2bc937387..60704ac4b 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -1,22 +1,21 @@
// We use this class to track how long posts in a topic are on the screen.
+const PAUSE_UNLESS_SCROLLED = 1000 * 60 * 3;
+const MAX_TRACKING_TIME = 1000 * 60 * 6;
+const ANON_MAX_TOPIC_IDS = 5;
-import Singleton from 'discourse/mixins/singleton';
+const getTime = () => new Date().getTime();
-const PAUSE_UNLESS_SCROLLED = 1000 * 60 * 3,
- MAX_TRACKING_TIME = 1000 * 60 * 6,
- ANON_MAX_TOPIC_IDS = 5;
-
-const ScreenTrack = Ember.Object.extend({
-
- init() {
+export default class {
+ constructor(topicTrackingState, siteSettings, session, currentUser) {
+ this.topicTrackingState = topicTrackingState;
+ this.siteSettings = siteSettings;
+ this.session = session;
+ this.currentUser = currentUser;
this.reset();
-
- // TODO: Move `ScreenTrack` to injection and remove this
- this.set('topicTrackingState', Discourse.__container__.lookup('topic-tracking-state:main'));
- },
+ }
start(topicId, topicController) {
- const currentTopicId = this.get('topicId');
+ const currentTopicId = this._topicId;
if (currentTopicId && (currentTopicId !== topicId)) {
this.tick();
this.flush();
@@ -25,90 +24,81 @@ const ScreenTrack = Ember.Object.extend({
this.reset();
// Create an interval timer if we don't have one.
- if (!this.get('interval')) {
- const self = this;
- this.set('interval', setInterval(function () {
- self.tick();
- }, 1000));
-
- $(window).on('scroll.screentrack', function(){self.scrolled();});
+ if (!this._interval) {
+ this._interval = setInterval(() => this.tick(), 1000);
+ $(window).on('scroll.screentrack', () => this.scrolled());
}
- this.set('topicId', topicId);
- this.set('topicController', topicController);
- },
+ this._topicId = topicId;
+ this._topicController = topicController;
+ }
stop() {
- if(!this.get('topicId')) {
- // already stopped no need to "extra stop"
- return;
- }
+ // already stopped no need to "extra stop"
+ if(!this._topicId) { return; }
+
$(window).off('scroll.screentrack');
this.tick();
this.flush();
this.reset();
- this.set('topicId', null);
- this.set('topicController', null);
- if (this.get('interval')) {
- clearInterval(this.get('interval'));
- this.set('interval', null);
+
+ this._topicId = null;
+ this._topicController = null;
+
+ if (this._interval) {
+ clearInterval(this._interval);
+ this._interval = null;
}
- },
+ }
- track(elementId, postNumber) {
- this.get('timings')["#" + elementId] = {
- time: 0,
- postNumber: postNumber
- };
- },
-
- stopTracking(elementId) {
- delete this.get('timings')['#' + elementId];
- },
+ setOnscreen(onscreen) {
+ this._onscreen = onscreen;
+ }
// Reset our timers
reset() {
- this.setProperties({
- lastTick: new Date().getTime(),
- lastScrolled: new Date().getTime(),
- lastFlush: 0,
- cancelled: false,
- timings: {},
- totalTimings: {},
- topicTime: 0
- });
- },
+ const now = getTime();
+ this._lastTick = now;
+ this._lastScrolled = now;
+ this._lastFlush = 0;
+ this._timings = {};
+ this._totalTimings = {};
+ this._topicTime = 0;
+ this._onscreen = [];
+ }
scrolled() {
- this.set('lastScrolled', new Date().getTime());
- },
+ this._lastScrolled = getTime();
+ }
+
+ registerAnonCallback(cb) {
+ this._anonCallback = cb;
+ }
flush() {
- if (this.get('cancelled')) { return; }
+ const newTimings = {};
+ const totalTimings = this._totalTimings;
- const newTimings = {},
- totalTimings = this.get('totalTimings'),
- self = this;
+ const timings = this._timings;
+ Object.keys(this._timings).forEach(postNumber => {
+ const time = timings[postNumber];
+ totalTimings[postNumber] = totalTimings[postNumber] || 0;
- _.each(this.get('timings'), function(timing) {
- if (!totalTimings[timing.postNumber])
- totalTimings[timing.postNumber] = 0;
-
- if (timing.time > 0 && totalTimings[timing.postNumber] < MAX_TRACKING_TIME) {
- totalTimings[timing.postNumber] += timing.time;
- newTimings[timing.postNumber] = timing.time;
+ if (time > 0 && totalTimings[postNumber] < MAX_TRACKING_TIME) {
+ totalTimings[postNumber] += time;
+ newTimings[postNumber] = time;
}
- timing.time = 0;
+ timings[postNumber] = 0;
});
- const topicId = parseInt(this.get('topicId'), 10);
+ const topicId = parseInt(this._topicId, 10);
let highestSeen = 0;
- _.each(newTimings, function(time,postNumber) {
+ Object.keys(newTimings).forEach(postNumber => {
highestSeen = Math.max(highestSeen, parseInt(postNumber, 10));
});
- const highestSeenByTopic = Discourse.Session.currentProp('highestSeenByTopic');
+ const highestSeenByTopic = this.session.get('highestSeenByTopic');
if ((highestSeenByTopic[topicId] || 0) < highestSeen) {
highestSeenByTopic[topicId] = highestSeen;
}
@@ -116,11 +106,11 @@ const ScreenTrack = Ember.Object.extend({
this.topicTrackingState.updateSeen(topicId, highestSeen);
if (!$.isEmptyObject(newTimings)) {
- if (Discourse.User.current()) {
+ if (this.currentUser) {
Discourse.ajax('/topics/timings', {
data: {
timings: newTimings,
- topic_time: this.get('topicTime'),
+ topic_time: this._topicTime,
topic_id: topicId
},
cache: false,
@@ -128,22 +118,20 @@ const ScreenTrack = Ember.Object.extend({
headers: {
'X-SILENCE-LOGGER': 'true'
}
- }).then(function() {
- const controller = self.get('topicController');
+ }).then(() => {
+ const controller = this._topicController;
if (controller) {
- const postNumbers = Object.keys(newTimings).map(function(v) {
- return parseInt(v, 10);
- });
+ const postNumbers = Object.keys(newTimings).map(v => parseInt(v, 10));
controller.readPosts(topicId, postNumbers);
}
});
- } else if (this.get('anonFlushCallback')) {
+ } else if (this._anonCallback) {
// Anonymous viewer - save to localStorage
- const storage = this.get('keyValueStore');
+ const storage = this.keyValueStore;
// Save total time
const existingTime = storage.getInt('anon-topic-time');
- storage.setItem('anon-topic-time', existingTime + this.get('topicTime'));
+ storage.setItem('anon-topic-time', existingTime + this._topicTime);
// Save unique topic IDs up to a max
let topicIds = storage.get('anon-topic-ids');
@@ -158,64 +146,47 @@ const ScreenTrack = Ember.Object.extend({
}
// Inform the observer
- this.get('anonFlushCallback')();
+ this._anonCallback();
// No need to call controller.readPosts()
}
- this.set('topicTime', 0);
+ this._topicTime = 0;
}
- this.set('lastFlush', 0);
- },
+
+ this._lastFlush = 0;
+ }
tick() {
+ const now = new Date().getTime();
// If the user hasn't scrolled the browser in a long time, stop tracking time read
- const sinceScrolled = new Date().getTime() - this.get('lastScrolled');
+ const sinceScrolled = now - this._lastScrolled;
if (sinceScrolled > PAUSE_UNLESS_SCROLLED) {
return;
}
- const diff = new Date().getTime() - this.get('lastTick');
- this.set('lastFlush', this.get('lastFlush') + diff);
- this.set('lastTick', new Date().getTime());
+ const diff = now - this._lastTick;
+ this._lastFlush += diff;
+ this._lastTick = now;
- const totalTimings = this.get('totalTimings'), timings = this.get('timings');
- const nextFlush = Discourse.SiteSettings.flush_timings_secs * 1000;
+ const totalTimings = this._totalTimings;
+ const timings = this._timings;
+ const nextFlush = this.siteSettings.flush_timings_secs * 1000;
- // rush new post numbers
- const rush = _.any(_.filter(timings, function(t){return t.time>0;}), function(t){
- return !totalTimings[t.postNumber];
+ const rush = Object.keys(timings).some(postNumber => {
+ return timings[postNumber] > 0 && !totalTimings[postNumber];
});
- if (this.get('lastFlush') > nextFlush || rush) {
+ if (this._lastFlush > nextFlush || rush) {
this.flush();
}
// Don't track timings if we're not in focus
if (!Discourse.get("hasFocus")) return;
- this.set('topicTime', this.get('topicTime') + diff);
- const docViewTop = $(window).scrollTop() + $('header').height(),
- docViewBottom = docViewTop + $(window).height();
+ this._topicTime += diff;
- // TODO: Eyeline has a smarter more accurate function here. It's bad to do jQuery
- // in a model like component, so we should refactor this out later.
- _.each(this.get('timings'),function(timing,id) {
- const $element = $(id);
- if ($element.length === 1) {
- const elemTop = $element.offset().top,
- elemBottom = elemTop + $element.height();
-
- // If part of the element is on the screen, increase the counter
- if (((docViewTop <= elemTop && elemTop <= docViewBottom)) || ((docViewTop <= elemBottom && elemBottom <= docViewBottom))) {
- timing.time = timing.time + diff;
- }
- }
- });
+ this._onscreen.forEach(postNumber => timings[postNumber] = (timings[postNumber] || 0) + diff);
}
-});
-
-
-ScreenTrack.reopenClass(Singleton);
-export default ScreenTrack;
+}
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
new file mode 100644
index 000000000..55ca19041
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -0,0 +1,191 @@
+function actionDescription(action, acted, count) {
+ if (acted) {
+ if (count <= 1) {
+ return I18n.t(`post.actions.by_you.${action}`);
+ } else {
+ return I18n.t(`post.actions.by_you_and_others.${action}`, { count: count - 1 });
+ }
+ } else {
+ return I18n.t(`post.actions.by_others.${action}`, { count });
+ }
+}
+
+export function transformBasicPost(post) {
+ // Note: it can be dangerous to not use `get` in Ember code, but this is significantly
+ // faster and has tests to confirm it works. We only call `get` when the property is a CP
+ return {
+ id: post.id,
+ hidden: post.hidden,
+ deleted: post.get('deleted'),
+ deleted_at: post.deleted_at,
+ user_deleted: post.user_deleted,
+ isDeleted: post.deleted_at || post.user_deleted,
+ deletedByAvatarTemplate: null,
+ deletedByUsername: null,
+ primary_group_name: post.primary_group_name,
+ wiki: post.wiki,
+ firstPost: post.post_number === 1,
+ post_number: post.post_number,
+ cooked: post.cooked,
+ via_email: post.via_email,
+ user_id: post.user_id,
+ usernameUrl: Discourse.getURL(`/users/${post.username}`),
+ username: post.username,
+ avatar_template: post.avatar_template,
+ bookmarked: post.bookmarked,
+ yours: post.yours,
+ shareUrl: post.get('shareUrl'),
+ staff: post.staff,
+ admin: post.admin,
+ moderator: post.moderator,
+ new_user: post.trust_level === 0,
+ name: post.name,
+ user_title: post.user_title,
+ created_at: post.created_at,
+ updated_at: post.updated_at,
+ canDelete: post.can_delete,
+ canRecover: post.can_recover,
+ canEdit: post.can_edit,
+ canFlag: !Ember.isEmpty(post.flagsAvailable),
+ version: post.version,
+ canRecoverTopic: false,
+ canDeletedTopic: false,
+ canViewEditHistory: post.can_view_edit_history,
+ canWiki: post.can_wiki,
+ showLike: false,
+ liked: false,
+ canToggleLike: false,
+ likeCount: false,
+ actionsSummary: null,
+ read: post.read,
+ replyToUsername: null,
+ replyToAvatarTemplate: null,
+ reply_to_post_number: post.reply_to_post_number,
+ cooked_hidden: !!post.cooked_hidden,
+ expandablePost: false,
+ replyCount: post.reply_count,
+ };
+}
+
+
+export default function transformPost(currentUser, site, post, prevPost, nextPost) {
+ // Note: it can be dangerous to not use `get` in Ember code, but this is significantly
+ // faster and has tests to confirm it works. We only call `get` when the property is a CP
+ const postType = post.post_type;
+ const postTypes = site.post_types;
+ const topic = post.topic;
+ const details = topic.get('details');
+
+ const postAtts = transformBasicPost(post);
+
+ postAtts.topicId = topic.id;
+ postAtts.topicOwner = details.created_by.id === post.user_id;
+ postAtts.post_type = postType;
+ postAtts.via_email = post.via_email;
+ postAtts.isModeratorAction = postType === postTypes.moderator_action;
+ postAtts.isWhisper = postType === postTypes.whisper;
+ postAtts.isSmallAction = postType === postTypes.small_action;
+ postAtts.canBookmark = !!currentUser;
+ postAtts.canManage = currentUser && currentUser.get('canManageTopic');
+ postAtts.canViewRawEmail = currentUser && (currentUser.id === post.user_id || currentUser.staff);
+ postAtts.canReplyAsNewTopic = details.can_reply_as_new_topic;
+ postAtts.isWarning = topic.is_warning;
+ postAtts.links = post.get('internalLinks');
+ postAtts.replyDirectlyBelow = nextPost && nextPost.reply_to_post_number === post.post_number;
+ postAtts.replyDirectlyAbove = prevPost && post.reply_to_post_number === prevPost.post_number;
+ postAtts.linkCounts = post.link_counts;
+ postAtts.actionCode = post.action_code;
+ postAtts.actionCodeWho = post.action_code_who;
+
+ const showPMMap = topic.archetype === 'private_message' && post.post_number === 1;
+ if (showPMMap) {
+ postAtts.showPMMap = true;
+ postAtts.allowedGroups = details.allowed_groups;
+ postAtts.allowedUsers = details.allowed_users;
+ postAtts.canRemoveAllowedUsers = details.can_remove_allowed_users;
+ postAtts.canInvite = details.can_invite_to;
+ }
+
+ const showTopicMap = showPMMap || (post.post_number === 1 && topic.archetype === 'regular' && topic.posts_count > 1);
+ if (showTopicMap) {
+ postAtts.showTopicMap = true;
+ postAtts.topicUrl = topic.get('url');
+ postAtts.topicCreatedAt = topic.created_at;
+ postAtts.createdByUsername = details.created_by.username;
+ postAtts.createdByAvatarTemplate = details.created_by.avatar_template;
+
+ postAtts.lastPostUrl = topic.get('lastPostUrl');
+ postAtts.lastPostUsername = details.last_poster.username;
+ postAtts.lastPostAvatarTemplate = details.last_poster.avatar_template;
+ postAtts.lastPostAt = topic.last_posted_at;
+
+ postAtts.topicReplyCount = topic.get('replyCount');
+ postAtts.topicViews = topic.views;
+ postAtts.topicViewsHeat = topic.get('viewsHeat');
+
+ postAtts.participantCount = topic.participant_count;
+ postAtts.topicLikeCount = topic.like_count;
+ postAtts.topicLinks = details.links;
+ if (postAtts.topicLinks) {
+ postAtts.topicLinkLength = details.links.length;
+ }
+ postAtts.topicPostsCount = topic.posts_count;
+
+ postAtts.participants = details.participants;
+
+ const postStream = topic.get('postStream');
+ postAtts.userFilters = postStream.userFilters;
+ postAtts.topicSummaryEnabled = postStream.summary;
+ postAtts.topicWordCount = topic.word_count;
+ postAtts.hasTopicSummary = topic.has_summary;
+ }
+
+ if (postAtts.isDeleted) {
+ postAtts.deletedByAvatarTemplate = post.get('postDeletedBy.avatar_template');
+ postAtts.deletedByUsername = post.get('postDeletedBy.username');
+ }
+
+ const replyToUser = post.get('reply_to_user');
+ if (replyToUser) {
+ postAtts.replyToUsername = replyToUser.username;
+ postAtts.replyToAvatarTemplate = replyToUser.avatar_template;
+ }
+
+ if (post.actions_summary) {
+ postAtts.actionsSummary = post.actions_summary.filter(a => {
+ return a.actionType.name_key !== 'like' && a.count > 0;
+ }).map(a => {
+ const acted = a.acted;
+ const action = a.actionType.name_key;
+ const count = a.count;
+
+ return { id: a.id,
+ postId: post.id,
+ action,
+ acted,
+ count,
+ canUndo: a.can_undo,
+ canDeferFlags: a.can_defer_flags,
+ description: actionDescription(action, acted, count) };
+ });
+ }
+
+ const likeAction = post.likeAction;
+ if (likeAction) {
+ postAtts.showLike = true;
+ postAtts.liked = likeAction.acted;
+ postAtts.canToggleLike = likeAction.get('canToggle');
+ postAtts.likeCount = likeAction.count;
+ }
+
+ if (postAtts.post_number === 1) {
+ postAtts.canRecoverTopic = topic.deleted_at && details.can_recover;
+ postAtts.canDeleteTopic = !topic.deleted_at && details.can_delete;
+ postAtts.expandablePost = topic.expandable_first_post;
+ } else {
+ postAtts.canRecover = postAtts.isDeleted && postAtts.canRecover;
+ postAtts.canDelete = !postAtts.isDeleted && postAtts.canDelete;
+ }
+
+ return postAtts;
+}
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index c35cffba3..3c76d4f51 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -14,10 +14,9 @@ const DiscourseURL = Ember.Object.createWithMixins({
/**
Jumps to a particular post in the stream
**/
- jumpToPost: function(postNumber, opts) {
- const holderId = `.post-cloak[data-post-number=${postNumber}]`;
- const offset = function() {
-
+ jumpToPost(postNumber, opts) {
+ const holderId = `#post_${postNumber}`;
+ const offset = () => {
const $header = $('header');
const $title = $('#topic-title');
const windowHeight = $(window).height() - $title.height();
@@ -26,8 +25,7 @@ const DiscourseURL = Ember.Object.createWithMixins({
return $header.outerHeight(true) + ((expectedOffset < 0) ? 0 : expectedOffset);
};
-
- Em.run.schedule('afterRender', function() {
+ Em.run.schedule('afterRender', () => {
if (postNumber === 1) {
$(window).scrollTop(0);
return;
@@ -37,21 +35,18 @@ const DiscourseURL = Ember.Object.createWithMixins({
const holder = $(holderId);
if (holder.length > 0 && opts && opts.skipIfOnScreen){
-
// if we are on screen skip
const elementTop = lockon.elementTop(),
- scrollTop = $(window).scrollTop(),
- windowHeight = $(window).height()-offset(),
- height = holder.height();
+ scrollTop = $(window).scrollTop(),
+ windowHeight = $(window).height()-offset(),
+ height = holder.height();
- if (elementTop > scrollTop &&
- (elementTop + height) < (scrollTop + windowHeight)) {
+ if (elementTop > scrollTop && (elementTop + height) < (scrollTop + windowHeight)) {
return;
}
}
lockon.lock();
-
});
},
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js.es6
index a8f75cd53..a39d78fb5 100644
--- a/app/assets/javascripts/discourse/models/action-summary.js.es6
+++ b/app/assets/javascripts/discourse/models/action-summary.js.es6
@@ -3,20 +3,6 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
export default RestModel.extend({
- // Description for the action
- description: function() {
- const action = this.get('actionType.name_key');
- if (this.get('acted')) {
- if (this.get('count') <= 1) {
- return I18n.t('post.actions.by_you.' + action);
- } else {
- return I18n.t('post.actions.by_you_and_others.' + action, { count: this.get('count') - 1 });
- }
- } else {
- return I18n.t('post.actions.by_others.' + action, { count: this.get('count') });
- }
- }.property('count', 'acted', 'actionType'),
-
canToggle: function() {
return this.get('can_undo') || this.get('can_act');
}.property('can_undo', 'can_act'),
@@ -31,7 +17,14 @@ export default RestModel.extend({
});
},
- toggle: function(post) {
+ togglePromise(post) {
+ if (!this.get('acted')) {
+ return this.act(post).then(() => true);
+ }
+ return this.undo(post).then(() => false);
+ },
+
+ toggle(post) {
if (!this.get('acted')) {
this.act(post);
return true;
@@ -42,7 +35,7 @@ export default RestModel.extend({
},
// Perform this action
- act: function(post, opts) {
+ act(post, opts) {
if (!opts) opts = {};
@@ -83,37 +76,20 @@ export default RestModel.extend({
},
// Undo this action
- undo: function(post) {
+ undo(post) {
this.removeAction(post);
// Remove our post action
return Discourse.ajax("/post_actions/" + post.get('id'), {
type: 'DELETE',
- data: {
- post_action_type_id: this.get('id')
- }
- }).then(function(result) {
- return post.updateActionsSummary(result);
- });
+ data: { post_action_type_id: this.get('id') }
+ }).then(result => post.updateActionsSummary(result));
},
- deferFlags: function(post) {
- const self = this;
+ deferFlags(post) {
return Discourse.ajax("/post_actions/defer_flags", {
type: "POST",
- data: {
- post_action_type_id: this.get("id"),
- id: post.get('id')
- }
- }).then(function () {
- self.set("count", 0);
- });
- },
-
- loadUsers(post) {
- return this.store.find('post-action-user', {
- id: post.get('id'),
- post_action_type_id: this.get('id')
- });
+ data: { post_action_type_id: this.get("id"), id: post.get('id') }
+ }).then(() => this.set('count', 0));
}
});
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 02511e01f..2b5136ccc 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -4,21 +4,6 @@ import PostsWithPlaceholders from 'discourse/lib/posts-with-placeholders';
import { default as computed } from 'ember-addons/ember-computed-decorators';
import { loadTopicView } from 'discourse/models/topic';
-function calcDayDiff(p1, p2) {
- if (!p1) { return; }
-
- const date = p1.get('created_at');
- if (date && p2) {
- const lastDate = p2.get('created_at');
- if (lastDate) {
- const delta = new Date(date).getTime() - new Date(lastDate).getTime();
- const days = Math.round(delta / (1000 * 60 * 60 * 24));
-
- p1.set('daysSincePrevious', days);
- }
- }
-}
-
export default RestModel.extend({
_identityMap: null,
posts: null,
@@ -414,7 +399,6 @@ export default RestModel.extend({
const stored = this.storePost(post);
if (stored) {
const posts = this.get('posts');
- calcDayDiff(posts.get('firstObject'), stored);
posts.unshiftObject(stored);
}
@@ -426,7 +410,6 @@ export default RestModel.extend({
if (stored) {
const posts = this.get('posts');
- calcDayDiff(stored, this.get('lastAppended'));
if (!posts.contains(stored)) {
if (!this.get('loadingBelow')) {
this.get('postsWithPlaceholders').appendPost(() => posts.pushObject(stored));
@@ -471,10 +454,12 @@ export default RestModel.extend({
have no filters.
**/
triggerNewPostInStream(postId) {
- if (!postId) { return; }
+ const resolved = Ember.RSVP.Promise.resolve();
+
+ if (!postId) { return resolved; }
// We only trigger if there are no filters active
- if (!this.get('hasNoFilters')) { return; }
+ if (!this.get('hasNoFilters')) { return resolved; }
const loadedAllPosts = this.get('loadedAllPosts');
@@ -482,25 +467,27 @@ export default RestModel.extend({
this.get('stream').addObject(postId);
if (loadedAllPosts) {
this.set('loadingLastPost', true);
- this.findPostsByIds([postId]).then(posts => {
+ return this.findPostsByIds([postId]).then(posts => {
posts.forEach(p => this.appendPost(p));
}).finally(() => {
this.set('loadingLastPost', false);
});
}
}
+
+ return resolved;
},
triggerRecoveredPost(postId) {
const existing = this._identityMap[postId];
if (existing) {
- this.triggerChangedPost(postId, new Date());
+ return this.triggerChangedPost(postId, new Date());
} else {
// need to insert into stream
const url = "/posts/" + postId;
const store = this.store;
- Discourse.ajax(url).then(p => {
+ return Discourse.ajax(url).then(p => {
const post = store.createRecord('post', p);
const stream = this.get("stream");
const posts = this.get("posts");
@@ -541,34 +528,26 @@ export default RestModel.extend({
const url = "/posts/" + postId;
const store = this.store;
- Discourse.ajax(url).then(p => {
+ return Discourse.ajax(url).then(p => {
this.storePost(store.createRecord('post', p));
}).catch(() => {
this.removePosts([existing]);
});
}
+ return Ember.RSVP.Promise.resolve();
},
triggerChangedPost(postId, updatedAt) {
- if (!postId) { return; }
+ const resolved = Ember.RSVP.Promise.resolve();
+ if (!postId) { return resolved; }
const existing = this._identityMap[postId];
if (existing && existing.updated_at !== updatedAt) {
const url = "/posts/" + postId;
const store = this.store;
- Discourse.ajax(url).then(p => this.storePost(store.createRecord('post', p)));
+ return Discourse.ajax(url).then(p => this.storePost(store.createRecord('post', p)));
}
- },
-
- // Returns the "thread" of posts in the history of a post.
- findReplyHistory(post) {
- const url = `/posts/${post.get('id')}/reply-history.json?max_replies=${Discourse.SiteSettings.max_reply_history}`;
- const store = this.store;
- return Discourse.ajax(url).then(result => {
- return result.map(p => this.storePost(store.createRecord('post', p)));
- }).then(replyHistory => {
- post.set('replyHistory', replyHistory);
- });
+ return resolved;
},
/**
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index ff638cef6..8565cfc7d 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -7,10 +7,6 @@ import computed from 'ember-addons/ember-computed-decorators';
const Post = RestModel.extend({
- init() {
- this.set('replyHistory', []);
- },
-
@computed()
siteSettings() {
// TODO: Remove this once one instantiate all `Discourse.Post` models via the store.
@@ -35,11 +31,6 @@ const Post = RestModel.extend({
deletedViaTopic: Em.computed.and('firstPost', 'topic.deleted_at'),
deleted: Em.computed.or('deleted_at', 'deletedViaTopic'),
notDeleted: Em.computed.not('deleted'),
- userDeleted: Em.computed.empty('user_id'),
-
- hasTimeGap: function() {
- return (this.get('daysSincePrevious') || 0) > Discourse.SiteSettings.show_time_gap_days;
- }.property('daysSincePrevious'),
showName: function() {
const name = this.get('name');
@@ -68,25 +59,13 @@ const Post = RestModel.extend({
usernameUrl: url('username', '/users/%@'),
- showUserReplyTab: function() {
- return this.get('reply_to_user') && (
- !Discourse.SiteSettings.suppress_reply_directly_above ||
- this.get('reply_to_post_number') < (this.get('post_number') - 1)
- );
- }.property('reply_to_user', 'reply_to_post_number', 'post_number'),
-
topicOwner: propertyEqual('topic.details.created_by.id', 'user_id'),
- hasHistory: Em.computed.gt('version', 1),
-
- canViewRawEmail: function() {
- return this.get("user_id") === Discourse.User.currentProp("id") || Discourse.User.currentProp('staff');
- }.property("user_id"),
updatePostField(field, value) {
const data = {};
data[field] = value;
- Discourse.ajax(`/posts/${this.get('id')}/${field}`, { type: 'PUT', data }).then(() => {
+ return Discourse.ajax(`/posts/${this.get('id')}/${field}`, { type: 'PUT', data }).then(() => {
this.set(field, value);
this.incrementProperty("version");
}).catch(popupAjaxError);
@@ -97,9 +76,6 @@ const Post = RestModel.extend({
return this.get('link_counts').filterProperty('internal').filterProperty('title');
}.property('link_counts.@each.internal'),
- // Edits are the version - 1, so version 2 = 1 edit
- editCount: function() { return this.get('version') - 1; }.property('version'),
-
flagsAvailable: function() {
const post = this;
return Discourse.Site.currentProp('flagTypes').filter(function(item) {
@@ -107,17 +83,6 @@ const Post = RestModel.extend({
});
}.property('actions_summary.@each.can_act'),
- actionsWithoutLikes: function() {
- if (!!Ember.isEmpty(this.get('actions_summary'))) return null;
-
- return this.get('actions_summary').filter(function(i) {
- if (i.get('count') === 0) return false;
- if (i.get('actionType.name_key') === 'like') { return false; }
- if (i.get('users') && i.get('users').length > 0) return true;
- return !i.get('hidden');
- });
- }.property('actions_summary.@each.users', 'actions_summary.@each.count'),
-
afterUpdate(res) {
if (res.category) {
Discourse.Site.current().updateCategory(res.category);
@@ -246,10 +211,6 @@ const Post = RestModel.extend({
let value = otherPost[key],
oldValue = self[key];
- if (key === "replyHistory") {
- return;
- }
-
if (!value) { value = null; }
if (!oldValue) { oldValue = null; }
@@ -267,56 +228,9 @@ const Post = RestModel.extend({
});
},
- // Load replies to this post
- loadReplies() {
- if(this.get('loadingReplies')){
- return;
- }
-
- this.set('loadingReplies', true);
- this.set('replies', []);
-
- const self = this;
- return Discourse.ajax("/posts/" + (this.get('id')) + "/replies")
- .then(function(loaded) {
- const replies = self.get('replies');
- _.each(loaded,function(reply) {
- const post = Discourse.Post.create(reply);
- post.set('topic', self.get('topic'));
- replies.pushObject(post);
- });
- })
- ['finally'](function(){
- self.set('loadingReplies', false);
- });
- },
-
- // Whether to show replies directly below
- showRepliesBelow: function() {
- const replyCount = this.get('reply_count');
-
- // We don't show replies if there aren't any
- if (replyCount === 0) return false;
-
- // Always show replies if the setting `suppress_reply_directly_below` is false.
- if (!Discourse.SiteSettings.suppress_reply_directly_below) return true;
-
- // Always show replies if there's more than one
- if (replyCount > 1) return true;
-
- // If we have *exactly* one reply, we have to consider if it's directly below us
- const topic = this.get('topic');
- return !topic.isReplyDirectlyBelow(this);
-
- }.property('reply_count'),
-
expandHidden() {
- const self = this;
- return Discourse.ajax("/posts/" + this.get('id') + "/cooked.json").then(function (result) {
- self.setProperties({
- cooked: result.cooked,
- cooked_hidden: false
- });
+ return Discourse.ajax("/posts/" + this.get('id') + "/cooked.json").then(result => {
+ this.setProperties({ cooked: result.cooked, cooked_hidden: false });
});
},
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index a7f4edcf9..52246ff34 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -37,7 +37,9 @@ function findAndRemoveMap(type, id) {
flushMap();
export default Ember.Object.extend({
- _plurals: {},
+ _plurals: {'post-reply': 'post-replies',
+ 'post-reply-history': 'post_reply_histories'},
+
pluralize(thing) {
return this._plurals[thing] || thing + "s";
},
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6
index c40213a72..a92174bc9 100644
--- a/app/assets/javascripts/discourse/models/topic-details.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-details.js.es6
@@ -34,12 +34,6 @@ const TopicDetails = RestModel.extend({
this.set('loaded', true);
},
- fewParticipants: function() {
- if (!!Ember.isEmpty(this.get('participants'))) return null;
- return this.get('participants').slice(0, 3);
- }.property('participants'),
-
-
notificationReasonText: function() {
var level = this.get('notification_level');
if(typeof level !== 'number'){
@@ -68,13 +62,13 @@ const TopicDetails = RestModel.extend({
},
removeAllowedUser(user) {
- var users = this.get('allowed_users'),
- username = user.get('username');
+ const users = this.get('allowed_users');
+ const username = user.get('username');
- Discourse.ajax("/t/" + this.get('topic.id') + "/remove-allowed-user", {
+ return Discourse.ajax("/t/" + this.get('topic.id') + "/remove-allowed-user", {
type: 'PUT',
data: { username: username }
- }).then(function() {
+ }).then(() => {
users.removeObject(users.findProperty('username', username));
});
}
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 24d0638a5..247825184 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -224,13 +224,6 @@ const Topic = RestModel.extend({
.then(function () { self.set('archetype', 'regular'); });
},
- estimatedReadingTime: function() {
- const wordCount = this.get('word_count');
- if (!wordCount) return;
-
- return Math.floor(wordCount / Discourse.SiteSettings.read_time_word_count);
- }.property('word_count'),
-
toggleBookmark() {
if (this.get("bookmarking")) { return; }
this.set("bookmarking", true);
@@ -390,25 +383,6 @@ const Topic = RestModel.extend({
});
},
- // Is the reply to a post directly below it?
- isReplyDirectlyBelow(post) {
- const posts = this.get('postStream.posts');
- const postNumber = post.get('post_number');
- if (!posts) return;
-
- const postBelow = posts[posts.indexOf(post) + 1];
-
- // If the post directly below's reply_to_post_number is our post number or we are quoted,
- // it's considered directly below.
- //
- // TODO: we don't carry information about quoting, this leaves this code fairly fragile
- // instead we should start shipping quote meta data with posts, but this will add at least
- // 1 query to the topics page
- //
- return postBelow && (postBelow.get('reply_to_post_number') === postNumber ||
- postBelow.get('cooked').indexOf('data-post="'+ postNumber + '"') >= 0
- );
- },
hasExcerpt: Em.computed.notEmpty('excerpt'),
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
index 7d66de697..96c4cea32 100644
--- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
@@ -6,6 +6,7 @@ import DiscourseURL from 'discourse/lib/url';
import DiscourseLocation from 'discourse/lib/discourse-location';
import SearchService from 'discourse/services/search';
import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state';
+import ScreenTrack from 'discourse/lib/screen-track';
function inject() {
const app = arguments[0],
@@ -38,23 +39,29 @@ export default {
const currentUser = Discourse.User.current();
app.register('current-user:main', currentUser, { instantiate: false });
- const tracking = TopicTrackingState.create({ messageBus, currentUser });
- app.register('topic-tracking-state:main', tracking, { instantiate: false });
+ const topicTrackingState = TopicTrackingState.create({ messageBus, currentUser });
+ app.register('topic-tracking-state:main', topicTrackingState, { instantiate: false });
injectAll(app, 'topicTrackingState');
const site = Discourse.Site.current();
app.register('site:main', site, { instantiate: false });
injectAll(app, 'site');
- app.register('site-settings:main', Discourse.SiteSettings, { instantiate: false });
+ const siteSettings = Discourse.SiteSettings;
+ app.register('site-settings:main', siteSettings, { instantiate: false });
injectAll(app, 'siteSettings');
app.register('search-service:main', SearchService);
injectAll(app, 'searchService');
- app.register('session:main', Session.current(), { instantiate: false });
+ const session = Session.current();
+ app.register('session:main', session, { instantiate: false });
injectAll(app, 'session');
+ const screenTrack = new ScreenTrack(topicTrackingState, siteSettings, session, currentUser);
+ app.register('screen-track:main', screenTrack, { instantiate: false });
+ inject(app, 'screenTrack', 'component', 'route');
+
inject(app, 'currentUser', 'component', 'route', 'controller');
app.register('location:discourse-location', DiscourseLocation);
@@ -63,6 +70,6 @@ export default {
app.register('key-value-store:main', keyValueStore, { instantiate: false });
injectAll(app, 'keyValueStore');
- startTracking(tracking);
+ startTracking(topicTrackingState);
}
};
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 8c1637b7a..54892bcd9 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -37,12 +37,6 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
return this._super();
},
- // This is here as a bugfix for when an Ember Cloaked view triggers
- // a scroll after a controller has been torn down. The real fix
- // should be to fix ember cloaking to not do that, but this catches
- // it safely just in case.
- postChangedRoute: Ember.K,
-
showTopicEntrance(data) {
this.controllerFor('topic-entrance').send('show', data);
},
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 890f0729f..990a88215 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -1,4 +1,3 @@
-import ScreenTrack from 'discourse/lib/screen-track';
import { queryParams } from 'discourse/controllers/discovery-sortable';
// A helper to build a topic route for a filter
@@ -69,7 +68,7 @@ export default function(filter, extras) {
model(data, transition) {
// attempt to stop early cause we need this to be called before .sync
- ScreenTrack.current().stop();
+ this.screenTrack.stop();
const findOpts = filterQueryParams(data),
findExtras = { cached: this.isPoppedState(transition) };
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index a4a6fa58c..6e17a41b5 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,4 +1,3 @@
-import ScreenTrack from 'discourse/lib/screen-track';
import DiscourseURL from 'discourse/lib/url';
let isTransitioning = false,
@@ -186,7 +185,7 @@ const TopicRoute = Discourse.Route.extend({
topicController.set('multiSelect', false);
topicController.unsubscribe();
this.controllerFor('composer').set('topic', null);
- ScreenTrack.current().stop();
+ this.screenTrack.stop();
const headerController = this.controllerFor('header');
if (headerController) {
@@ -215,8 +214,9 @@ const TopicRoute = Discourse.Route.extend({
controller.subscribe();
this.controllerFor('topic-progress').set('model', model);
+
// We reset screen tracking every time a topic is entered
- ScreenTrack.current().start(model.get('id'), controller);
+ this.screenTrack.start(model.get('id'), controller);
}
});
diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
deleted file mode 100644
index eb2d2dd5f..000000000
--- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-{{fa-icon 'envelope'}} {{i18n 'private_message_info.title'}}
-
- {{#each details.allowed_groups as |ag|}}
-
- {{fa-icon 'users'}} {{#link-to "group.index" ag.name}}{{unbound ag.name}}{{/link-to}}
-
- {{/each}}
- {{#each details.allowed_users as |au|}}
-
- {{#user-link user=au}}
- {{avatar au imageSize="small"}}
- {{unbound au.username}}
- {{/user-link}}
- {{#if details.can_remove_allowed_users}}
-
{{fa-icon "times"}}
- {{/if}}
-
- {{/each}}
-
-
-
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs
index 091f0e07d..821ed4ff9 100644
--- a/app/assets/javascripts/discourse/templates/components/small-action.hbs
+++ b/app/assets/javascripts/discourse/templates/components/small-action.hbs
@@ -1,4 +1,3 @@
-{{fa-icon icon}}
{{#if post}}
{{#if post.can_delete}}
@@ -11,8 +10,4 @@
{{avatar post imageSize="small"}}
{{/if}}
-
{{description}}
- {{#if post.cooked}}
-
{{{post.cooked}}}
- {{/if}}
{{{i18n 'summary.enabled_description'}}}
-
-{{else}}
- {{#if topic.estimatedReadingTime}}
-
{{{i18n 'summary.description_time' count=topic.posts_count readingTime=topic.estimatedReadingTime}}}
- {{else}}
-
{{{i18n 'summary.description' count=topic.posts_count}}}
- {{/if}}
-
-
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs b/app/assets/javascripts/discourse/templates/components/topic-participant.hbs
deleted file mode 100644
index 0389b002f..000000000
--- a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-
- {{#if showPostCount}}
- {{unbound participant.post_count}}
- {{/if}}
- {{avatar participant imageSize="medium"}}
-
diff --git a/app/assets/javascripts/discourse/templates/embedded-post.hbs b/app/assets/javascripts/discourse/templates/embedded-post.hbs
deleted file mode 100644
index 03bfc30a2..000000000
--- a/app/assets/javascripts/discourse/templates/embedded-post.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
-
-
-
-
- {{{unbound cooked}}}
-
-
-
diff --git a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
deleted file mode 100644
index d8c949d9b..000000000
--- a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/assets/javascripts/discourse/templates/post-small-action.hbs b/app/assets/javascripts/discourse/templates/post-small-action.hbs
deleted file mode 100644
index 42c11c524..000000000
--- a/app/assets/javascripts/discourse/templates/post-small-action.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{post-gap post=this postStream=controller.model.postStream before="true"}}
-
-{{small-action actionCode=action_code
- post=this
- daysAgo=view.daysAgo
- editPost="editPost"
- deletePost="deletePost"}}
-
-{{post-gap post=this postStream=controller.model.postStream before="false"}}
diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs
deleted file mode 100644
index 1606d6d6f..000000000
--- a/app/assets/javascripts/discourse/templates/post.hbs
+++ /dev/null
@@ -1,141 +0,0 @@
-{{post-gap post=this postStream=controller.model.postStream before="true"}}
-
-{{#if hasTimeGap}}
- {{time-gap daysAgo=daysSincePrevious postStream=controller.model.postStream}}
-{{/if}}
-
-
- {{view 'reply-history' content=replyHistory}}
-
-
-
-
-
-
- {{#if userDeleted}}
-
- {{else}}
- {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
- {{/if}}
-
- {{plugin-outlet "poster-avatar-bottom"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{who-liked users=view.likedUsers}}
- {{#if replies}}
-
- {{#each reply in replies}}
- {{view 'embedded-post' content=reply}}
- {{/each}}
-
- {{/if}}
-
- {{actions-summary post=this}}
- {{view 'topic-map-container' post=this topic=controller.model}}
-
-
- {{post-gutter post=this
- links=internalLinks
- canReplyAsNewTopic=topic.details.can_reply_as_new_topic
- newTopicAction="replyAsNewTopic"}}
-
-
-{{post-gap post=this postStream=controller.model.postStream before="false"}}
-{{plugin-outlet "post-bottom"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 93358cf1b..d6083d0f3 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -69,15 +69,39 @@
{{conditional-loading-spinner condition=model.postStream.loadingAbove}}
{{#unless model.postStream.loadingFilter}}
- {{cloaked-collection itemViewClass="post"
- defaultHeight="200"
- content=postsToRender
- slackRatio="15"
- loadingHTML=""
- preservesContext="true"
- uncloakDefault="true"
- offsetFixedTop="header"
- offsetFixedBottom="#reply-control"}}
+ {{scrolling-post-stream
+ posts=postsToRender
+ canCreatePost=model.details.can_create_post
+ multiSelect=multiSelect
+ selectedPostsCount=selectedPostsCount
+ selectedQuery=selectedQuery
+ gaps=model.postStream.gaps
+ showFlags="showFlags"
+ editPost="editPost"
+ showHistory="showHistory"
+ showRawEmail="showRawEmail"
+ deletePost="deletePost"
+ recoverPost="recoverPost"
+ expandHidden="expandHidden"
+ newTopicAction="replyAsNewTopic"
+ expandFirstPost="expandFirstPost"
+ toggleBookmark="toggleBookmark"
+ togglePostType="togglePostType"
+ rebakePost="rebakePost"
+ changePostOwner="changePostOwner"
+ unhidePost="unhidePost"
+ replyToPost="replyToPost"
+ toggleWiki="toggleWiki"
+ toggleParticipant="toggleParticipant"
+ toggleSummary="toggleSummary"
+ removeAllowedUser="removeAllowedUser"
+ showInvite="showInvite"
+ topVisibleChanged="topVisibleChanged"
+ bottomVisibleChanged="bottomVisibleChanged"
+ selectPost="toggledSelectedPost"
+ selectReplies="toggledSelectedPostReplies"
+ fillGapBefore="fillGapBefore"
+ fillGapAfter="fillGapAfter"}}
{{/unless}}