Move click/tap events to onClick handler to fix bug with double tapping on mobile Chrome

Move click/tap events to onClick handler to fix bug with double tapping on mobile Chrome #1509