BZ-12025: scroll directive refactor#2

Signed-off-by: Paden <padenportillo@gmail.com>