From cbc0fea992ed6d1870f4a7f1af8b72ba58d9f7c6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 21 Jun 2017 01:33:14 +0200 Subject: [PATCH] Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877) * Revert "Bump version to 1.4.4" This reverts commit bd6bee29def197e88d6a547e5d900bdaf955cb36. * Revert "Fix conversations (fixes #3869) (#3870)" This reverts commit ee7952c349329cfe4628f07cc25ca2b6cf8b3a6e. * Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)" This reverts commit 8f202bc639e5b59e15c0f87e46799d602029e84b. * Revert "Filter direct statuses in Status.as_home_timeline (#3842)" This reverts commit 77dcf442e71e3c09deee8133f9415f184187428f. * Revert "Fix RemoteFollow behavior (#3868)" This reverts commit 1d2eba7a84b70d4bb6035ae27b00def9e632afb5. * Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)" This reverts commit baa248a801471b67282e45b3cd728e500d67da3d. * Revert "Upgrade React Router (#3677)" This reverts commit 9bc32eb267ea725bf440813c82c1c1e0bf0f7fb7. * Revert "Do not call setState from unmounted component (#3853)" This reverts commit 59849b392dc9a149c27d5905c963f03149d17884. * Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)" This reverts commit 47dceaded6814e89c98153f3bb9a5022c6e6d942. * Revert "Fix RTL detection on Ruby side (#3867)" This reverts commit 55376105f514a8727e9579531d5cbcb4f2f904df. * Revert "i18n: Fixed typo in Polish translation (#3864)" This reverts commit 3c355ed26be6599384598557b52d680231ef96ba. * Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)" This reverts commit 79c04b0a2ccc6af19a8805aca4caa10e95afbe2d. --- app/javascript/mastodon/components/status.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index b2214f72a4..e77d1eb910 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -162,10 +162,7 @@ class Status extends ImmutablePureComponent { render () { let media = null; let statusAvatar; - - // Exclude intersectionObserverWrapper from `other` variable - // because intersection is managed in here. - const { status, account, intersectionObserverWrapper, ...other } = this.props; + const { status, account, ...other } = this.props; const { isExpanded, isIntersecting, isHidden } = this.state; if (status === null) {