v-on delegation refactor, functional tests pass