diff options
author | Kohei Yoshino <kohei.yoshino@gmail.com> | 2018-01-08 15:22:45 +0100 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-01-08 15:22:45 +0100 |
commit | f86567c1f22f5d4dfa9bcc097efaef3ecb8b44bc (patch) | |
tree | f760021037129b07d8fe2565e4972e64eab014fb /extensions/BugModal/web/common_bug_modal.js | |
parent | 19e368ee6d070699e52c845c324143568f08444a (diff) | |
download | bugzilla-f86567c1f22f5d4dfa9bcc097efaef3ecb8b44bc.tar.gz bugzilla-f86567c1f22f5d4dfa9bcc097efaef3ecb8b44bc.tar.xz |
Bug 1427800 - Wrong anchor scrolling with old UI
Diffstat (limited to 'extensions/BugModal/web/common_bug_modal.js')
-rw-r--r-- | extensions/BugModal/web/common_bug_modal.js | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/extensions/BugModal/web/common_bug_modal.js b/extensions/BugModal/web/common_bug_modal.js index 160f922cc..dc91824f6 100644 --- a/extensions/BugModal/web/common_bug_modal.js +++ b/extensions/BugModal/web/common_bug_modal.js @@ -424,7 +424,7 @@ $(function() { var rbs = $("#readable-bug-status"); var rbs_text = bugzillaReadableStatus.readable(rbs.data('readable-bug-status')); rbs.text(rbs_text); - + if (BUGZILLA.user.id === 0) return; // @@ -700,7 +700,7 @@ $(function() { $('#needinfo-scroll') .click(function(event) { event.preventDefault(); - $.scrollTo($('#needinfo_role'), function() { $('#needinfo_role').focus(); }); + $.scrollTo($('#needinfo_container'), function() { $('#needinfo_role').focus(); }); }); // knob @@ -831,10 +831,13 @@ $(function() { // remove embedded links to attachment details reply_text = reply_text.replace(/(attachment\s+\d+)(\s+\[[^\[\n]+\])+/gi, '$1'); - if ($('#comment').val() != reply_text) { - $('#comment').val($('#comment').val() + reply_text); - } - $.scrollTo($('#comment'), function() { $('#comment').focus(); }); + $.scrollTo($('#comment'), function() { + if ($('#comment').val() != reply_text) { + $('#comment').val($('#comment').val() + reply_text); + } + + $('#comment').focus(); + }); }); // add comment --> private @@ -1356,18 +1359,15 @@ $(function() { let $target; if (typeof target === 'string') { - $target = $('#' + target); + $target = document.getElementById(target); window.location.hash = target; } else { - $target = target; - } - - if ($target.length) { - $('main').scrollTop(Math.round($target.position().top) - 20); + // Use raw DOM node instead of jQuery + $target = target.get(0); } - if (complete) { - complete(); + if ($target) { + scroll_element_into_view($target, complete); } } |