Skip to content

Commit

Permalink
Added clearTimeout to the exec.rb polyfil.
Browse files Browse the repository at this point in the history
  • Loading branch information
martyphee committed Jun 13, 2016
1 parent 1d69236 commit ec2e83c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
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

0 comments on commit ec2e83c

Please sign in to comment.