```return this.get('javascriptEnabled')``` is more on the opinion of @n1k0 as far as I understand but not related to this pull request.

Your second proposal (for now) have my +1 ;)