Convert $timeout to $apply; Also picked up a few resolve()'s not being applied