discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ES6: Half a dozen more controllers converted"

Browse Source 
This reverts commit bc2d87e5c1b35bd49e62db944d00cf960b16abd9.
This commit is contained in:
Robin Ward 2014-05-05 13:58:40 -04:00
parent b17cd2f251
commit 389c50eb1e
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 → app/assets/javascripts/discourse/controllers/bulk_notification_level_controller.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
export default Em.Controller.extend({ Discourse.BulkNotificationLevelController = Em.Controller.extend({
needs: ['topicBulkActions'], needs: ['topicBulkActions'],
notificationLevelId: null, notificationLevelId: null,

2
app/assets/javascripts/discourse/controllers/change-owner.js.es6 → app/assets/javascripts/discourse/controllers/change_owner_controller.js
View File

@ -7,7 +7,7 @@
@uses Discourse.ModalFunctionality @uses Discourse.ModalFunctionality
@module Discourse @module Discourse
**/ **/
export default Discourse.ObjectController.extend(Discourse.SelectedPostsCount, Discourse.ModalFunctionality, { Discourse.ChangeOwnerController = Discourse.ObjectController.extend(Discourse.SelectedPostsCount, Discourse.ModalFunctionality, {
needs: ['topic'], needs: ['topic'],
topicController: Em.computed.alias('controllers.topic'), topicController: Em.computed.alias('controllers.topic'),

2
app/assets/javascripts/discourse/controllers/composer.js.es6 → app/assets/javascripts/discourse/controllers/composer_controller.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
export default Discourse.Controller.extend({ Discourse.ComposerController = Discourse.Controller.extend({
needs: ['modal', 'topic', 'composerMessages'], needs: ['modal', 'topic', 'composerMessages'],
replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY), replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY),

4
app/assets/javascripts/discourse/controllers/composer-messages.js.es6 → app/assets/javascripts/discourse/controllers/composer_messages_controller.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
export default Ember.ArrayController.extend({ Discourse.ComposerMessagesController = Ember.ArrayController.extend({
needs: ['composer'], needs: ['composer'],
// Whether we've checked our messages // Whether we've checked our messages
@ -98,4 +98,4 @@ export default Ember.ArrayController.extend({
}); });
} }
}); });

2
app/assets/javascripts/discourse/controllers/create-account.js.es6 → app/assets/javascripts/discourse/controllers/create_account_controller.js
View File

@ -7,7 +7,7 @@
@uses Discourse.ModalFunctionality @uses Discourse.ModalFunctionality
@module Discourse @module Discourse
**/ **/
export default Discourse.Controller.extend(Discourse.ModalFunctionality, { Discourse.CreateAccountController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
uniqueUsernameValidation: null, uniqueUsernameValidation: null,
globalNicknameExists: false, globalNicknameExists: false,
complete: false, complete: false,

2
app/assets/javascripts/discourse/lib/url.js
View File

@ -52,8 +52,6 @@ Discourse.URL = Em.Object.createWithMixins({
**/ **/
routeTo: function(path) { routeTo: function(path) {
if (Em.isEmpty(path)) { return; }
if(Discourse.get("requiresRefresh")){ if(Discourse.get("requiresRefresh")){
document.location.href = path; document.location.href = path;
return; return;

6
test/javascripts/controllers/create_account_controller_test.js
View File

@ -1,8 +1,8 @@
module("controller:create-account"); module("Discourse.CreateAccountController");
test('basicUsernameValidation', function() { test('basicUsernameValidation', function() {
var testInvalidUsername = function(username, expectedReason) { var testInvalidUsername = function(username, expectedReason) {
var controller = controllerFor('create-account'); var controller = testController(Discourse.CreateAccountController, null);
controller.set('accountUsername', username); controller.set('accountUsername', username);
equal(controller.get('basicUsernameValidation.failed'), true, 'username should be invalid: ' + username); equal(controller.get('basicUsernameValidation.failed'), true, 'username should be invalid: ' + username);
equal(controller.get('basicUsernameValidation.reason'), expectedReason, 'username validation reason: ' + username + ', ' + expectedReason); equal(controller.get('basicUsernameValidation.reason'), expectedReason, 'username validation reason: ' + username + ', ' + expectedReason);
@ -12,7 +12,7 @@ test('basicUsernameValidation', function() {
testInvalidUsername('x', I18n.t('user.username.too_short')); testInvalidUsername('x', I18n.t('user.username.too_short'));
testInvalidUsername('1234567890123456', I18n.t('user.username.too_long')); testInvalidUsername('1234567890123456', I18n.t('user.username.too_long'));
var controller = controllerFor('create-account'); var controller = testController(Discourse.CreateAccountController, null);
controller.set('accountUsername', 'porkchops'); controller.set('accountUsername', 'porkchops');
controller.set('prefilledUsername', 'porkchops'); controller.set('prefilledUsername', 'porkchops');
equal(controller.get('basicUsernameValidation.ok'), true, 'Prefilled username is valid'); equal(controller.get('basicUsernameValidation.ok'), true, 'Prefilled username is valid');