Remove ObjectController, Discouse Controllers + Presence

2015-08-11 12:27:07 -04:00
parent e2e3e7c0e0
commit 02a968bd27
130 changed files with 187 additions and 349 deletions
@@ -1,4 +1,4 @@
-export default Ember.ObjectController.extend({
+export default Ember.Controller.extend({
  noOperationIsRunning: Ember.computed.not("model.isOperationRunning"),
  rollbackEnabled: Ember.computed.and("model.canRollback", "model.restoreEnabled", "noOperationIsRunning"),
  rollbackDisabled: Ember.computed.not("rollbackEnabled")
@@ -2,7 +2,7 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 import BufferedContent from 'discourse/mixins/buffered-content';
 import { propertyNotEqual } from 'discourse/lib/computed';

-export default Ember.ObjectController.extend(BufferedContent, {
+export default Ember.Controller.extend(BufferedContent, {
  needs: ['admin-badges'],
  saving: false,
  savingStatus: '',
@@ -1,6 +1,4 @@
-import DiscourseController from 'discourse/controllers/controller';
-
-export default DiscourseController.extend({
+export default Ember.Controller.extend({

  /**
    Is the "send test email" button disabled?
@@ -1,6 +1,4 @@
-import ObjectController from 'discourse/controllers/object';
-
-export default ObjectController.extend({
+export default Ember.Controller.extend({

  actions: {
    refresh: function() {
@@ -1,7 +1,6 @@
-import DiscourseController from 'discourse/controllers/controller';
 import debounce from 'discourse/lib/debounce';

-export default DiscourseController.extend({
+export default Ember.Controller.extend({

  filterEmailLogs: debounce(function() {
    var self = this;
@@ -1,7 +1,6 @@
 import debounce from 'discourse/lib/debounce';
-import DiscourseController from 'discourse/controllers/controller';

-export default DiscourseController.extend({
+export default Ember.Controller.extend({
  filterEmailLogs: debounce(function() {
    var self = this;
    Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) {
@@ -1,7 +1,7 @@
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 import { propertyEqual } from 'discourse/lib/computed';

-export default Em.ObjectController.extend({
+export default Ember.Controller.extend({
  needs: ['adminGroupsType'],
  disableSave: false,

@@ -1,4 +1,4 @@
-export default Ember.ObjectController.extend({
+export default Ember.Controller.extend({
  editing: false,
  savedIpAddress: null,

@@ -1,4 +1,4 @@
-export default Ember.ObjectController.extend({
+export default Ember.Controller.extend({
  viewMode: 'table',
  viewingTable: Em.computed.equal('viewMode', 'table'),
  viewingBarChart: Em.computed.equal('viewMode', 'barChart'),
@@ -1,4 +1,4 @@
-export default Ember.ObjectController.extend({
+export default Ember.Controller.extend({
  categoryNameKey: null,
  needs: ['adminSiteSettings'],

@@ -1,14 +1,13 @@
 import debounce from 'discourse/lib/debounce';
-import Presence from 'discourse/mixins/presence';

-export default Ember.ArrayController.extend(Presence, {
+export default Ember.ArrayController.extend({
  filter: null,
  onlyOverridden: false,
  filtered: Ember.computed.notEmpty('filter'),

  filterContentNow: function(category) {
    // If we have no content, don't bother filtering anything
-    if (!this.present('allSiteSettings')) return;
+    if (!!Ember.isEmpty(this.get('allSiteSettings'))) return;

    let filter;
    if (this.get('filter')) {
@@ -1,8 +1,7 @@
-import ObjectController from 'discourse/controllers/object';
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
 import { propertyNotEqual, setting } from 'discourse/lib/computed';

-export default ObjectController.extend(CanCheckEmails, {
+export default Ember.Controller.extend(CanCheckEmails, {
  editingTitle: false,
  originalPrimaryGroupId: null,
  availableGroups: null,
@@ -1,3 +1 @@
-import ObjectController from 'discourse/controllers/object';
-
-export default ObjectController.extend();
+export default Ember.Controller.extend();
@@ -1,6 +1,4 @@
-import DiscourseController from 'discourse/controllers/controller';
-
-export default DiscourseController.extend({
+export default Ember.Controller.extend({
  showBadges: function() {
    return this.get('currentUser.admin') && this.siteSettings.enable_badges;
  }.property()
@@ -1,7 +1,6 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import ObjectController from 'discourse/controllers/object';

-export default ObjectController.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
  needs: ["admin-flags-list"],

  _agreeFlag: function (actionOnPost) {
@@ -1,8 +1,6 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';

-import ObjectController from 'discourse/controllers/object';
-
-export default ObjectController.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
  needs: ["admin-flags-list"],

  actions: {
@@ -1,5 +1,3 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';

-import ObjectController from 'discourse/controllers/object';
-
-export default ObjectController.extend(ModalFunctionality);
+export default Ember.Controller.extend(ModalFunctionality);
@@ -1,7 +1,6 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import Controller from 'discourse/controllers/controller';

-export default Controller.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
  needs: ["adminBackupsLogs"],

  _startBackup: function (withUploads) {
@@ -1,7 +1,6 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import ObjectController from 'discourse/controllers/object';

-export default ObjectController.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {

  submitDisabled: function() {
    return (!this.get('reason') || this.get('reason').length < 1);
@@ -1,7 +1,6 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import ObjectController from 'discourse/controllers/object';

-export default ObjectController.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
  previousSelected: Ember.computed.equal('selectedTab', 'previous'),
  newSelected:      Ember.computed.equal('selectedTab', 'new'),

@@ -47,7 +47,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
  },

  wasEdited: function () {
-    if (this.blank("last_revised_at")) { return false; }
+    if (Ember.isEmpty(this.get("last_revised_at"))) { return false; }
    var lastRevisedAt = Date.parse(this.get("last_revised_at"));
    return _.some(this.get("post_actions"), function (postAction) {
      return Date.parse(postAction.created_at) < lastRevisedAt;
@@ -1,7 +1,7 @@
 import debounce from 'discourse/lib/debounce';
 import { renderSpinner } from 'discourse/helpers/loading-spinner';

-export default Discourse.View.extend({
+export default Ember.View.extend({
  classNames: ["admin-backups-logs"],

  _initialize: function() { this._reset(); }.on("init"),
@@ -1,6 +1,6 @@
 import DiscourseURL from 'discourse/lib/url';

-export default Discourse.View.extend({
+export default Ember.View.extend({
  classNames: ["admin-backups"],

  _hijackDownloads: function() {
@@ -1,6 +1,6 @@
 import LoadMore from "discourse/mixins/load-more";

-export default Discourse.View.extend(LoadMore, {
+export default Ember.View.extend(LoadMore, {
  loading: false,
  eyelineSelector: '.admin-flags tbody tr',

@@ -1,4 +1,4 @@
-export default Discourse.View.extend({
+export default Ember.View.extend({
  _disableCustomStylesheets: function() {
    if (this.session.get("disableCustomCSS")) {
      $("link.custom-css").attr("rel", "");
@@ -1,11 +1,3 @@
-/**
-  A view to handle color selections within a site customization
-
-  @class AdminCustomizeColorsView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.AdminCustomizeColorsView = Discourse.View.extend({
+Discourse.AdminCustomizeColorsView = Ember.View.extend({
  templateName: 'admin/templates/customize_colors'
 });
@@ -1,10 +1 @@
-/**
-  The view class for an Admin User
-
-  @class AdminUserView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.AdminUserView = Discourse.View.extend(Discourse.ScrollTop);
-
+Discourse.AdminUserView = Ember.View.extend(Discourse.ScrollTop);