Great work on fixes

I take a look at your fixes and i see that you fixed some of pending issues on PopConfirm

#1 with your commit f7bf045
#6 with your commit d122865 (more elegant that #7)

Adtitionnaly space indentation fix is also a good thing.

Would you like share your solutions with us ?

Thanks :)