diff options
| author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-17 04:10:27 +0400 |
|---|---|---|
| committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-17 04:10:27 +0400 |
| commit | e4ceaf9911e98b64b44a42ad9a1d52a85891dd6f (patch) | |
| tree | fd3d34a6aa622faeedd39b02ef573289ed4fd190 /plugins/CoreVisualizations | |
| parent | cdb1c043692c92c6e9a5d9a00a231d4515bb7075 (diff) | |
Refs #4077, fix series picker popover placement logic & remove subtable handling from Treemap.
Diffstat (limited to 'plugins/CoreVisualizations')
| -rw-r--r-- | plugins/CoreVisualizations/javascripts/seriesPicker.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/CoreVisualizations/javascripts/seriesPicker.js b/plugins/CoreVisualizations/javascripts/seriesPicker.js index 705d7e556f..2a722cd539 100644 --- a/plugins/CoreVisualizations/javascripts/seriesPicker.js +++ b/plugins/CoreVisualizations/javascripts/seriesPicker.js @@ -321,14 +321,14 @@ * Positions the popover element. */ _positionPopover: function () { - var popover = this._pickerPopover, + var $body = $('body'), + popover = this._pickerPopover, pickerLink = this.domElem, - seriesPicker = pickerLink.parent(), - plotWidth = seriesPicker.width(), - offsetRight = seriesPicker.offset().left + plotWidth + pickerLinkLeft = pickerLink.offset().left, + bodyRight = $body.offset().left + $body.width() ; - $('body').prepend(popover); + $body.prepend(popover); var neededSpace = popover.outerWidth() + 10; @@ -339,10 +339,11 @@ // try to display popover to the right var margin = parseInt(pickerLink.css('margin-left')) - 4; - - if (margin + neededSpace < plotWidth + + var popoverRight = pickerLinkLeft + margin + neededSpace; + if (popoverRight < bodyRight // make sure it's not too far to the left - || offsetRight - margin - neededSpace < 0 + || popoverRight < 0 ) { popover.css('margin-left', (linkOffset.left - 4) + 'px').show(); } else { |