fix showCancel option
Merge branch 'wong2-master'
re-minify