Combine  event data and custom data

The event trigger now pass all custom data in jQKeyStorke as part of the
event data.
Update the test to reflect this.