Revert "fixed issue on multiple pop-up window definition"

This reverts commit 976f078aebc5181d2ccbf595ba836af27ba76015.
fixed multiple popup code issue