Modded component.js to emit a broadcast event
Merge fix