Upgrade to Babel 6

This commit is contained in:
Robin Ward
2017-07-05 14:14:30 -04:00
parent 2f480e21a0
commit 754c1e5438
35 changed files with 62713 additions and 67299 deletions
@@ -44,7 +44,7 @@ export default Ember.Component.extend({
self.set("totalOthersWithSameIP", result.total);
});
const AdminUser = require('admin/models/admin-user').default;
const AdminUser = requirejs('admin/models/admin-user').default;
AdminUser.findAll("active", data).then(function (users) {
self.setProperties({
other_accounts: users,
@@ -18,7 +18,7 @@ export default Ember.Component.extend({
actions: {
submit: function() {
const Permalink = require('admin/models/permalink').default;
const Permalink = requirejs('admin/models/permalink').default;
if (!this.get('formSubmitted')) {
const self = this;
@@ -37,7 +37,7 @@ ApiKey.reopenClass({
@returns {ApiKey} the ApiKey instance
**/
create: function() {
const AdminUser = require('admin/models/admin-user').default;
const AdminUser = requirejs('admin/models/admin-user').default;
var result = this._super.apply(this, arguments);
if (result.user) {
result.user = AdminUser.create(result.user);
@@ -10,7 +10,7 @@ export default Discourse.Route.extend({
queryParams: { mode: {}, "start_date": {}, "end_date": {}, "category_id": {}, "group_id": {} },
model: function(params) {
const Report = require('admin/models/report').default;
const Report = requirejs('admin/models/report').default;
return Report.find(params.type, params['start_date'], params['end_date'], params['category_id'], params['group_id']);
},