Updated to take promise of angular-promise-tracker vs standard promise