refactor($animate): simplify the animation event rewrite

To avoid code duplication, use single variables for keeping
properties/events names to use. Also, fix some errors that have
happened after the rewrite from moment ago.
fix($animate): fix errors broken after the recent rewrite