diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 63c9a06c..9a1feab8 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -312,11 +312,11 @@ uls.$menu.find( '.uls-search-wrapper' ).wrap( $wrap ); uls.$menu.find( '.uls-search-wrapper-wrapper' ).prepend( $back ); - if ( $( '.uls-settings-trigger' ).offset().left > $( window ).width() / 2 ) { - uls.$menu.removeClass( 'selector-left' ).addClass( 'selector-right' ); - } else { - uls.$menu.removeClass( 'selector-right' ).addClass( 'selector-left' ); - } + // Copy callout related classes from parent + // eslint-disable-next-line no-jquery/no-class-state + uls.$menu.toggleClass( 'selector-left', displaySettings.$parent.$window.hasClass( 'selector-left' ) ); + // eslint-disable-next-line no-jquery/no-class-state + uls.$menu.toggleClass( 'selector-right', displaySettings.$parent.$window.hasClass( 'selector-right' ) ); }, onVisible: function () { var $parent; diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js index f87ab72c..099e2a1a 100644 --- a/resources/js/ext.uls.inputsettings.js +++ b/resources/js/ext.uls.inputsettings.js @@ -351,11 +351,11 @@ uls.$menu.find( '.uls-search-wrapper' ).wrap( $wrap ); uls.$menu.find( '.uls-search-wrapper-wrapper' ).prepend( $back ); - if ( $( '.uls-settings-trigger' ).offset().left > $( window ).width() / 2 ) { - uls.$menu.removeClass( 'selector-left' ).addClass( 'selector-right' ); - } else { - uls.$menu.removeClass( 'selector-right' ).addClass( 'selector-left' ); - } + // Copy callout related classes from parent + // eslint-disable-next-line no-jquery/no-class-state + uls.$menu.toggleClass( 'selector-left', inputSettings.$parent.$window.hasClass( 'selector-left' ) ); + // eslint-disable-next-line no-jquery/no-class-state + uls.$menu.toggleClass( 'selector-right', inputSettings.$parent.$window.hasClass( 'selector-right' ) ); }, onVisible: function () { var $parent; diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js index cc0c5c77..9004b4d5 100644 --- a/resources/js/ext.uls.interface.js +++ b/resources/js/ext.uls.interface.js @@ -296,7 +296,6 @@ if ( ulsTriggerOffset.left > $( window ).width() / 2 ) { this.left = ulsTriggerOffset.left - this.$window.width() - caretRadius; this.$window.removeClass( 'selector-left' ).addClass( 'selector-right' ); - } else { this.left = ulsTriggerOffset.left + ulsTriggerWidth + caretRadius; this.$window.removeClass( 'selector-right' ).addClass( 'selector-left' );