diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-12 10:55:46 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-12 10:55:46 +0000 |
| commit | bd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc (patch) | |
| tree | 7404d154addee886ec82b31451df60cec9babb2d /app/assets/javascripts/lib/utils/common_utils.js | |
| parent | 57e84c305f124b7e68fb7e4c22d34a247a13d3dd (diff) | |
| parent | f248be7257e82d15fa6441c551e4314bd36343d4 (diff) | |
| download | gitlab-ce-bd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc.tar.gz | |
Merge branch 'remove-jquery-globals' into 'master'
Require jQuery to be explicitly imported
See merge request gitlab-org/gitlab-ce!17674
Diffstat (limited to 'app/assets/javascripts/lib/utils/common_utils.js')
| -rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index ed90db317df..0830ebe9e4e 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -1,4 +1,4 @@ -import jQuery from 'jquery'; +import $ from 'jquery'; import Cookies from 'js-cookie'; import axios from './axios_utils'; import { getLocationHash } from './url_utility'; @@ -142,7 +142,7 @@ export const isMetaClick = e => e.metaKey || e.ctrlKey || e.which === 2; export const scrollToElement = (element) => { let $el = element; - if (!(element instanceof jQuery)) { + if (!(element instanceof $)) { $el = $(element); } const top = $el.offset().top; |