diff --git a/app/assets/javascripts/discourse/templates/topic_map/best_of_toggle.js.handlebars b/app/assets/javascripts/discourse/templates/topic_map/best_of_toggle.js.handlebars
deleted file mode 100644
index 1d6937810..000000000
--- a/app/assets/javascripts/discourse/templates/topic_map/best_of_toggle.js.handlebars
+++ /dev/null
@@ -1,8 +0,0 @@
-
{{i18n best_of.title}}
-{{#if postStream.bestOf}}
-
{{{i18n best_of.enabled_description}}}
-
-{{else}}
-
{{{i18n best_of.description count="posts_count"}}}
-
-{{/if}}
diff --git a/app/assets/javascripts/discourse/views/actions_history_view.js b/app/assets/javascripts/discourse/views/actions_history_view.js
index 6bf5ec8c2..5e3053478 100644
--- a/app/assets/javascripts/discourse/views/actions_history_view.js
+++ b/app/assets/javascripts/discourse/views/actions_history_view.js
@@ -2,24 +2,24 @@
This view handles rendering of what actions have been taken on a post. It uses
buffer rendering for performance rather than a template.
- @class ActionsHistoryView
+ @class ActionsHistoryComponent
@extends Discourse.View
@namespace Discourse
@module Discourse
**/
-Discourse.ActionsHistoryView = Discourse.View.extend({
+Discourse.ActionsHistoryComponent = Em.Component.extend({
tagName: 'section',
classNameBindings: [':post-actions', 'hidden'],
- content: Em.computed.alias('post.actionsHistory'),
- noContent: Em.computed.empty('content'),
- hidden: Em.computed.and('noContent', 'post.notDeleted'),
- shouldRerender: Discourse.View.renderIfChanged('content.@each', 'content.users.length', 'post.deleted'),
+ actionsHistory: Em.computed.alias('post.actionsHistory'),
+ emptyHistory: Em.computed.empty('actionsHistory'),
+ hidden: Em.computed.and('emptyHistory', 'post.notDeleted'),
+ shouldRerender: Discourse.View.renderIfChanged('actionsHistory.@each', 'actionsHistory.users.length', 'post.deleted'),
// This was creating way too many bound ifs and subviews in the handlebars version.
render: function(buffer) {
- if (this.present('content')) {
- this.get('content').forEach(function(c) {
+ if (!this.get('emptyHistory')) {
+ this.get('actionsHistory').forEach(function(c) {
buffer.push("
");
var renderActionIf = function(property, dataAttribute, text) {
@@ -69,7 +69,7 @@ Discourse.ActionsHistoryView = Discourse.View.extend({
},
actionTypeById: function(actionTypeId) {
- return this.get('content').findProperty('id', actionTypeId);
+ return this.get('actionsHistory').findProperty('id', actionTypeId);
},
click: function(e) {
@@ -77,23 +77,23 @@ Discourse.ActionsHistoryView = Discourse.View.extend({
actionTypeId;
if (actionTypeId = $target.data('clear-flags')) {
- this.get('controller').clearFlags(this.actionTypeById(actionTypeId));
+ this.actionTypeById(actionTypeId).clearFlags();
return false;
}
// User wants to know who actioned it
if (actionTypeId = $target.data('who-acted')) {
- this.get('controller').whoActed(this.actionTypeById(actionTypeId));
+ this.actionTypeById(actionTypeId).loadUsers();
return false;
}
if (actionTypeId = $target.data('act')) {
- this.get('content').findProperty('id', actionTypeId).act();
+ this.get('actionsHistory').findProperty('id', actionTypeId).act();
return false;
}
if (actionTypeId = $target.data('undo')) {
- this.get('content').findProperty('id', actionTypeId).undo();
+ this.get('actionsHistory').findProperty('id', actionTypeId).undo();
return false;
}
@@ -102,3 +102,4 @@ Discourse.ActionsHistoryView = Discourse.View.extend({
});
+Discourse.View.registerHelper('discourse-action-history', Discourse.ActionsHistoryComponent);
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/views/topic_map/topic_map_view.js b/app/assets/javascripts/discourse/views/topic_map/topic_map_view.js
index fa457427b..815e28951 100644
--- a/app/assets/javascripts/discourse/views/topic_map/topic_map_view.js
+++ b/app/assets/javascripts/discourse/views/topic_map/topic_map_view.js
@@ -1,20 +1,21 @@
/**
- This view handles rendering of the summary of the topic under the first post
+ This view handles rendering of the map of the topic under the first post
@class TopicMapView
@extends Discourse.View
@namespace Discourse
@module Discourse
**/
-Discourse.TopicMapView = Discourse.ContainerView.extend({
- classNameBindings: ['hidden', ':topic-summary'],
- allLinksShown: false,
- topic: Em.computed.alias('controller.model'),
+var LINKS_SHOWN = 5;
+
+Discourse.TopicMapView = Discourse.ContainerView.extend({
+ classNameBindings: ['hidden', ':topic-map'],
+ allLinksShown: false,
showAllLinksControls: function() {
if (this.get('allLinksShown')) return false;
- if ((this.get('topic.details.links.length') || 0) <= Discourse.TopicMapView.LINKS_SHOWN) return false;
+ if ((this.get('topic.details.links.length') || 0) <= LINKS_SHOWN) return false;
return true;
}.property('allLinksShown', 'topic.details.links'),
@@ -23,16 +24,18 @@ Discourse.TopicMapView = Discourse.ContainerView.extend({
var allLinks = this.get('topic.details.links');
if (this.get('allLinksShown')) return allLinks;
- return allLinks.slice(0, Discourse.TopicMapView.LINKS_SHOWN);
+ return allLinks.slice(0, LINKS_SHOWN);
}.property('topic.details.links', 'allLinksShown'),
shouldRerender: Discourse.View.renderIfChanged('topic.posts_count'),
hidden: function() {
if (!this.get('post.firstPost')) return true;
- if (this.get('controller.content.archetype') === 'private_message') return false;
- if (this.get('controller.content.archetype') !== 'regular') return true;
- return this.get('controller.content.posts_count') < 2;
+
+ var topic = this.get('topic');
+ if (topic.get('archetype') === 'private_message') return false;
+ if (topic.get('archetype') !== 'regular') return true;
+ return topic.get('posts_count') < 2;
}.property(),
init: function() {
@@ -44,23 +47,22 @@ Discourse.TopicMapView = Discourse.ContainerView.extend({
content: this.get('controller')
}, Discourse.GroupedView);
- this.trigger('appendSummaryInformation', this);
+ this.trigger('appendMapInformation', this);
},
- showAllLinks: function() {
- this.set('allLinksShown', true);
+ actions: {
+ showAllLinks: function() {
+ this.set('allLinksShown', true);
+ },
},
- appendSummaryInformation: function(container) {
+ appendMapInformation: function(container) {
- // If we have a best of view
- if (this.get('controller.has_best_of')) {
- container.attachViewWithArgs({
- templateName: 'topic_map/best_of_toggle',
- tagName: 'section',
- classNames: ['information'],
- content: this.get('controller')
- }, Discourse.GroupedView);
+ var topic = this.get('topic');
+
+ // If we have a best of capability
+ if (topic.get('has_best_of')) {
+ container.attachViewWithArgs({ topic: topic }, Discourse.DiscourseToggleBestOfComponent);
}
// If we have a private message
@@ -75,6 +77,3 @@ Discourse.TopicMapView = Discourse.ContainerView.extend({
}
});
-Discourse.TopicMapView.reopenClass({
- LINKS_SHOWN: 5
-});
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index cc15c5e59..42ce66089 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -211,7 +211,7 @@ a.star {
text-shadow: none !important;
}
-.topic-summary {
+.topic-map {
margin: 20px 0 0 0;
border: 1px solid #ddd;
@@ -602,7 +602,7 @@ blockquote { /* solo quotes */
blockquote {margin-top: 0; padding-top: 0;
.onebox-result {background-color: #ddd;}
-
+
}
.title {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 84c7e65b0..cfc6b71b3 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -126,7 +126,7 @@ a.star {
text-shadow: none !important;
}
-.topic-summary {
+.topic-map {
.btn {
border-radius: 0 4px 0 4px;