Also fix dialog position 'right'

1 files changed, 7 insertions, 2 deletions

diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index b28631ba7..f96366ee8 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -39,8 +39,13 @@ class jqueryui extends rcube_plugin
             // patch dialog position function in order to fully fit the close button into the window
             $rcmail->output->add_script("jQuery.extend(jQuery.ui.dialog.prototype.options.position, {
                 using: function(pos) {
-                    var topOffset = jQuery(this).css(pos).offset().top - 12;
-                    if (topOffset < 0) jQuery(this).css('top', pos.top - topOffset);
+                    var me = jQuery(this),
+                        offset = me.css(pos).offset(),
+                        topOffset = offset.top - 12;
+                    if (topOffset < 0)
+                        me.css('top', pos.top - topOffset);
+                    if (offset.left + me.outerWidth() + 12 > jQuery(window).width())
+                        me.css('left', pos.left - 12);
                 }
             });", 'foot');
         }