diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-10-06 23:36:15 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-10-11 19:02:55 +0300 |
| commit | 03cd536b54b148eb59cabfa735c0ec6820fc2266 (patch) | |
| tree | 3a872a59747df68a14fa432699c6dceafff40de0 /app/assets | |
| parent | fe11c5fde7c0c748eb370f09715114fd5a7d8577 (diff) | |
Cleanup data-page attribute after each Karma test
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/users_select.js | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index d479f7ed682..84602cf9207 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -285,7 +285,7 @@ import CreateLabelDropdown from './create_label'; }, hidden: function() { var isIssueIndex, isMRIndex, page, selectedLabels; - page = $('body').data('page'); + page = $('body').attr('data-page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = page === 'projects:merge_requests:index'; $selectbox.hide(); @@ -325,7 +325,7 @@ import CreateLabelDropdown from './create_label'; $loading.fadeOut(); }; - page = $('body').data('page'); + page = $('body').attr('data-page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = page === 'projects:merge_requests:index'; diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index 423a25fbdfa..9f05cf16967 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -1,5 +1,5 @@ -export const getPagePath = (index = 0) => $('body').data('page').split(':')[index]; +export const getPagePath = (index = 0) => $('body').attr('data-page').split(':')[index]; export const isInGroupsPage = () => getPagePath() === 'groups'; diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 4675b1fcb8f..951d5e559b4 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -147,7 +147,7 @@ import _ from 'underscore'; const { $el, e } = options; let selected = options.selectedObj; var data, isIssueIndex, isMRIndex, isSelecting, page, boardsStore; - page = $('body').data('page'); + page = $('body').attr('data-page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = (page === page && page === 'projects:merge_requests:index'); isSelecting = (selected.name !== selectedMilestone); diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index cf7322ba1da..a40a6e29743 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -1257,7 +1257,7 @@ export default class Notes { } static checkMergeRequestStatus() { - if (getPagePath(1) === 'merge_requests') { + if (getPagePath(1) === 'merge_requests' && gl.mrWidget) { gl.mrWidget.checkStatus(); } } diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 73676bd6de7..a0883b32593 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -424,7 +424,7 @@ function UsersSelect(currentUser, els) { } var isIssueIndex, isMRIndex, page, selected; - page = $('body').data('page'); + page = $('body').attr('data-page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = (page === page && page === 'projects:merge_requests:index'); if ($dropdown.hasClass('js-filter-bulk-update') || $dropdown.hasClass('js-issuable-form-dropdown')) { |