Remove more views and deprecations.

app/assets/javascripts/discourse/components/discovery-topics-list.js.es6

@@ -3,8 +3,6 @@ import LoadMore from "discourse/mixins/load-more";
 import UrlRefresh from 'discourse/mixins/url-refresh';
 
 const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, {
-  _viaComponent: true,
-
   classNames: ['contents'],
   eyelineSelector: '.topic-list-item',
 

app/assets/javascripts/discourse/components/load-more.js.es6

@@ -1,8 +1,6 @@
 import LoadMore from "discourse/mixins/load-more";
 
 export default Ember.Component.extend(LoadMore, {
-  _viaComponent: true,
-
   init() {
     this._super();
     this.set('eyelineSelector', this.get('selector'));

app/assets/javascripts/discourse/components/user-stream.js.es6

@@ -0,0 +1,24 @@
+import LoadMore from "discourse/mixins/load-more";
+
+export default Ember.Component.extend(LoadMore, {
+  loading: false,
+  eyelineSelector: '.user-stream .item',
+  classNames: ['user-stream'],
+
+  _scrollTopOnModelChange: function() {
+    Em.run.schedule('afterRender', () => $(document).scrollTop(0));
+  }.observes('stream.user.id'),
+
+  actions: {
+    loadMore() {
+      if (this.get('loading')) { return; }
+
+      this.set('loading', true);
+      const stream = this.get('stream');
+      stream.findItems().then(() => {
+        this.set('loading', false);
+        this.get('eyeline').flushRest();
+      });
+    }
+  }
+});

app/assets/javascripts/discourse/ember/resolver.js.es6

@@ -151,11 +151,13 @@ export default Ember.DefaultResolver.extend({
     const withoutType = parsedName.fullNameWithoutType,
           slashedType = withoutType.replace(/\./g, '/'),
           decamelized = withoutType.decamelize(),
+          dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'),
           templates = Ember.TEMPLATES;
 
     return this._super(parsedName) ||
            templates[slashedType] ||
            templates[withoutType] ||
+           templates[dashed] ||
            templates[decamelized.replace(/\./, '/')] ||
            templates[decamelized.replace(/\_/, '/')] ||
            this.findAdminTemplate(parsedName) ||

app/assets/javascripts/discourse/lib/plugin-api.js.es6

@@ -49,7 +49,7 @@ class PluginApi {
 
     if (!opts.onlyStream) {
       decorate(ComposerEditor, 'previewRefreshed', callback);
-      decorate(this.container.lookupFactory('view:user-stream'), 'didInsertElement', callback);
+      decorate(this.container.lookupFactory('component:user-stream'), 'didInsertElement', callback);
     }
   }
 

app/assets/javascripts/discourse/mixins/load-more.js.es6

@@ -5,14 +5,6 @@ import { on } from 'ember-addons/ember-computed-decorators';
 // Provides the ability to load more items for a view which is scrolled to the bottom.
 export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, {
 
-  init() {
-    this._super();
-    if (!this._viaComponent) {
-      console.warn('Using `LoadMore` as a view mixin is deprecated. Use `{{load-more}}` instead');
-    }
-
-  },
-
   scrolled() {
     const eyeline = this.get('eyeline');
     return eyeline && eyeline.update();

app/assets/javascripts/discourse/templates/user-invited-show.hbs

@@ -1,4 +1,5 @@
 {{#if canInviteToForum}}
+  {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}}
     <section class='user-content'>
       <h2>{{i18n 'user.invited.title'}}</h2>
 
@@ -97,4 +98,5 @@
         </div>
       {{/if}}
     </section>
+  {{/load-more}}
 {{/if}}

app/assets/javascripts/discourse/templates/user-topics-list.hbs

@@ -1,5 +1,5 @@
-
+{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}}
-{{basic-topic-list topicList=model
+  {{basic-topic-list topicList=model
                      hideCategory=hideCategory
                      showParticipants=showParticipants
                      showPosters=showPosters
@@ -7,3 +7,4 @@
                      bulkSelectEnabled=bulkSelectEnabled
                      selected=selected
                      postsAction="showTopicEntrance"}}
+{{/load-more}}

app/assets/javascripts/discourse/templates/user/posts.hbs

@@ -1,4 +1,5 @@
-{{#each p in model.content}}
+{{#user-stream stream=model}}
+  {{#each p in model.content}}
     <div {{bind-attr class=":item p.hidden p.deleted p.moderator_action"}}>
       <div class="clearfix info">
         <a href="{{unbound p.usernameUrl}}" class="avatar-link">
@@ -25,4 +26,5 @@
         {{{p.excerpt}}}
       </p>
     </div>
-{{/each}}
+  {{/each}}
+{{/user-stream}}

app/assets/javascripts/discourse/templates/user/stream.hbs

@@ -1,3 +1,5 @@
-{{#each model.content as |item|}}
+{{#user-stream stream=model}}
+  {{#each model.content as |item|}}
     {{stream-item item=item removeBookmark="removeBookmark"}}
-{{/each}}
+  {{/each}}
+{{/user-stream}}

app/assets/javascripts/discourse/templates/users.hbs

@@ -1,4 +1,5 @@
-<div class="container">
+{{#load-more selector=".directory tbody tr" action="loadMore"}}
+  <div class="container">
     <div class='directory'>
 
       <div class='clearfix'>
@@ -53,4 +54,5 @@
       {{/conditional-loading-spinner}}
 
     </div>
-</div>
+  </div>
+{{/load-more}}

app/assets/javascripts/discourse/views/user-activity-stream.js.es6

@@ -1,27 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: '.user-stream .item',
-  classNames: ['user-stream'],
-
-  _scrollTopOnModelChange: function() {
-    Em.run.schedule('afterRender', function() {
-      $(document).scrollTop(0);
-    });
-  }.observes('controller.model.user.id'),
-
-  actions: {
-    loadMore() {
-      const self = this;
-      if (this.get('loading')) { return; }
-
-      this.set('loading', true);
-      const stream = this.get('controller.model');
-      stream.findItems().then(function() {
-        self.set('loading', false);
-        self.get('eyeline').flushRest();
-      });
-    }
-  }
-});

app/assets/javascripts/discourse/views/user-invited-show.js.es6

@@ -1,7 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  classNames: ['paginated-topics-list'],
-  eyelineSelector: '.paginated-topics-list .user-invite-list tr',
-  templateName: 'user-invited-show'
-});

app/assets/javascripts/discourse/views/user-posts.js.es6

@@ -1,20 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".user-stream .item",
-  classNames: ["user-stream"],
-
-  actions: {
-    loadMore: function() {
-      var self = this;
-      if (this.get("loading")) { return; }
-
-      var postsStream = this.get("controller.model");
-      postsStream.findItems().then(function () {
-        self.set("loading", false);
-        self.get("eyeline").flushRest();
-      }).catch(function () { });
-    }
-  }
-});

app/assets/javascripts/discourse/views/user-stream.js.es6

@@ -1,27 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: '.user-stream .item',
-  classNames: ['user-stream'],
-
-  _scrollTopOnModelChange: function() {
-    Em.run.schedule('afterRender', function() {
-      $(document).scrollTop(0);
-    });
-  }.observes('controller.model.user.id'),
-
-  actions: {
-    loadMore() {
-      const self = this;
-      if (this.get('loading')) { return; }
-
-      this.set('loading', true);
-      const stream = this.get('controller.model');
-      stream.findItems().then(function() {
-        self.set('loading', false);
-        self.get('eyeline').flushRest();
-      });
-    }
-  }
-});

app/assets/javascripts/discourse/views/user-topics-list.js.es6

@@ -1,6 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  classNames: ['paginated-topics-list'],
-  eyelineSelector: '.paginated-topics-list .topic-list tr',
-});

app/assets/javascripts/discourse/views/users.js.es6

@@ -1,5 +0,0 @@
-import LoadMore from 'discourse/mixins/load-more';
-
-export default Ember.View.extend(LoadMore, {
-  eyelineSelector: '.directory tbody tr'
-});

test/javascripts/lib/click-track-test.js.es6

@@ -167,7 +167,7 @@ testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEven
 });
 
 testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) {
-  clickEvent.which = 2;
+  clickEvent.button = 2;
 });
 
 test("tracks via AJAX if we're on the same site", function() {