Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6141816c
Commit
6141816c
authored
Oct 05, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use plain JS to get elements and data and values
parent
8fd7a594
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
...javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+5
-5
No files found.
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
View file @
6141816c
...
...
@@ -10,11 +10,11 @@
$(() => {
const INTERACTIVE_RESOLVE_MODE = 'interactive';
const
$conflicts = $(document.getElementById('conflicts')
);
const
conflictsEl = document.querySelector('#conflicts'
);
const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore;
const mergeConflictsService = new gl.mergeConflicts.mergeConflictsService({
conflictsPath:
$conflicts.data('conflictsPath')
,
resolveConflictsPath:
$conflicts.data('resolveConflictsPath')
conflictsPath:
conflictsEl.dataset.conflictsPath
,
resolveConflictsPath:
conflictsEl.dataset.resolveConflictsPath
});
gl.MergeConflictsResolverApp = new Vue({
...
...
@@ -48,7 +48,7 @@ $(() => {
mergeConflictsStore.setLoadingState(false);
this.$nextTick(() => {
$
conflicts.find('.js-syntax-highlight'
).syntaxHighlight();
$
(conflictsEl.querySelectorAll('.js-syntax-highlight')
).syntaxHighlight();
});
});
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment