diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 7898fbf8..00000000 --- a/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "eslint-config-discourse" -} diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 0967ef42..00000000 --- a/.prettierrc +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/.prettierrc.cjs b/.prettierrc.cjs new file mode 100644 index 00000000..57f647bc --- /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 00000000..5355ea06 --- /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 a558b8e3..00000000 --- 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 a2048719..00000000 --- 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/components/custom-field-input.js b/assets/javascripts/discourse/components/custom-field-input.js index 6f891e1b..038947cd 100644 --- a/assets/javascripts/discourse/components/custom-field-input.js +++ b/assets/javascripts/discourse/components/custom-field-input.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; -import discourseComputed, { observes } from "discourse-common/utils/decorators"; import { alias, equal, or } from "@ember/object/computed"; +import discourseComputed, { observes } from "discourse-common/utils/decorators"; import I18n from "I18n"; export default Component.extend({ @@ -17,6 +17,7 @@ export default Component.extend({ isExternal: equal("field.id", "external"), didInsertElement() { + this._super(...arguments); this.set("originalField", JSON.parse(JSON.stringify(this.field))); }, diff --git a/assets/javascripts/discourse/components/custom-wizard-category-selector.js b/assets/javascripts/discourse/components/custom-wizard-category-selector.js index 4aa6735d..769c6927 100644 --- a/assets/javascripts/discourse/components/custom-wizard-category-selector.js +++ b/assets/javascripts/discourse/components/custom-wizard-category-selector.js @@ -1,6 +1,6 @@ -import CategorySelector from "select-kit/components/category-selector"; import { computed } from "@ember/object"; import { makeArray } from "discourse-common/lib/helpers"; +import CategorySelector from "select-kit/components/category-selector"; export default CategorySelector.extend({ classNames: ["category-selector", "wizard-category-selector"], diff --git a/assets/javascripts/discourse/components/custom-wizard-composer-editor.js b/assets/javascripts/discourse/components/custom-wizard-composer-editor.js index 9a7af44f..eede2ac8 100644 --- a/assets/javascripts/discourse/components/custom-wizard-composer-editor.js +++ b/assets/javascripts/discourse/components/custom-wizard-composer-editor.js @@ -1,11 +1,11 @@ -import ComposerEditor from "discourse/components/composer-editor"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; -import { alias } from "@ember/object/computed"; -import { uploadIcon } from "discourse/lib/uploads"; -import { dasherize } from "@ember/string"; -import InsertHyperlink from "discourse/components/modal/insert-hyperlink"; -import { inject as service } from "@ember/service"; import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; +import { service } from "@ember/service"; +import { dasherize } from "@ember/string"; +import ComposerEditor from "discourse/components/composer-editor"; +import InsertHyperlink from "discourse/components/modal/insert-hyperlink"; +import { uploadIcon } from "discourse/lib/uploads"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; export const wizardComposerEdtiorEventPrefix = "wizard-editor"; diff --git a/assets/javascripts/discourse/components/custom-wizard-editor.hbs b/assets/javascripts/discourse/components/custom-wizard-editor.hbs index 8c0a96c1..6e9eebd0 100644 --- a/assets/javascripts/discourse/components/custom-wizard-editor.hbs +++ b/assets/javascripts/discourse/components/custom-wizard-editor.hbs @@ -23,7 +23,7 @@ options=(hash popupTitle=b.title icon=b.icon) }} {{else}} -
{{d.icon}}
+
{{b.icon}}