Merge pull request #1244 from mlutfy/4.3-ts

Semi-fix {ts} usage: the mix of js/smarty here isn't very practical.