dirctive.js update
Merge branch 'uidev'