Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Presence mixin was missing sometimes

This commit is contained in:
Régis Hanol 2015-05-12 10:49:05 +02:00
parent 0c85e40097
commit ab80240900
10 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
View File

@ -1,7 +1,6 @@
import Presence from 'discourse/mixins/presence';
import { outputExportResult } from 'discourse/lib/export-result';
export default Ember.ArrayController.extend(Presence, {
export default Ember.ArrayController.extend({
loading: false,
actions: {

3
app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
View File

@ -1,7 +1,6 @@
import Presence from 'discourse/mixins/presence';
import { outputExportResult } from 'discourse/lib/export-result';
export default Ember.ArrayController.extend(Presence, {
export default Ember.ArrayController.extend({
loading: false,
itemController: 'admin-log-screened-ip-address',
filter: null,

3
app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
View File

@ -1,7 +1,6 @@
import Presence from 'discourse/mixins/presence';
import { outputExportResult } from 'discourse/lib/export-result';
export default Ember.ArrayController.extend(Presence, {
export default Ember.ArrayController.extend({
loading: false,
show() {

3
app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
View File

@ -1,7 +1,6 @@
import Presence from 'discourse/mixins/presence';
import { outputExportResult } from 'discourse/lib/export-result';
export default Ember.ArrayController.extend(Presence, {
export default Ember.ArrayController.extend({
loading: false,
filters: null,

3
app/assets/javascripts/discourse/controllers/change-owner.js.es6
View File

@ -1,8 +1,9 @@
import Presence from 'discourse/mixins/presence';
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ObjectController from 'discourse/controllers/object';
// Modal related to changing the ownership of posts
export default ObjectController.extend(Discourse.SelectedPostsCount, ModalFunctionality, {
export default ObjectController.extend(Presence, Discourse.SelectedPostsCount, ModalFunctionality, {
needs: ['topic'],
topicController: Em.computed.alias('controllers.topic'),

4
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -1,4 +1,6 @@
export default Ember.ObjectController.extend({
import Presence from 'discourse/mixins/presence';
export default Ember.ObjectController.extend(Presence, {
needs: ['modal', 'topic', 'composer-messages', 'application'],
replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY),

3
app/assets/javascripts/discourse/controllers/invite.js.es6
View File

@ -1,7 +1,8 @@
import Presence from 'discourse/mixins/presence';
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ObjectController from 'discourse/controllers/object';
export default ObjectController.extend(ModalFunctionality, {
export default ObjectController.extend(Presence, ModalFunctionality, {
needs: ['user-invited'],
// If this isn't defined, it will proxy to the user model on the preferences

3
app/assets/javascripts/discourse/controllers/merge-topic.js.es6
View File

@ -1,8 +1,9 @@
import Presence from 'discourse/mixins/presence';
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ObjectController from 'discourse/controllers/object';
// Modal related to merging of topics
export default ObjectController.extend(Discourse.SelectedPostsCount, ModalFunctionality, {
export default ObjectController.extend(Discourse.SelectedPostsCount, ModalFunctionality, Presence, {
needs: ['topic'],
topicController: Em.computed.alias('controllers.topic'),

3
app/assets/javascripts/discourse/controllers/preferences/username.js.es6
View File

@ -1,6 +1,7 @@
import Presence from 'discourse/mixins/presence';
import ObjectController from 'discourse/controllers/object';
export default ObjectController.extend({
export default ObjectController.extend(Presence, {
taken: false,
saving: false,
error: false,

3
app/assets/javascripts/discourse/controllers/split-topic.js.es6
View File

@ -1,8 +1,9 @@
import Presence from 'discourse/mixins/presence';
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ObjectController from 'discourse/controllers/object';
// Modal related to auto closing of topics
export default ObjectController.extend(Discourse.SelectedPostsCount, ModalFunctionality, {
export default ObjectController.extend(Discourse.SelectedPostsCount, ModalFunctionality, Presence, {
needs: ['topic'],
topicController: Em.computed.alias('controllers.topic'),