Commit 6141816c authored by Alfredo Sumaran's avatar Alfredo Sumaran

Use plain JS to get elements and data and values

parent 8fd7a594
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
$(() => { $(() => {
const INTERACTIVE_RESOLVE_MODE = 'interactive'; const INTERACTIVE_RESOLVE_MODE = 'interactive';
const $conflicts = $(document.getElementById('conflicts')); const conflictsEl = document.querySelector('#conflicts');
const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore; const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore;
const mergeConflictsService = new gl.mergeConflicts.mergeConflictsService({ const mergeConflictsService = new gl.mergeConflicts.mergeConflictsService({
conflictsPath: $conflicts.data('conflictsPath'), conflictsPath: conflictsEl.dataset.conflictsPath,
resolveConflictsPath: $conflicts.data('resolveConflictsPath') resolveConflictsPath: conflictsEl.dataset.resolveConflictsPath
}); });
gl.MergeConflictsResolverApp = new Vue({ gl.MergeConflictsResolverApp = new Vue({
el: '#conflicts', el: '#conflicts',
data: mergeConflictsStore.state, data: mergeConflictsStore.state,
components: { components: {
...@@ -48,7 +48,7 @@ $(() => { ...@@ -48,7 +48,7 @@ $(() => {
mergeConflictsStore.setLoadingState(false); mergeConflictsStore.setLoadingState(false);
this.$nextTick(() => { this.$nextTick(() => {
$conflicts.find('.js-syntax-highlight').syntaxHighlight(); $(conflictsEl.querySelectorAll('.js-syntax-highlight')).syntaxHighlight();
}); });
}); });
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment