[Upg] refactoring js
[Upg] remove useless codes
Merge branch '1.1' into 1.2
Merge branch '1.2'