REFACTOR: Remove view from badges-show

app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6

@@ -1,11 +1,21 @@
 import IncomingEmail from 'admin/models/incoming-email';
 
 export default Ember.Controller.extend({
+  loading: false,
+
+  actions: {
+
     loadMore() {
-    return IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
+      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+      this.set('loading', true);
+
+      IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
                      .then(incoming => {
                         if (incoming.length < 50) { this.get("model").set("allLoaded", true); }
                         this.get("model").addObjects(incoming);
+                     }).finally(() => {
+                       this.set('loading', false);
                      });
     }
+  }
 });

app/assets/javascripts/admin/controllers/admin-email-logs.js.es6

@@ -1,11 +1,20 @@
 import EmailLog from 'admin/models/email-log';
 
 export default Ember.Controller.extend({
+  loading: false,
+
+  actions: {
     loadMore() {
+      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+
+      this.set('loading', true);
       return EmailLog.findAll(this.get("filter"), this.get("model.length"))
                      .then(logs => {
                         if (logs.length < 50) { this.get("model").set("allLoaded", true); }
                         this.get("model").addObjects(logs);
+                     }).finally(() => {
+                       this.set('loading', false);
                      });
     }
+  }
 });

app/assets/javascripts/admin/templates/email-received.hbs

@@ -1,4 +1,5 @@
-<table class='table email-list'>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
     <thead>
       <tr>
         <th>{{i18n 'admin.email.time'}}</th>
@@ -50,6 +51,7 @@
       <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
     {{/each}}
 
-</table>
+  </table>
+{{/load-more}}
 
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}

app/assets/javascripts/admin/templates/email-rejected.hbs

@@ -1,4 +1,5 @@
-<table class='table email-list'>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
     <thead>
       <tr>
         <th>{{i18n 'admin.email.time'}}</th>
@@ -49,6 +50,7 @@
       <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
     {{/each}}
 
-</table>
+  </table>
+{{/load-more}}
 
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}

app/assets/javascripts/admin/templates/email-sent.hbs

@@ -1,4 +1,5 @@
-<table class='table email-list'>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
     <thead>
       <tr>
         <th>{{i18n 'admin.email.sent_at'}}</th>
@@ -42,6 +43,7 @@
       <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
     {{/each}}
 
-</table>
+  </table>
+{{/load-more}}
 
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}

app/assets/javascripts/admin/templates/email-skipped.hbs

@@ -1,4 +1,5 @@
-<table class='table email-list'>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
     <thead>
       <tr>
         <th>{{i18n 'admin.email.time'}}</th>
@@ -42,6 +43,7 @@
       <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
     {{/each}}
 
-</table>
+  </table>
+{{/load-more}}
 
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}

app/assets/javascripts/admin/views/admin-email-incomings.js.es6

@@ -1,14 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".email-list tr",
-
-  actions: {
-    loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set("loading", true);
-      return this.get("controller").loadMore().then(() => this.set("loading", false));
-    }
-  }
-});

app/assets/javascripts/admin/views/admin-email-logs.js.es6

@@ -1,14 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".email-list tr",
-
-  actions: {
-    loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set("loading", true);
-      return this.get("controller").loadMore().then(() => this.set("loading", false));
-    }
-  }
-});

app/assets/javascripts/admin/views/admin-email-received.js.es6

@@ -1,5 +0,0 @@
-import AdminEmailIncomingsView from "admin/views/admin-email-incomings";
-
-export default AdminEmailIncomingsView.extend({
-  templateName: "admin/templates/email-received"
-});

app/assets/javascripts/admin/views/admin-email-rejected.js.es6

@@ -1,5 +0,0 @@
-import AdminEmailIncomingsView from "admin/views/admin-email-incomings";
-
-export default AdminEmailIncomingsView.extend({
-  templateName: "admin/templates/email-rejected"
-});

app/assets/javascripts/admin/views/admin-email-sent.js.es6

@@ -1,5 +0,0 @@
-import AdminEmailLogsView from "admin/views/admin-email-logs";
-
-export default AdminEmailLogsView.extend({
-  templateName: "admin/templates/email-sent"
-});

app/assets/javascripts/admin/views/admin-email-skipped.js.es6

@@ -1,5 +0,0 @@
-import AdminEmailLogsView from "admin/views/admin-email-logs";
-
-export default AdminEmailLogsView.extend({
-  templateName: "admin/templates/email-skipped"
-});

app/assets/javascripts/discourse/components/check-mark.js.es6

@@ -0,0 +1,11 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'i',
+  classNameBindings: [':fa', 'iconClass'],
+
+  @computed('checked')
+  iconClass(checked) {
+    return checked ? 'fa-check' : 'fa-times';
+  }
+});

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

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

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

@@ -5,6 +5,14 @@ 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/badges/show.hbs

@@ -14,13 +14,16 @@
   <div class='badges-listing'>
     <div class='row'>
       <div class='grant-count'>{{i18n 'badges.granted' count=grantCount}}</div>
-      <div class='info'>{{i18n 'badges.allow_title'}} {{{view.allowTitle}}}<br>{{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}}
+      <div class='info'>
+        {{i18n 'badges.allow_title'}} {{check-mark checked=model.allow_title}}<br>
+        {{i18n 'badges.multiple_grant'}} {{check-mark checked=model.multiple_grant}}
       </div>
     </div>
   </div>
 
   {{#if userBadges}}
     <div class="user-badges">
+      {{#load-more selector=".badge-info" action="loadMore"}}
         {{#each userBadges as |ub|}}
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
@@ -29,6 +32,7 @@
             {{/if}}
           {{/user-info}}
         {{/each}}
+      {{/load-more}}
 
       {{#unless canLoadMore}}
         {{#if user}}

app/assets/javascripts/discourse/views/badges-show.js.es6

@@ -1,11 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  eyelineSelector: '.badge-info',
-  tickOrX: function(field){
-    var icon = this.get('controller.model.' + field) ? "fa-check" : "fa-times";
-    return "<i class='fa " + icon + "'></i>";
-  },
-  allowTitle: function() { return this.tickOrX("allow_title"); }.property(),
-  multipleGrant: function() { return this.tickOrX("multiple_grant"); }.property()
-});