diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 7898fbf829..0000000000 --- a/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "eslint-config-discourse" -} diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 0967ef424b..0000000000 --- a/.prettierrc +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/.prettierrc.cjs b/.prettierrc.cjs new file mode 100644 index 0000000000..57f647bc84 --- /dev/null +++ b/.prettierrc.cjs @@ -0,0 +1 @@ +module.exports = require("@discourse/lint-configs/prettier"); diff --git a/.template-lintrc.cjs b/.template-lintrc.cjs new file mode 100644 index 0000000000..5355ea06fb --- /dev/null +++ b/.template-lintrc.cjs @@ -0,0 +1 @@ +module.exports = require("@discourse/lint-configs/template-lint"); diff --git a/.template-lintrc.js b/.template-lintrc.js deleted file mode 100644 index a558b8e32c..0000000000 --- a/.template-lintrc.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - plugins: ["ember-template-lint-plugin-discourse"], - extends: "discourse:recommended", -}; diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a204871957..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - - docker - -before_install: - - git clone --depth=1 https://github.com/discourse/discourse-plugin-ci - -install: true - -script: - - discourse-plugin-ci/script.sh diff --git a/assets/javascripts/discourse/templates/components/custom-field-input.hbs b/assets/javascripts/discourse/components/custom-field-input.hbs similarity index 62% rename from assets/javascripts/discourse/templates/components/custom-field-input.hbs rename to assets/javascripts/discourse/components/custom-field-input.hbs index 4e3fa2f0c2..5543118535 100644 --- a/assets/javascripts/discourse/templates/components/custom-field-input.hbs +++ b/assets/javascripts/discourse/components/custom-field-input.hbs @@ -1,19 +1,19 @@ -{{#if showInputs}} +{{#if this.showInputs}} {{wizard-subscription-selector - value=field.klass + value=this.field.klass feature="custom_field" attribute="klass" - onChange=(action (mut field.klass)) + onChange=(action (mut this.field.klass)) options=(hash none="admin.wizard.custom_field.klass.select") }} {{wizard-subscription-selector - value=field.type + value=this.field.type feature="custom_field" attribute="type" - onChange=(action (mut field.type)) + onChange=(action (mut this.field.type)) options=(hash none="admin.wizard.custom_field.type.select") }} @@ -25,48 +25,52 @@ {{multi-select - value=field.serializers - content=serializerContent - onChange=(action (mut field.serializers)) + value=this.field.serializers + content=this.serializerContent + onChange=(action (mut this.field.serializers)) options=(hash none="admin.wizard.custom_field.serializers.select") }} - {{#if loading}} + {{#if this.loading}} {{loading-spinner size="small"}} {{else}} - {{#if saveIcon}} - {{d-icon saveIcon}} + {{#if this.saveIcon}} + {{d-icon this.saveIcon}} {{/if}} {{/if}} {{d-button action=(action "destroy") icon="trash-alt" class="destroy" - disabled=destroyDisabled + disabled=this.destroyDisabled }} {{d-button icon="save" action=(action "save") - disabled=saveDisabled + disabled=this.saveDisabled class="save" }} - {{d-button action=(action "close") icon="times" disabled=closeDisabled}} + {{d-button + action=(action "close") + icon="times" + disabled=this.closeDisabled + }} {{else}} - - - + + + - {{#if isExternal}} + {{#if this.isExternal}} — {{else}} - {{#each field.serializers as |serializer|}} + {{#each this.field.serializers as |serializer|}} {{/each}} {{/if}} - {{#if isExternal}} + {{#if this.isExternal}}