REFACTOR: Remove requirejs calls

This commit is contained in:
Robin Ward
2017-07-05 16:47:01 -04:00
parent 754c1e5438
commit c53eeaaa68
12 changed files with 27 additions and 37 deletions

View File

@@ -1,4 +1,5 @@
import { ajax } from 'discourse/lib/ajax';
import AdminUser from 'admin/models/admin-user';
export default Ember.Component.extend({
classNames: ["ip-lookup"],
@@ -44,7 +45,6 @@ export default Ember.Component.extend({
self.set("totalOthersWithSameIP", result.total);
});
const AdminUser = requirejs('admin/models/admin-user').default;
AdminUser.findAll("active", data).then(function (users) {
self.setProperties({
other_accounts: users,

View File

@@ -1,3 +1,5 @@
import Permalink from 'admin/models/permalink';
export default Ember.Component.extend({
classNames: ['permalink-form'],
formSubmitted: false,
@@ -18,8 +20,6 @@ export default Ember.Component.extend({
actions: {
submit: function() {
const Permalink = requirejs('admin/models/permalink').default;
if (!this.get('formSubmitted')) {
const self = this;
self.set('formSubmitted', true);

View File

@@ -1,4 +1,6 @@
import AdminUser from 'admin/models/admin-user';
import { ajax } from 'discourse/lib/ajax';
const ApiKey = Discourse.Model.extend({
/**
@@ -36,8 +38,7 @@ ApiKey.reopenClass({
@param {...} var_args the properties to initialize this with
@returns {ApiKey} the ApiKey instance
**/
create: function() {
const AdminUser = requirejs('admin/models/admin-user').default;
create() {
var result = this._super.apply(this, arguments);
if (result.user) {
result.user = AdminUser.create(result.user);

View File

@@ -1,16 +1,9 @@
/**
Handles routes for admin reports
import Report from 'admin/models/report';
@class AdminReportsRoute
@extends Discourse.Route
@namespace Discourse
@module Discourse
**/
export default Discourse.Route.extend({
queryParams: { mode: {}, "start_date": {}, "end_date": {}, "category_id": {}, "group_id": {} },
model: function(params) {
const Report = requirejs('admin/models/report').default;
model(params) {
return Report.find(params.type, params['start_date'], params['end_date'], params['category_id'], params['group_id']);
},