Charts: Updated to the latsest v4.0 core code
Merge pull request #3839 from pjackson28/fixjshintissues

Charts: Updated to the latest v4.0 core code