From 194b04917a806b8a8f12aef2ad33b2207a61f027 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 19 Jun 2014 12:43:54 -0400 Subject: [PATCH] ES6: A few more views --- .../javascripts/discourse/controllers/composer.js.es6 | 10 +++++----- .../discourse/templates/composer.js.handlebars | 2 +- .../discourse/templates/topic.js.handlebars | 2 +- ...poser_messages_view.js => composer-messages.js.es6} | 2 +- .../discourse/views/{share_view.js => share.js.es6} | 2 +- .../{topic_closing_view.js => topic-closing.js.es6} | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename app/assets/javascripts/discourse/views/{composer/composer_messages_view.js => composer-messages.js.es6} (93%) rename app/assets/javascripts/discourse/views/{share_view.js => share.js.es6} (98%) rename app/assets/javascripts/discourse/views/{topic_closing_view.js => topic-closing.js.es6} (97%) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 07738722eb5..c39b58a55b3 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -7,7 +7,7 @@ @module Discourse **/ export default Discourse.Controller.extend({ - needs: ['modal', 'topic', 'composerMessages'], + needs: ['modal', 'topic', 'composer-messages'], replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY), checkedMessages: false, @@ -197,7 +197,7 @@ export default Discourse.Controller.extend({ if (this.present('model.reply')) { // Notify the composer messages controller that a reply has been typed. Some // messages only appear after typing. - this.get('controllers.composerMessages').typedReply(); + this.get('controllers.composer-messages').typedReply(); } }, @@ -219,7 +219,7 @@ export default Discourse.Controller.extend({ if (body.length < Discourse.SiteSettings.min_body_similar_length || title.length < Discourse.SiteSettings.min_title_similar_length) { return; } - var messageController = this.get('controllers.composerMessages'), + var messageController = this.get('controllers.composer-messages'), similarTopics = this.get('similarTopics'); Discourse.Topic.findSimilarTo(title, body).then(function (newTopics) { @@ -260,7 +260,7 @@ export default Discourse.Controller.extend({ throw "composer opened without a proper draft key"; } - var composerMessages = this.get('controllers.composerMessages'), + var composerMessages = this.get('controllers.composer-messages'), self = this, composerModel = this.get('model'); @@ -327,7 +327,7 @@ export default Discourse.Controller.extend({ this.set('model', composerModel); composerModel.set('composeState', Discourse.Composer.OPEN); - var composerMessages = this.get('controllers.composerMessages'); + var composerMessages = this.get('controllers.composer-messages'); composerMessages.queryFor(composerModel); }, diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars index ff6e7a0cdaa..7463c2eab51 100644 --- a/app/assets/javascripts/discourse/templates/composer.js.handlebars +++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars @@ -2,7 +2,7 @@
- {{render "composerMessages"}} + {{render "composer-messages"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars index d3c7c26dee2..83fe1c6cd76 100644 --- a/app/assets/javascripts/discourse/templates/topic.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars @@ -93,7 +93,7 @@ {{else}} {{#if postStream.loadedAllPosts}} - {{view Discourse.TopicClosingView topicBinding="model"}} + {{view 'topic-closing' topic=model}} {{view Discourse.TopicFooterButtonsView topicBinding="model"}} {{#if details.suggested_topics.length}} diff --git a/app/assets/javascripts/discourse/views/composer/composer_messages_view.js b/app/assets/javascripts/discourse/views/composer-messages.js.es6 similarity index 93% rename from app/assets/javascripts/discourse/views/composer/composer_messages_view.js rename to app/assets/javascripts/discourse/views/composer-messages.js.es6 index 02d037806ed..beac06757dd 100644 --- a/app/assets/javascripts/discourse/views/composer/composer_messages_view.js +++ b/app/assets/javascripts/discourse/views/composer-messages.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.ComposerMessagesView = Ember.CollectionView.extend({ +export default Ember.CollectionView.extend({ classNameBindings: [':composer-popup-container', 'hidden'], content: Em.computed.alias('controller.content'), diff --git a/app/assets/javascripts/discourse/views/share_view.js b/app/assets/javascripts/discourse/views/share.js.es6 similarity index 98% rename from app/assets/javascripts/discourse/views/share_view.js rename to app/assets/javascripts/discourse/views/share.js.es6 index 45b1c734763..744cef75b47 100644 --- a/app/assets/javascripts/discourse/views/share_view.js +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.ShareView = Discourse.View.extend({ +export default Discourse.View.extend({ templateName: 'share', elementId: 'share-link', classNameBindings: ['hasLink'], diff --git a/app/assets/javascripts/discourse/views/topic_closing_view.js b/app/assets/javascripts/discourse/views/topic-closing.js.es6 similarity index 97% rename from app/assets/javascripts/discourse/views/topic_closing_view.js rename to app/assets/javascripts/discourse/views/topic-closing.js.es6 index 4c9f91d7c2f..23a303c153c 100644 --- a/app/assets/javascripts/discourse/views/topic_closing_view.js +++ b/app/assets/javascripts/discourse/views/topic-closing.js.es6 @@ -7,7 +7,7 @@ @namespace Discourse @module Discourse **/ -Discourse.TopicClosingView = Discourse.View.extend({ +export default Discourse.View.extend({ elementId: 'topic-closing-info', delayedRerender: null,