refactored delegation of wrapper events in Drawer prototype