add eventClick function
Merge branch 'dev2'