TVPJSFRMWK-1862 changing files to use event handling callback rather than bubble event