osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ObjectController, Discouse Controllers + Presence

Browse Source
This commit is contained in:
Robin Ward
2015-08-11 12:27:07 -04:00
parent e2e3e7c0e0
commit 02a968bd27
130 changed files with 187 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin-backups.js.es6
+1 -1
View File
@@ -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")
app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+1 -1
View File
@@ -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: '',
app/assets/javascripts/admin/controllers/admin-email-index.js.es6
+1 -3
View File
@@ -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?
app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
+1 -3
View File
@@ -1,6 +1,4 @@
import ObjectController from 'discourse/controllers/object';
export default ObjectController.extend({
export default Ember.Controller.extend({
actions: {
refresh: function() {
app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
+1 -2
View File
@@ -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;
app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
+1 -2
View File
@@ -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) {
app/assets/javascripts/admin/controllers/admin-group.js.es6
+1 -1
View File
@@ -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,
app/assets/javascripts/admin/controllers/admin-log-screened-ip-address.js.es6
+1 -1
View File
@@ -1,4 +1,4 @@
export default Ember.ObjectController.extend({
export default Ember.Controller.extend({
editing: false,
savedIpAddress: null,
app/assets/javascripts/admin/controllers/admin-reports.js.es6
+1 -1
View File
@@ -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'),
app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
+1 -1
View File
@@ -1,4 +1,4 @@
export default Ember.ObjectController.extend({
export default Ember.Controller.extend({
categoryNameKey: null,
needs: ['adminSiteSettings'],
app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+2 -3
View File
@@ -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')) {
app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+1 -2
View File
@@ -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,
app/assets/javascripts/admin/controllers/admin-user.js.es6
+1 -3
View File
@@ -1,3 +1 @@
import ObjectController from 'discourse/controllers/object';
export default ObjectController.extend();
export default Ember.Controller.extend();
app/assets/javascripts/admin/controllers/admin.js.es6
+1 -3
View File
@@ -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()
app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
+1 -2
View File
@@ -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) {
app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
+1 -3
View File
@@ -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: {
app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
+1 -3
View File
@@ -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);
app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+1 -2
View File
@@ -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) {
app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
+1 -2
View File
@@ -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);
app/assets/javascripts/admin/controllers/modals/change-site-customization-details.js.es6
+1 -2
View File
@@ -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'),