diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 12:35:32 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 12:35:32 +0100 |
commit | 75f692748d853d38494ba93ff15f98475b6c2da7 (patch) | |
tree | 0ea42ad38d44fd5af0960363c01b9931ea9ca248 /app/assets/javascripts/merge_conflicts/mixins | |
parent | 7fc47faeb6dc5d92a69ddb8c22a8b2fd4dda2247 (diff) | |
download | gitlab-ce-75f692748d853d38494ba93ff15f98475b6c2da7.tar.gz |
Removes merge conflicts vue code from globalnamespace
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/mixins')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js | 20 | ||||
-rw-r--r-- | app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js | 32 |
2 files changed, 20 insertions, 32 deletions
diff --git a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js index 53e000d7e9e..364ae2b2688 100644 --- a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js +++ b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js @@ -1,13 +1,7 @@ -/* eslint-disable no-param-reassign, comma-dangle */ - -((global) => { - global.mergeConflicts = global.mergeConflicts || {}; - - global.mergeConflicts.actions = { - methods: { - handleSelected(file, sectionId, selection) { - gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection); - } - } - }; -})(window.gl || (window.gl = {})); +export default { + methods: { + handleSelected(file, sectionId, selection) { + gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection); + }, + }, +}; diff --git a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js index 0f475f62ee6..d25032fb142 100644 --- a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js +++ b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js @@ -1,19 +1,13 @@ -/* eslint-disable no-param-reassign, quote-props, comma-dangle */ - -((global) => { - global.mergeConflicts = global.mergeConflicts || {}; - - global.mergeConflicts.utils = { - methods: { - lineCssClass(line) { - return { - 'head': line.isHead, - 'origin': line.isOrigin, - 'match': line.hasMatch, - 'selected': line.isSelected, - 'unselected': line.isUnselected - }; - } - } - }; -})(window.gl || (window.gl = {})); +export default { + methods: { + lineCssClass(line) { + return { + head: line.isHead, + origin: line.isOrigin, + match: line.hasMatch, + selected: line.isSelected, + unselected: line.isUnselected, + }; + }, + }, +}; |