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

FIX: Build with prettier for imports (#8298)

This commit is contained in:
Mark VanLandingham 2019-11-05 13:32:43 -06:00 committed by GitHub
parent edc135d9c5
commit ca14e3d83c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/models/store.js.es6
View File

@ -96,11 +96,7 @@ export default EmberObject.extend({
return this._resultSet(type, result, findArgs);
} else {
const apiName = this.adapterFor(type).apiNameFor(type);
return this._hydrate(
type,
result[underscore(apiName)],
result
);
return this._hydrate(type, result[underscore(apiName)], result);
}
},
@ -156,9 +152,7 @@ export default EmberObject.extend({
refreshResults(resultSet, type, url) {
const adapter = this.adapterFor(type);
return ajax(url).then(result => {
const typeName = underscore(
this.pluralize(adapter.apiNameFor(type))
);
const typeName = underscore(this.pluralize(adapter.apiNameFor(type)));
const content = result[typeName].map(obj =>
this._hydrate(type, obj, result)
);
@ -169,9 +163,7 @@ export default EmberObject.extend({
appendResults(resultSet, type, url) {
const adapter = this.adapterFor(type);
return ajax(url).then(result => {
const typeName = underscore(
this.pluralize(adapter.apiNameFor(type))
);
const typeName = underscore(this.pluralize(adapter.apiNameFor(type)));
let pageTarget = result.meta || result;
let totalRows =
@ -225,9 +217,7 @@ export default EmberObject.extend({
_resultSet(type, result, findArgs) {
const adapter = this.adapterFor(type);
const typeName = underscore(
this.pluralize(adapter.apiNameFor(type))
);
const typeName = underscore(this.pluralize(adapter.apiNameFor(type)));
const content = result[typeName].map(obj =>
this._hydrate(type, obj, result)
);

2
app/assets/javascripts/discourse/widgets/component-connector.js.es6
View File

@ -1,5 +1,5 @@
import { next } from "@ember/runloop";
import { setOwner, getOwner } from '@ember/application';
import { setOwner, getOwner } from "@ember/application";
export default class ComponentConnector {
constructor(widget, componentName, opts, trackedProperties) {

4
app/assets/javascripts/wizard/components/wizard-field.js.es6
View File

@ -13,8 +13,6 @@ export default Component.extend({
@computed("field.type", "field.id")
inputComponentName(type, id) {
return type === "component"
? dasherize(id)
: `wizard-field-${type}`;
return type === "component" ? dasherize(id) : `wizard-field-${type}`;
}
});