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

Remove duplicate mixing in of Discourse.Presence 

AdminEmailIndexController and AdminEmailPreviewDigestController explicitely mix in Discourse.Presence, but they extend base classes Discourse.Controller and Discourse.ObjectController that already mix in Discourse.Presence, so this explicit inclusion is redundant.
This commit is contained in:
Wojciech Zawistowski 2013-09-18 18:40:57 +02:00
parent aca567b4d7
commit 7da10c0149
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin_email_index_controller.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.AdminEmailIndexController = Discourse.Controller.extend(Discourse.Presence, { Discourse.AdminEmailIndexController = Discourse.Controller.extend({
/** /**
Is the "send test email" button disabled? Is the "send test email" button disabled?

2
app/assets/javascripts/admin/controllers/admin_email_preview_digest_controller.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.AdminEmailPreviewDigestController = Discourse.ObjectController.extend(Discourse.Presence, { Discourse.AdminEmailPreviewDigestController = Discourse.ObjectController.extend({
refresh: function() { refresh: function() {
var model = this.get('model'); var model = this.get('model');

5
test/javascripts/controllers/admin_email_index_controller_test.js Normal file
View File

@ -0,0 +1,5 @@
module("Discourse.AdminEmailIndexController");
test("mixes in Discourse.Presence", function() {
ok(Discourse.Presence.detect(Discourse.AdminEmailIndexController.create()));
});

5
test/javascripts/controllers/admin_email_preview_digest_controller_test.js Normal file
View File

@ -0,0 +1,5 @@
module("Discourse.AdminEmailPreviewDigestController");
test("mixes in Discourse.Presence", function() {
ok(Discourse.Presence.detect(Discourse.AdminEmailPreviewDigestController.create()));
});