From 86ef7da2eb3ad6d9b8d1ddbbb61567a9a59b2702 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 7 Nov 2023 17:07:33 +0000 Subject: [PATCH] DEV: Apply eslint --fix --- .../javascripts/discourse/components/ad-component.js | 2 +- assets/javascripts/discourse/components/ad-slot.js | 4 ++-- assets/javascripts/discourse/components/adbutler-ad.js | 8 ++++---- .../discourse/components/amazon-product-links.js | 4 ++-- .../javascripts/discourse/components/carbonads-ad.js | 4 ++-- .../javascripts/discourse/components/google-adsense.js | 10 +++++----- .../javascripts/discourse/components/google-dfp-ad.js | 10 +++++----- assets/javascripts/discourse/components/house-ad.js | 4 ++-- .../discourse/components/house-ads-chooser.js | 2 +- .../discourse/components/house-ads-list-setting.js | 2 +- .../controllers/admin-plugins-house-ads-show.js | 6 +++--- .../discourse/routes/admin-plugins-house-ads-index.js | 2 +- .../discourse/routes/admin-plugins-house-ads-show.js | 2 +- .../discourse/routes/admin-plugins-house-ads.js | 2 +- test/javascripts/acceptance/adsense-test.js | 6 +++--- test/javascripts/acceptance/dfp-test.js | 6 +++--- test/javascripts/acceptance/house-ad-test.js | 4 ++-- test/javascripts/acceptance/mixed-ads-test.js | 4 ++-- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/assets/javascripts/discourse/components/ad-component.js b/assets/javascripts/discourse/components/ad-component.js index 87fef7e..6c1cae5 100644 --- a/assets/javascripts/discourse/components/ad-component.js +++ b/assets/javascripts/discourse/components/ad-component.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; -import { inject as service } from "@ember/service"; import { alias, or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import discourseComputed from "discourse-common/utils/decorators"; import { isNthPost, diff --git a/assets/javascripts/discourse/components/ad-slot.js b/assets/javascripts/discourse/components/ad-slot.js index 9cfa966..8309d4e 100644 --- a/assets/javascripts/discourse/components/ad-slot.js +++ b/assets/javascripts/discourse/components/ad-slot.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed, { observes } from "discourse-common/utils/decorators"; import { isBlank } from "@ember/utils"; +import discourseComputed, { observes } from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import { isNthPost, isNthTopicListItem, diff --git a/assets/javascripts/discourse/components/adbutler-ad.js b/assets/javascripts/discourse/components/adbutler-ad.js index fb3e730..b900796 100644 --- a/assets/javascripts/discourse/components/adbutler-ad.js +++ b/assets/javascripts/discourse/components/adbutler-ad.js @@ -1,9 +1,9 @@ -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed, { observes } from "discourse-common/utils/decorators"; -import loadScript from "discourse/lib/load-script"; -import RSVP from "rsvp"; import { scheduleOnce } from "@ember/runloop"; +import RSVP from "rsvp"; +import loadScript from "discourse/lib/load-script"; import { isTesting } from "discourse-common/config/environment"; +import discourseComputed, { observes } from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; let _loaded = false, _promise = null, diff --git a/assets/javascripts/discourse/components/amazon-product-links.js b/assets/javascripts/discourse/components/amazon-product-links.js index 4721c39..571ed50 100644 --- a/assets/javascripts/discourse/components/amazon-product-links.js +++ b/assets/javascripts/discourse/components/amazon-product-links.js @@ -1,7 +1,7 @@ -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed from "discourse-common/utils/decorators"; import { and } from "@ember/object/computed"; import { htmlSafe } from "@ember/template"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; export default AdComponent.extend({ classNames: ["amazon-product-links"], diff --git a/assets/javascripts/discourse/components/carbonads-ad.js b/assets/javascripts/discourse/components/carbonads-ad.js index 047355b..a9e5b95 100644 --- a/assets/javascripts/discourse/components/carbonads-ad.js +++ b/assets/javascripts/discourse/components/carbonads-ad.js @@ -1,6 +1,6 @@ -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed from "discourse-common/utils/decorators"; import { htmlSafe } from "@ember/template"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; export default AdComponent.extend({ serve_id: null, diff --git a/assets/javascripts/discourse/components/google-adsense.js b/assets/javascripts/discourse/components/google-adsense.js index 3734388..2bf628b 100644 --- a/assets/javascripts/discourse/components/google-adsense.js +++ b/assets/javascripts/discourse/components/google-adsense.js @@ -1,10 +1,10 @@ -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed, { observes } from "discourse-common/utils/decorators"; -import loadScript from "discourse/lib/load-script"; -import RSVP from "rsvp"; import { scheduleOnce } from "@ember/runloop"; -import { isTesting } from "discourse-common/config/environment"; import { htmlSafe } from "@ember/template"; +import RSVP from "rsvp"; +import loadScript from "discourse/lib/load-script"; +import { isTesting } from "discourse-common/config/environment"; +import discourseComputed, { observes } from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; let _loaded = false, _promise = null, diff --git a/assets/javascripts/discourse/components/google-dfp-ad.js b/assets/javascripts/discourse/components/google-dfp-ad.js index 7223358..25d4575 100755 --- a/assets/javascripts/discourse/components/google-dfp-ad.js +++ b/assets/javascripts/discourse/components/google-dfp-ad.js @@ -1,10 +1,10 @@ -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed, { on } from "discourse-common/utils/decorators"; -import loadScript from "discourse/lib/load-script"; import { alias } from "@ember/object/computed"; -import RSVP from "rsvp"; -import { isTesting } from "discourse-common/config/environment"; import { htmlSafe } from "@ember/template"; +import RSVP from "rsvp"; +import loadScript from "discourse/lib/load-script"; +import { isTesting } from "discourse-common/config/environment"; +import discourseComputed, { on } from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; let _loaded = false, _promise = null, diff --git a/assets/javascripts/discourse/components/house-ad.js b/assets/javascripts/discourse/components/house-ad.js index f1fb452..ea97927 100644 --- a/assets/javascripts/discourse/components/house-ad.js +++ b/assets/javascripts/discourse/components/house-ad.js @@ -1,6 +1,6 @@ -import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; -import discourseComputed, { observes } from "discourse-common/utils/decorators"; import { isBlank } from "@ember/utils"; +import discourseComputed, { observes } from "discourse-common/utils/decorators"; +import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; const adIndex = { topic_list_top: null, diff --git a/assets/javascripts/discourse/components/house-ads-chooser.js b/assets/javascripts/discourse/components/house-ads-chooser.js index 3cf6f7b..85e4c0c 100644 --- a/assets/javascripts/discourse/components/house-ads-chooser.js +++ b/assets/javascripts/discourse/components/house-ads-chooser.js @@ -1,5 +1,5 @@ -import MultiSelectComponent from "select-kit/components/multi-select"; import Ember from "ember"; +import MultiSelectComponent from "select-kit/components/multi-select"; const { makeArray } = Ember; import { computed } from "@ember/object"; diff --git a/assets/javascripts/discourse/components/house-ads-list-setting.js b/assets/javascripts/discourse/components/house-ads-list-setting.js index 6ece8cc..152851a 100644 --- a/assets/javascripts/discourse/components/house-ads-list-setting.js +++ b/assets/javascripts/discourse/components/house-ads-list-setting.js @@ -1,5 +1,5 @@ -import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting"; import { mapBy } from "@ember/object/computed"; +import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting"; export default HouseAdsSetting.extend({ classNames: "house-ads-setting house-ads-list-setting", diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js b/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js index 982a04f..61ab521 100644 --- a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js +++ b/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js @@ -1,10 +1,10 @@ -import I18n from "I18n"; +import Controller, { inject as controller } from "@ember/controller"; +import { not, or } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { propertyNotEqual } from "discourse/lib/computed"; import { bufferedProperty } from "discourse/mixins/buffered-content"; -import Controller, { inject as controller } from "@ember/controller"; -import { not, or } from "@ember/object/computed"; +import I18n from "I18n"; export default Controller.extend(bufferedProperty("model"), { adminPluginsHouseAds: controller("adminPlugins.houseAds"), diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js b/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js index d81cb12..85e99ac 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js +++ b/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { action } from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ @action diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js b/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js index a2dd4f5..6168317 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js +++ b/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; export default DiscourseRoute.extend({ diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads.js b/assets/javascripts/discourse/routes/admin-plugins-house-ads.js index 9bd5c0a..4f2a38e 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-house-ads.js +++ b/assets/javascripts/discourse/routes/admin-plugins-house-ads.js @@ -1,6 +1,6 @@ +import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import DiscourseRoute from "discourse/routes/discourse"; -import EmberObject from "@ember/object"; export default DiscourseRoute.extend({ settings: null, diff --git a/test/javascripts/acceptance/adsense-test.js b/test/javascripts/acceptance/adsense-test.js index 66e2830..16951c3 100644 --- a/test/javascripts/acceptance/adsense-test.js +++ b/test/javascripts/acceptance/adsense-test.js @@ -1,10 +1,10 @@ +import { visit } from "@ember/test-helpers"; +import { test } from "qunit"; +import groupFixtures from "discourse/tests/fixtures/group-fixtures"; import { acceptance, updateCurrentUser, } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; -import groupFixtures from "discourse/tests/fixtures/group-fixtures"; -import { visit } from "@ember/test-helpers"; acceptance("AdSense", function (needs) { needs.user(); diff --git a/test/javascripts/acceptance/dfp-test.js b/test/javascripts/acceptance/dfp-test.js index a809618..00ec01e 100644 --- a/test/javascripts/acceptance/dfp-test.js +++ b/test/javascripts/acceptance/dfp-test.js @@ -1,10 +1,10 @@ +import { visit } from "@ember/test-helpers"; +import { test } from "qunit"; +import groupFixtures from "discourse/tests/fixtures/group-fixtures"; import { acceptance, updateCurrentUser, } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; -import groupFixtures from "discourse/tests/fixtures/group-fixtures"; -import { visit } from "@ember/test-helpers"; acceptance("DFP Ads", function (needs) { needs.user(); diff --git a/test/javascripts/acceptance/house-ad-test.js b/test/javascripts/acceptance/house-ad-test.js index fa929a3..d0870b0 100644 --- a/test/javascripts/acceptance/house-ad-test.js +++ b/test/javascripts/acceptance/house-ad-test.js @@ -1,9 +1,9 @@ +import { visit } from "@ember/test-helpers"; +import { test } from "qunit"; import { acceptance, updateCurrentUser, } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; -import { visit } from "@ember/test-helpers"; acceptance("House Ads", function (needs) { needs.user(); diff --git a/test/javascripts/acceptance/mixed-ads-test.js b/test/javascripts/acceptance/mixed-ads-test.js index 76e4422..b44c91e 100644 --- a/test/javascripts/acceptance/mixed-ads-test.js +++ b/test/javascripts/acceptance/mixed-ads-test.js @@ -1,9 +1,9 @@ +import { visit } from "@ember/test-helpers"; +import { test } from "qunit"; import { acceptance, updateCurrentUser, } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; -import { visit } from "@ember/test-helpers"; acceptance("Mixed Ads", function (needs) { needs.user();