diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/features/ui/containers/modal_container.jsx | 2 | ||||
| -rw-r--r-- | app/lib/feed_manager.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/ui/containers/modal_container.jsx b/app/assets/javascripts/components/features/ui/containers/modal_container.jsx index 1e69fc59c..334e5c199 100644 --- a/app/assets/javascripts/components/features/ui/containers/modal_container.jsx +++ b/app/assets/javascripts/components/features/ui/containers/modal_container.jsx @@ -123,7 +123,7 @@ const Modal = React.createClass({ window.addEventListener('keyup', this._listener); }, - componentDidUnmount () { + componentWillUnmount () { window.removeEventListener('keyup', this._listener); }, diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 028fc5218..7069026e3 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -30,6 +30,7 @@ class FeedManager end def broadcast(timeline_id, options = {}) + options[:queued_at] = (Time.now.to_f * 1000.0).to_i ActionCable.server.broadcast("timeline:#{timeline_id}", options) end |