Test case for issue 5481
minor improvements and code cleanup for canvas.js
Merge pull request #5562 from timvandermeij/progression-tests

Test case for issue 5481
Merge pull request #5446 from CodingFabian/minorImprovementsInCanvasjs

minor improvements and code cleanup for canvas.js