fix #911/3
upgrade JS lib.
Fix #987/2
Fix #987/1
Fix #987/3