Fix merge mistake,  and fix implementation of jQuery event handlers.

Moves line and character data into the table row element instead of the line element to simplify access.