diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-21 01:33:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 01:33:14 +0200 |
| commit | 31cd64904198551e222a47aa7b2ce4cd8d4370d2 (patch) | |
| tree | 5874cb096c2afc0e2fbe5b990dcfcd24988a9183 /app | |
| parent | 1585b0c6cce6cebda3fdc8ba944aa2247e76d1be (diff) | |
Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877)
* Revert "Bump version to 1.4.4" This reverts commit 1585b0c6cce6cebda3fdc8ba944aa2247e76d1be. * Revert "Fix conversations (fixes #3869) (#3870)" This reverts commit 15b43f555dcb06742c677d84c25d05774ef1bde2. * Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)" This reverts commit d8ec83280637e53ded67d4938a198cbeb9e8db05. * Revert "Filter direct statuses in Status.as_home_timeline (#3842)" This reverts commit bab5a18232a163b0c3c6a245f7f95d50d7022b36. * Revert "Fix RemoteFollow behavior (#3868)" This reverts commit a20cf3b64e93d764f1dfe88ecdb39f3fd4eefe03. * Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)" This reverts commit 356df7ae6b6edfc600fbc532f32fbc46314e00a0. * Revert "Upgrade React Router (#3677)" This reverts commit 8f03fdce7fa16fcaa829a40f395cefc85eb957d5. * Revert "Do not call setState from unmounted component (#3853)" This reverts commit 1fc6cb499742c1a872ad717a689c58a80aeb714d. * Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)" This reverts commit eb832e88f44d661a504a091defc051e052eb1252. * Revert "Fix RTL detection on Ruby side (#3867)" This reverts commit b16b69350eb4ded2e1011931433b51dac5e34b53. * Revert "i18n: Fixed typo in Polish translation (#3864)" This reverts commit da6fa029f66d50f38f2b6c85687994793f7766aa. * Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)" This reverts commit 94ad0706f514e25c58c0a8f3201f96c1d1ccbbd8.
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/components/status.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index b2214f72a..e77d1eb91 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) { |