Remove blocking-click, impelement own directive that uses promise instead of watching for ajax calls.