fix calendar swap on setOptions
Merge pull request #483 from RustyToms/fix_calendar_open_right

fix calendar swap on setOptions