Use jQuery instead of deprecated addHandler

Change-Id: Id590f7c895cff7463ccf29517cb605f9d039e0dc