diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-27 20:13:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-27 20:13:31 +0000 |
| commit | 8ba7780e66303abc30ede6a4342f805edc66ce8d (patch) | |
| tree | b711ad93f720ed717acee27a88f6ee67d6429752 | |
| parent | edd8ee49b4a242000e40661afe560af3f7714579 (diff) | |
| parent | 0aff703f9824cefd0c2fd8221bd2295e952699bb (diff) | |
| download | horizon-8ba7780e66303abc30ede6a4342f805edc66ce8d.tar.gz | |
Merge "Change how scrollShift is calculated" into stable/havana
| -rw-r--r-- | horizon/static/horizon/js/horizon.modals.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/horizon/static/horizon/js/horizon.modals.js b/horizon/static/horizon/js/horizon.modals.js index e07bd4d16..ac00710af 100644 --- a/horizon/static/horizon/js/horizon.modals.js +++ b/horizon/static/horizon/js/horizon.modals.js @@ -135,7 +135,7 @@ horizon.addInitFunction(function() { $(document).on('show', '.modal', function (evt) { // Filter out indirect triggers of "show" from (for example) tabs. if ($(evt.target).hasClass("modal")) { - var scrollShift = $('body').scrollTop(), + var scrollShift = $('body').scrollTop() || $('html').scrollTop(), $this = $(this), topVal = $this.css('top'); $this.css('top', scrollShift + parseInt(topVal, 10)); |