Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add clear timeout polyfill #451

Merged
merged 8 commits into from
Jun 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]

## [Unreleased]

## [6.0.4]
##### Fixed
- Added polyfill for clearTimeout which is used by babel-polyfill.

## [6.0.3]
##### Fixed
- Added assets symlinking support on Heroku [#446](https://github.com/shakacode/react_on_rails/pull/446) by [Alexey Karasev](https://github.com/alleycat-at-git).
Expand Down Expand Up @@ -345,7 +349,8 @@ Best done with Object destructing:
##### Fixed
- Fix several generator related issues.

[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.0.3...master
[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.0.4...master
[6.0.4]: https://github.com/shakacode/react_on_rails/compare/6.0.3...6.0.4
[6.0.3]: https://github.com/shakacode/react_on_rails/compare/6.0.2...6.0.3
[6.0.2]: https://github.com/shakacode/react_on_rails/compare/6.0.1...6.0.2
[6.0.1]: https://github.com/shakacode/react_on_rails/compare/6.0.0...6.0.1
Expand Down
4 changes: 4 additions & 0 deletions lib/react_on_rails/server_rendering_pool/exec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ def execjs_timer_polyfills
function setTimeout() {
#{undefined_for_exec_js_logging('setTimeout')}
}

function clearTimeout() {
#{undefined_for_exec_js_logging('clearTimeout')}
}
JS
end

Expand Down