diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2015-03-25 09:48:51 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2015-03-25 09:48:51 +0100 |
| commit | 8838b88a0fc8bff42993390fe64f09637ce4c2df (patch) | |
| tree | 9be9b7e3ded28834311bad55939761312b12c0c3 | |
| parent | 199aebfe3024459c89b9dc92e67768972bb99b0c (diff) | |
| parent | e738f3a729522b648b5148e3f3e0bbf15165b9a9 (diff) | |
| download | rpg-8838b88a0fc8bff42993390fe64f09637ce4c2df.tar.gz rpg-8838b88a0fc8bff42993390fe64f09637ce4c2df.tar.bz2 | |
Merge pull request #1083 from chang-zhao/master
Update toolbar.js
| -rw-r--r-- | lib/scripts/toolbar.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 1bb02b406..a5f831ade 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -243,7 +243,20 @@ function pickerToggle(pickerid,$btn){ } else { $picker.addClass('a11y').attr('aria-hidden', 'true'); } - $picker.offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3}); + var picker_left = pos.left + 3, + picker_width = $picker.width(), + window_width = jQuery(window).width(); + if (picker_width > 300) { + $picker.css("max-width", "300"); + picker_width = 300; + } + if ((picker_left + picker_width + 40) > window_width) { + picker_left = window_width - picker_width - 40; + } + if (picker_left < 0) { + picker_left = 0; + } + $picker.offset({left: picker_left, top: pos.top+$btn[0].offsetHeight+3}); } /** |