Now using DCJ's cleaner fix

Refactored to reuse calculateTextWidth
Merge branch 'master' of https://github.com/hardillb/node-red