fix js error
Merge branch 'origin/develop'