From e5525d03b857dacb7aa2d4540f5c8d52d2da9158 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 29 Oct 2019 16:14:46 -0400 Subject: [PATCH] FIX: Yet more linting fixes --- .../javascripts/admin/components/resumable-upload.js.es6 | 4 +--- .../discourse/components/choose-message.js.es6 | 4 +--- .../discourse/components/composer-editor.js.es6 | 8 +------- .../javascripts/discourse/components/d-editor.js.es6 | 5 +---- .../discourse/components/discovery-topics-list.js.es6 | 4 +--- .../javascripts/discourse/components/global-notice.js.es6 | 5 +---- .../discourse/components/pwa-install-banner.js.es6 | 5 +---- .../discourse/components/scrolling-post-stream.js.es6 | 3 +-- .../javascripts/discourse/components/signup-cta.js.es6 | 5 +---- .../javascripts/discourse/components/topic-list.js.es6 | 4 +--- .../discourse/components/topic-progress.js.es6 | 7 +------ .../discourse/components/topic-timer-info.js.es6 | 6 +----- app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 5 +---- .../discourse/routes/discovery-categories.js.es6 | 4 +--- 14 files changed, 14 insertions(+), 55 deletions(-) diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6 index 344e76deb6d..d63a1a651de 100644 --- a/app/assets/javascripts/admin/components/resumable-upload.js.es6 +++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6 @@ -52,9 +52,7 @@ export default Component.extend( this.resumable.on("fileProgress", file => { // update progress - later(() => - this.set("progress", parseInt(file.progress() * 100, 10)) - ); + later(() => this.set("progress", parseInt(file.progress() * 100, 10))); }); this.resumable.on("fileSuccess", file => { diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6 index c6dd177fe9f..be174ad685a 100644 --- a/app/assets/javascripts/discourse/components/choose-message.js.es6 +++ b/app/assets/javascripts/discourse/components/choose-message.js.es6 @@ -58,9 +58,7 @@ export default Component.extend({ chooseMessage(message) { const messageId = Ember.get(message, "id"); this.set("selectedTopicId", messageId); - next(() => - $(`#choose-message-${messageId}`).prop("checked", "true") - ); + next(() => $(`#choose-message-${messageId}`).prop("checked", "true")); return false; } } diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index c9ccf82fa6d..8042d248da4 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -197,13 +197,7 @@ export default Component.extend({ this._initInputPreviewSync($input, $preview); } else { $input.on("scroll", () => - throttle( - this, - this._syncEditorAndPreviewScroll, - $input, - $preview, - 20 - ) + throttle(this, this._syncEditorAndPreviewScroll, $input, $preview, 20) ); } diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 4b95ddc8142..e839fad6c6f 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -444,10 +444,7 @@ export default Component.extend({ if (filterInput) { filterInput.value = v.term; - later( - () => filterInput.dispatchEvent(new Event("input")), - 50 - ); + later(() => filterInput.dispatchEvent(new Event("input")), 50); } }); diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 index 9c6cb779c24..6706cacd4ad 100644 --- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 @@ -14,9 +14,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, { _readjustScrollPosition() { const scrollTo = this.session.get("topicListScrollPosition"); if (scrollTo && scrollTo >= 0) { - schedule("afterRender", () => - $(window).scrollTop(scrollTo + 1) - ); + schedule("afterRender", () => $(window).scrollTop(scrollTo + 1)); } else { scheduleOnce("afterRender", this, this.loadMoreUnlessFull); } diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index 571d895f84b..1b288f54293 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -92,10 +92,7 @@ export default Component.extend( this._boundRerenderBuffer = bind(this, this.rerenderBuffer); LogsNotice.current().addObserver("hidden", this._boundRerenderBuffer); - this._boundResetCurrentProp = bind( - this, - this._resetCurrentProp - ); + this._boundResetCurrentProp = bind(this, this._resetCurrentProp); $(this.element).on( "click.global-notice", ".alert-logs-notice .close", diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 index a82f76518b0..e2e60f3d88c 100644 --- a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 +++ b/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 @@ -19,10 +19,7 @@ export default Component.extend({ @on("didInsertElement") _registerListener() { - this._promptEventHandler = bind( - this, - this._handleInstallPromptEvent - ); + this._promptEventHandler = bind(this, this._handleInstallPromptEvent); window.addEventListener("beforeinstallprompt", this._promptEventHandler); }, diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 index 38f6536b9d4..04f0897eb65 100644 --- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 +++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 @@ -314,8 +314,7 @@ export default MountWidget.extend({ didInsertElement() { this._super(...arguments); - const debouncedScroll = () => - debounce(this, this._scrollTriggered, 10); + const debouncedScroll = () => debounce(this, this._scrollTriggered, 10); this._previouslyNearby = {}; diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6 index 92df1a672ff..49536eff37b 100644 --- a/app/assets/javascripts/discourse/components/signup-cta.js.es6 +++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6 @@ -11,10 +11,7 @@ export default Component.extend({ hideForSession() { this.session.set("hideSignupCta", true); this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime()); - later( - () => this.session.set("showSignupCta", false), - 20 * 1000 - ); + later(() => this.session.set("showSignupCta", false), 20 * 1000); } }, diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6 index 44f4a39a698..870c68f9c89 100644 --- a/app/assets/javascripts/discourse/components/topic-list.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-list.js.es6 @@ -70,9 +70,7 @@ export default Component.extend(LoadMore, { let scrollTo = this.session.get("topicListScrollPosition"); if (scrollTo && scrollTo >= 0) { - schedule("afterRender", () => - $(window).scrollTop(scrollTo + 1) - ); + schedule("afterRender", () => $(window).scrollTop(scrollTo + 1)); } }, diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6 index 9e3388ca9bf..19ec394b035 100644 --- a/app/assets/javascripts/discourse/components/topic-progress.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6 @@ -101,12 +101,7 @@ export default Component.extend({ const prevEvent = this.prevEvent; if (prevEvent) { - scheduleOnce( - "afterRender", - this, - this._topicScrolled, - prevEvent - ); + scheduleOnce("afterRender", this, this._topicScrolled, prevEvent); } else { scheduleOnce("afterRender", this, this._updateProgressBar); } diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 index 2210a3b47ce..bb26e0caba4 100644 --- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 @@ -87,11 +87,7 @@ export default Component.extend( // TODO Sam: concerned this can cause a heavy rerender loop if (!Ember.testing) { - this._delayedRerender = later( - this, - this.rerender, - rerenderDelay - ); + this._delayedRerender = later(this, this.rerender, rerenderDelay); } } }, diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 index 5d5a10b0dc5..ac64d264612 100644 --- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 +++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 @@ -95,10 +95,7 @@ function positioningWorkaround($fixedElement) { if (!iOSWithVisualViewport()) { fixedElement.style.height = oldHeight; - later( - () => $(fixedElement).removeClass("no-transition"), - 500 - ); + later(() => $(fixedElement).removeClass("no-transition"), 500); } $(window).scrollTop(originalScrollTop); diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 index 1510856c114..125b6bf9d04 100644 --- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 +++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 @@ -135,9 +135,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, { }, didTransition() { - next(() => - this.controllerFor("application").set("showFooter", true) - ); + next(() => this.controllerFor("application").set("showFooter", true)); return true; } }