Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sort out import ordering in admin js

This commit is contained in:
Sam 2015-11-21 01:10:31 +11:00
parent 0c5d0ddb1b
commit 1c8b3c9447
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/components/ip-lookup.js.es6
View File

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

4
app/assets/javascripts/admin/components/permalink-form.js.es6
View File

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

2
app/assets/javascripts/admin/components/screened_ip_address_form_component.js.es6 → app/assets/javascripts/admin/components/screened-ip-address-form-component.js.es6
View File

@ -1,4 +1,4 @@
import ScreenedIpAddress from 'admin/models/screened_ip_address'; import ScreenedIpAddress from 'admin/models/screened-ip-address';
/** /**
A form to create an IP address that will be blocked or whitelisted. A form to create an IP address that will be blocked or whitelisted.
Example usage: Example usage:

7
app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
View File

@ -1,11 +1,8 @@
import debounce from 'discourse/lib/debounce'; import debounce from 'discourse/lib/debounce';
import EmailLog from 'admin/models/email-log';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
filterEmailLogs: debounce(function() { filterEmailLogs: debounce(function() {
var self = this; const EmailLog = require('admin/models/email-log').default;
EmailLog.findAll(this.get("filter")).then(function(logs) { EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
self.set("model", logs);
});
}, 250).observes("filter.user", "filter.address", "filter.type", "filter.skipped_reason") }, 250).observes("filter.user", "filter.address", "filter.type", "filter.skipped_reason")
}); });

6
app/assets/javascripts/main_include_admin.js
View File

@ -1,6 +1,12 @@
//= require_tree ./ember-addons //= require_tree ./ember-addons
//= require admin/models/user-field //= require admin/models/user-field
//= require admin/models/site-setting //= require admin/models/site-setting
//= require admin/models/screened-ip-address
//= require admin/models/api-key
//= require admin/models/tl3-requirements
//= require admin/models/admin-user
//= require_tree ./admin/models
//= require admin/routes/admin-email-logs
//= require admin/controllers/admin-email-skipped //= require admin/controllers/admin-email-skipped
//= require discourse/lib/export-result //= require discourse/lib/export-result
//= require_tree ./admin //= require_tree ./admin