Fix expressions of JavaScript
Merge branch 'javascript'