fixed javascript onresize event
Merge branch 'feature'