Migration topic footer buttons to components
This commit is contained in:
Robin Ward
parent
753a65833a
commit
0f1ed1e41a
|
|
@ -1,31 +1,7 @@
|
|||
(function() {
|
||||
var Discourse = require('discourse').default;
|
||||
|
||||
function deprecate(module, methods) {
|
||||
var result = {};
|
||||
|
||||
methods.forEach(function(m) {
|
||||
result[m] = function() {
|
||||
Ember.warn("Discourse." + module + "." + m + " is deprecated. Export a setup() function instead");
|
||||
};
|
||||
});
|
||||
|
||||
Discourse[module] = result;
|
||||
}
|
||||
|
||||
deprecate('Markdown', ['whiteListTag', 'whiteListIframe']);
|
||||
deprecate('Dialect', ['inlineRegexp', 'inlineBetween', 'addPreProcessor', 'replaceBlock',
|
||||
'inlineReplace', 'registerInline', 'registerEmoji']);
|
||||
|
||||
deprecate('BBCode', ['replaceBBCode', 'register', 'rawBBCode', 'replaceBBCodeParamsRaw']);
|
||||
|
||||
Discourse.dialect_deprecated = true;
|
||||
|
||||
Discourse.ajax = function() {
|
||||
var ajax = require('discourse/lib/ajax').ajax;
|
||||
Ember.warn("Discourse.ajax is deprecated. Import the module and use it instead");
|
||||
return ajax.apply(this, arguments);
|
||||
};
|
||||
|
||||
window.Discourse = Discourse;
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -135,15 +135,6 @@ const Discourse = Ember.Application.extend({
|
|||
}
|
||||
});
|
||||
});
|
||||
|
||||
const utils = require('discourse/lib/utilities');
|
||||
Discourse.Utilities = {};
|
||||
Object.keys(utils).forEach(function(k) {
|
||||
Discourse.Utilities[k] = function() {
|
||||
Ember.warn('Discourse.Utilities is deprecated. Import it as a module');
|
||||
return utils[k].apply(utils, arguments);
|
||||
};
|
||||
});
|
||||
},
|
||||
|
||||
@computed('currentAssetVersion', 'desiredAssetVersion')
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
import { default as computed } from 'ember-addons/ember-computed-decorators';
|
||||
|
||||
export default Ember.Component.extend({
|
||||
// subclasses need this
|
||||
layoutName: 'components/d-button',
|
||||
|
||||
tagName: 'button',
|
||||
classNameBindings: [':btn', 'noText'],
|
||||
attributeBindings: ['disabled', 'translatedTitle:title'],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
import Button from 'discourse/components/d-button';
|
||||
|
||||
export default Button.extend({
|
||||
label: 'topic.reply.title',
|
||||
icon: 'reply',
|
||||
action: 'showLogin'
|
||||
});
|
||||
|
|
@ -1,23 +1,52 @@
|
|||
import ContainerView from 'discourse/views/container';
|
||||
import computed from 'ember-addons/ember-computed-decorators';
|
||||
|
||||
export default ContainerView.extend({
|
||||
export default Ember.Component.extend({
|
||||
elementId: 'topic-footer-buttons',
|
||||
|
||||
// Allow us to extend it
|
||||
layoutName: 'components/topic-footer-buttons',
|
||||
|
||||
init() {
|
||||
this._super();
|
||||
|
||||
if (this.currentUser) {
|
||||
const viewArgs = this.getProperties('topic', 'topicDelegated');
|
||||
viewArgs.currentUser = this.currentUser;
|
||||
this._actions = this._actions || {};
|
||||
|
||||
this.attachViewWithArgs(viewArgs, 'topic-footer-main-buttons');
|
||||
this.attachViewWithArgs(viewArgs, 'pinned-button');
|
||||
this.attachViewWithArgs(viewArgs, 'topic-notifications-button');
|
||||
(this.get('topicDelegated') || []).forEach(m => {
|
||||
this._actions[m] = function() {
|
||||
this.sendAction(m);
|
||||
};
|
||||
this.set(m, m);
|
||||
});
|
||||
},
|
||||
|
||||
@computed('topic.details.can_invite_to')
|
||||
canInviteTo(result) {
|
||||
return !this.site.mobileView && result;
|
||||
},
|
||||
|
||||
inviteDisabled: Ember.computed.or('topic.archived', 'topic.closed', 'topic.deleted'),
|
||||
|
||||
@computed
|
||||
showAdminButton() {
|
||||
return !this.site.mobileView && this.currentUser.get('canManageTopic');
|
||||
},
|
||||
|
||||
@computed('topic.message_archived')
|
||||
archiveIcon: archived => archived ? '' : 'folder',
|
||||
|
||||
@computed('topic.message_archived')
|
||||
archiveTitle: archived => archived ? 'topic.move_to_inbox.help' : 'topic.archive_message.help',
|
||||
|
||||
@computed('topic.message_archived')
|
||||
archiveLabel: archived => archived ? "topic.move_to_inbox.title" : "topic.archive_message.title",
|
||||
|
||||
@computed('topic.bookmarked')
|
||||
bookmarkClass: bookmarked => bookmarked ? 'bookmark bookmarked' : 'bookmark',
|
||||
|
||||
@computed('topic.bookmarked')
|
||||
bookmarkLabel: bookmarked => bookmarked ? 'bookmarked.clear_bookmarks' : 'bookmarked.title',
|
||||
|
||||
@computed('topic.bookmarked')
|
||||
bookmarkTitle: bookmarked => bookmarked ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark",
|
||||
|
||||
this.trigger('additionalButtons', this);
|
||||
} else {
|
||||
// If not logged in give them a login control
|
||||
this.attachViewClass('login-reply-button');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ export default Combobox.extend({
|
|||
refresh();
|
||||
break;
|
||||
case 'flag':
|
||||
controller.send('showFlagTopic', topic);
|
||||
controller.send('showFlagTopic');
|
||||
refresh();
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
|
|||
'jumpToPost',
|
||||
'jumpToIndex',
|
||||
'jumpBottom',
|
||||
'replyToPost'
|
||||
'replyToPost',
|
||||
'toggleArchiveMessage',
|
||||
'showInvite',
|
||||
'toggleBookmark',
|
||||
'showFlagTopic'
|
||||
],
|
||||
|
||||
_titleChanged: function() {
|
||||
|
|
@ -269,18 +273,20 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
|
|||
this.deleteTopic();
|
||||
},
|
||||
|
||||
archiveMessage() {
|
||||
// Archive a PM (as opposed to archiving a topic)
|
||||
toggleArchiveMessage() {
|
||||
const topic = this.get('model');
|
||||
topic.archiveMessage().then(()=>{
|
||||
this.gotoInbox(topic.get("inboxGroupName"));
|
||||
});
|
||||
},
|
||||
if (topic.get('archiving')) { return; }
|
||||
|
||||
moveToInbox() {
|
||||
const topic = this.get('model');
|
||||
topic.moveToInbox().then(()=>{
|
||||
this.gotoInbox(topic.get("inboxGroupName"));
|
||||
});
|
||||
if (topic.get('message_archived')) {
|
||||
topic.moveToInbox().then(()=>{
|
||||
this.gotoInbox(topic.get("inboxGroupName"));
|
||||
});
|
||||
} else {
|
||||
topic.archiveMessage().then(()=>{
|
||||
this.gotoInbox(topic.get("inboxGroupName"));
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
// Post related methods
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ 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';
|
||||
import TopicFooterButtons from 'discourse/components/topic-footer-buttons';
|
||||
|
||||
function inject() {
|
||||
const app = arguments[0],
|
||||
|
|
@ -73,13 +72,6 @@ export default {
|
|||
app.register('key-value-store:main', keyValueStore, { instantiate: false });
|
||||
injectAll(app, 'keyValueStore');
|
||||
|
||||
Discourse.TopicFooterButtonsView = {
|
||||
reopen(obj) {
|
||||
Ember.warn('`Discourse.TopicFooterButtonsView` is deprecated. Use the `topic-footer-buttons` component instead');
|
||||
TopicFooterButtons.reopen(obj);
|
||||
}
|
||||
};
|
||||
|
||||
startTracking(topicTrackingState);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ const TopicRoute = Discourse.Route.extend({
|
|||
this.controllerFor('flag').setProperties({ selected: null, flagTopic: false });
|
||||
},
|
||||
|
||||
showFlagTopic(model) {
|
||||
showFlagTopic() {
|
||||
const model = this.modelFor('topic');
|
||||
showModal('flag', { model });
|
||||
this.controllerFor('flag').setProperties({ selected: null, flagTopic: true });
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
{{fa-icon icon}}
|
||||
{{#if icon}}
|
||||
{{fa-icon icon}}
|
||||
{{/if}}
|
||||
|
||||
{{{translatedLabel}}}
|
||||
{{yield}}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
{{#if showAdminButton}}
|
||||
{{topic-admin-menu-button topic=topic delegated=topicDelegated openUpwards="true"}}
|
||||
{{/if}}
|
||||
|
||||
{{#unless topic.isPrivateMessage}}
|
||||
{{#if site.mobileView}}
|
||||
{{topic-footer-mobile-dropdown topic=topic}}
|
||||
{{else}}
|
||||
{{d-button class=bookmarkClass
|
||||
title=bookmarkTitle
|
||||
label=bookmarkLabel
|
||||
icon="bookmark"
|
||||
action="toggleBookmark"}}
|
||||
|
||||
<button class="btn share" data-share-url={{topic.shareUrl}} title={{i18n "topic.share.help"}}>
|
||||
{{fa-icon "link"}}
|
||||
{{i18n "topic.share.title"}}
|
||||
</button>
|
||||
|
||||
{{#if topic.details.can_flag_topic}}
|
||||
{{d-button class="flag-topic"
|
||||
title="topic.flag_topic.help"
|
||||
label="topic.flag_topic.title"
|
||||
icon="flag"
|
||||
action="showFlagTopic"}}
|
||||
{{/if}}
|
||||
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
|
||||
{{#if canInviteTo}}
|
||||
{{d-button class="invite-topic"
|
||||
title="topic.invite_reply.help"
|
||||
label="topic.invite_reply.title"
|
||||
icon="users"
|
||||
action="showInvite"
|
||||
disabled=inviteDisabled}}
|
||||
{{/if}}
|
||||
|
||||
{{#if topic.isPrivateMessage}}
|
||||
{{d-button class="standard"
|
||||
title=archiveTitle
|
||||
label=archiveLabel
|
||||
icon=archiveIcon
|
||||
action="toggleArchiveMessage"}}
|
||||
{{/if}}
|
||||
|
||||
{{#if topic.details.can_create_post}}
|
||||
{{d-button class="btn-primary create"
|
||||
icon="reply"
|
||||
action="replyToPost"
|
||||
label="topic.reply.title"
|
||||
title="topic.reply.help"}}
|
||||
{{/if}}
|
||||
|
||||
{{plugin-outlet "after-topic-footer-main-buttons" tagName="span"}}
|
||||
|
||||
{{pinned-button topic=topic topicDelegated=topicDelegated}}
|
||||
{{topic-notifications-button topic=topic topicDelegated=topicDelegated}}
|
||||
{{plugin-outlet "after-topic-footer-buttons" tagName="span"}}
|
||||
|
|
@ -147,7 +147,11 @@
|
|||
{{! replace "Log In to Reply" with the infobox }}
|
||||
{{signup-cta}}
|
||||
{{else}}
|
||||
{{topic-footer-buttons topic=model topicDelegated=topicDelegated}}
|
||||
{{#if currentUser}}
|
||||
{{topic-footer-buttons topic=model topicDelegated=topicDelegated}}
|
||||
{{else}}
|
||||
{{d-button icon="reply" class="btn-primary" action="showLogin" label="topic.reply.title"}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{#if model.pending_posts_count}}
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
import { bufferedRender } from 'discourse-common/lib/buffered-render';
|
||||
|
||||
export default Ember.View.extend(bufferedRender({
|
||||
tagName: 'button',
|
||||
classNames: ['btn', 'standard'],
|
||||
attributeBindings: ['title'],
|
||||
archived: Em.computed.alias('controller.model.message_archived'),
|
||||
archiving: Em.computed.alias('controller.model.archiving'),
|
||||
rerenderTriggers: ['archived', 'archiving'],
|
||||
|
||||
title: function() {
|
||||
const key = this.get('archived') ? 'topic.move_to_inbox.help' : 'topic.archive_message.help';
|
||||
return I18n.t(key);
|
||||
}.property('archived'),
|
||||
|
||||
buildBuffer(buffer) {
|
||||
if (this.get('archived')){
|
||||
buffer.push(I18n.t('topic.move_to_inbox.title'));
|
||||
} else {
|
||||
buffer.push("<i class='fa fa-folder'></i>");
|
||||
buffer.push(I18n.t('topic.archive_message.title'));
|
||||
}
|
||||
},
|
||||
|
||||
click() {
|
||||
if (!this.get('archiving')) {
|
||||
if (this.get('archived')) {
|
||||
this.get('controller').send('moveToInbox');
|
||||
} else {
|
||||
this.get('controller').send('archiveMessage');
|
||||
}
|
||||
}
|
||||
}
|
||||
}));
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
import ButtonView from 'discourse/views/button';
|
||||
import { iconHTML } from 'discourse-common/helpers/fa-icon';
|
||||
|
||||
export default ButtonView.extend({
|
||||
classNames: ['bookmark'],
|
||||
attributeBindings: ['disabled'],
|
||||
|
||||
bookmarked: Ember.computed.alias('controller.model.bookmarked'),
|
||||
|
||||
textKey: function() {
|
||||
return this.get('bookmarked') ? 'bookmarked.clear_bookmarks' : 'bookmarked.title';
|
||||
}.property('bookmarked'),
|
||||
|
||||
rerenderTriggers: ['bookmarked'],
|
||||
|
||||
helpKey: function() {
|
||||
return this.get("bookmarked") ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark";
|
||||
}.property("bookmarked"),
|
||||
|
||||
click() {
|
||||
this.get('controller').send('toggleBookmark');
|
||||
},
|
||||
|
||||
renderIcon(buffer) {
|
||||
const className = this.get("bookmarked") ? "bookmarked" : "";
|
||||
buffer.push(iconHTML('bookmark', { class: className }));
|
||||
}
|
||||
});
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
import ButtonView from 'discourse/views/button';
|
||||
import { iconHTML } from 'discourse-common/helpers/fa-icon';
|
||||
|
||||
export default ButtonView.extend({
|
||||
classNames: ['flag-topic'],
|
||||
textKey: 'topic.flag_topic.title',
|
||||
helpKey: 'topic.flag_topic.help',
|
||||
|
||||
click() {
|
||||
this.get('controller').send('showFlagTopic', this.get('controller.content'));
|
||||
},
|
||||
|
||||
renderIcon(buffer) {
|
||||
buffer.push(iconHTML('flag'));
|
||||
}
|
||||
});
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
import ButtonView from 'discourse/views/button';
|
||||
import { iconHTML } from 'discourse-common/helpers/fa-icon';
|
||||
|
||||
export default ButtonView.extend({
|
||||
classNames: ['invite-topic'],
|
||||
textKey: 'topic.invite_reply.title',
|
||||
helpKey: 'topic.invite_reply.help',
|
||||
attributeBindings: ['disabled'],
|
||||
disabled: Em.computed.or('controller.model.archived', 'controller.model.closed', 'controller.model.deleted'),
|
||||
|
||||
renderIcon(buffer) {
|
||||
buffer.push(iconHTML('users'));
|
||||
},
|
||||
|
||||
click() {
|
||||
this.get('controller').send('showInvite');
|
||||
}
|
||||
});
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
import ButtonView from 'discourse/views/button';
|
||||
|
||||
export default ButtonView.extend({
|
||||
textKey: 'topic.reply.title',
|
||||
classNames: ['btn', 'btn-primary', 'create'],
|
||||
click: function() {
|
||||
this.get('controller').send('showLogin');
|
||||
},
|
||||
renderIcon: function(buffer) {
|
||||
buffer.push("<i class='fa fa-reply'></i>");
|
||||
}
|
||||
});
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
import ButtonView from 'discourse/views/button';
|
||||
|
||||
export default ButtonView.extend({
|
||||
classNames: ['btn', 'btn-primary', 'create'],
|
||||
helpKey: 'topic.reply.help',
|
||||
|
||||
text: function() {
|
||||
var archetypeCapitalized = this.get('controller.content.archetype').capitalize();
|
||||
var customTitle = this.get("parentView.replyButtonText" + archetypeCapitalized);
|
||||
if (customTitle) { return customTitle; }
|
||||
|
||||
return I18n.t("topic.reply.title");
|
||||
}.property(),
|
||||
|
||||
renderIcon: function(buffer) {
|
||||
buffer.push("<i class='fa fa-reply'></i>");
|
||||
},
|
||||
|
||||
click: function() {
|
||||
this.get('controller').send('replyToPost');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
import ButtonView from 'discourse/views/button';
|
||||
import { iconHTML } from 'discourse-common/helpers/fa-icon';
|
||||
|
||||
export default ButtonView.extend({
|
||||
classNames: ['share'],
|
||||
textKey: 'topic.share.title',
|
||||
helpKey: 'topic.share.help',
|
||||
'data-share-url': Em.computed.alias('topic.shareUrl'),
|
||||
topic: Em.computed.alias('controller.model'),
|
||||
|
||||
renderIcon(buffer) {
|
||||
buffer.push(iconHTML("link"));
|
||||
}
|
||||
});
|
||||
|
|
@ -1,45 +1,2 @@
|
|||
import ContainerView from 'discourse/views/container';
|
||||
import { on } from 'ember-addons/ember-computed-decorators';
|
||||
|
||||
export default ContainerView.extend({
|
||||
elementId: 'topic-footer-main-buttons',
|
||||
|
||||
@on('init')
|
||||
createButtons() {
|
||||
const mobileView = this.site.mobileView;
|
||||
|
||||
const topic = this.get('topic');
|
||||
|
||||
if (!mobileView && this.currentUser.get('canManageTopic')) {
|
||||
const viewArgs = { topic, delegated: this.get('topicDelegated'), openUpwards: true };
|
||||
this.attachViewWithArgs(viewArgs, 'topic-admin-menu-button');
|
||||
}
|
||||
|
||||
if (!topic.get('isPrivateMessage')) {
|
||||
if (mobileView) {
|
||||
this.attachViewWithArgs({ topic }, 'topic-footer-mobile-dropdown');
|
||||
} else {
|
||||
// We hide some controls from private messages
|
||||
this.attachViewClass('bookmark-button');
|
||||
this.attachViewClass('share-button');
|
||||
if (this.get('topic.details.can_flag_topic')) {
|
||||
this.attachViewClass('flag-topic-button');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!mobileView && this.get('topic.details.can_invite_to')) {
|
||||
this.attachViewClass('invite-reply-button');
|
||||
}
|
||||
|
||||
if (topic.get('isPrivateMessage')) {
|
||||
this.attachViewClass('archive-button');
|
||||
}
|
||||
|
||||
if (this.get('topic.details.can_create_post')) {
|
||||
this.attachViewClass('reply-button');
|
||||
}
|
||||
|
||||
this.trigger('additionalButtons', this);
|
||||
}
|
||||
});
|
||||
// In case plugins are using the old `additionalButtons` API, don't break
|
||||
export default Ember.View.extend();
|
||||
|
|
|
|||
|
|
@ -436,6 +436,11 @@ a.star {
|
|||
margin-right: 10px;
|
||||
.fa-bookmark.bookmarked { color: $tertiary; }
|
||||
}
|
||||
|
||||
.bookmark.bookmarked .fa-bookmark {
|
||||
color: $tertiary;
|
||||
}
|
||||
|
||||
.notification-options p {
|
||||
display: inline-block;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue