Finish Angularjs work

Cancelled