diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-02 19:33:33 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-02 19:33:33 +0000 |
| commit | c846d3610912bed47404b31c5bc2f190ecbdb93b (patch) | |
| tree | dd98634af5c2796a6435afe6c1e2a7254d981c8b /app/assets/javascripts/diff.js.es6 | |
| parent | bb06183d3d8725b328d9f6f05bf5c4a74b93fb36 (diff) | |
| parent | b2e5c423d7080644132c70650bc707feb41cd5a9 (diff) | |
| download | gitlab-ce-update-import-export-docs.tar.gz | |
Merge branch 'master' into 'update-import-export-docs'update-import-export-docs
# Conflicts:
# doc/user/project/settings/import_export.md
Diffstat (limited to 'app/assets/javascripts/diff.js.es6')
| -rw-r--r-- | app/assets/javascripts/diff.js.es6 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/diff.js.es6 b/app/assets/javascripts/diff.js.es6 index 5e1a4c948aa..35a029194d0 100644 --- a/app/assets/javascripts/diff.js.es6 +++ b/app/assets/javascripts/diff.js.es6 @@ -1,5 +1,7 @@ /* eslint-disable class-methods-use-this */ +//= require lib/utils/url_utility */ + (() => { const UNFOLD_COUNT = 20; @@ -104,11 +106,11 @@ } highlighSelectedLine() { + const hash = gl.utils.getLocationHash(); const $diffFiles = $('.diff-file'); $diffFiles.find('.hll').removeClass('hll'); - if (window.location.hash !== '') { - const hash = window.location.hash.replace('#', ''); + if (hash) { $diffFiles .find(`tr#${hash}:not(.match) td, td#${hash}, td[data-line-code="${hash}"]`) .addClass('hll'); |