Updated/New Composer support for HTML_Javascript

See diff for full changes