reindent
preview not scrollable if focuInTextField
Merge branch 'master' into directive-tests