diff --git a/app/assets/javascripts/discourse/components/post-menu.js.es6 b/app/assets/javascripts/discourse/components/post-menu.js.es6 index 56955c4c4..94d152930 100644 --- a/app/assets/javascripts/discourse/components/post-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/post-menu.js.es6 @@ -45,7 +45,7 @@ Button.prototype.render = function(buffer) { let hiddenButtons; -const PostMenuView = Ember.Component.extend(StringBuffer, { +const PostMenuComponent = Ember.Component.extend(StringBuffer, { tagName: 'section', classNames: ['post-menu-area', 'clearfix'], @@ -164,7 +164,7 @@ const PostMenuView = Ember.Component.extend(StringBuffer, { visibleButtons.splice(visibleButtons.length - 1, 0, this.buttonForShowMoreActions(post)); } - const callbacks = PostMenuView._registerButtonCallbacks; + const callbacks = PostMenuComponent._registerButtonCallbacks; if (callbacks) { _.each(callbacks, function(callback) { callback.apply(self, [visibleButtons]); @@ -412,11 +412,11 @@ const PostMenuView = Ember.Component.extend(StringBuffer, { }); -PostMenuView.reopenClass({ +PostMenuComponent.reopenClass({ registerButton(callback){ this._registerButtonCallbacks = this._registerButtonCallbacks || []; this._registerButtonCallbacks.push(callback); } }); -export default PostMenuView; +export default PostMenuComponent; diff --git a/app/assets/javascripts/discourse/views/post-menu.js.es6 b/app/assets/javascripts/discourse/views/post-menu.js.es6 new file mode 100644 index 000000000..e33b553a2 --- /dev/null +++ b/app/assets/javascripts/discourse/views/post-menu.js.es6 @@ -0,0 +1,5 @@ +import PostMenuComponent from 'discourse/components/post-menu'; + +Ember.warn("PostMenuView has been deprecated, use PostMenuComponent instead"); + +export default PostMenuComponent.extend(); diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index 6b5658963..9feb47958 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -108,10 +108,13 @@ module Tilt result = "Controller" if result == "ControllerController" result = "Route" if result == "DiscourseRoute" result = "View" if result == "ViewView" + result.gsub!(/Mixin$/, '') result.gsub!(/Model$/, '') - @output << "\n\nDiscourse.#{result} = require('#{require_name}').default;\n" + if result != "PostMenuView" + @output << "\n\nDiscourse.#{result} = require('#{require_name}').default;\n" + end end end