Converted to now use AngularJS