diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-28 13:12:13 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 22:16:35 +0300 |
| commit | a8ac9089afb664e569b34c61dc6782d20d1019d1 (patch) | |
| tree | bada4e3a7ef3a79831ea3faec559b02c674a5788 /app/assets/javascripts/merge_conflicts/components | |
| parent | e84f959ae47e35eaebdc6c0adaf1e089326601ce (diff) | |
Refactor JS code
- Use a store base object to manage application state.
- Add a service to handle ajax requests.
- Load code only when needed
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 index abdf73febb4..49d30f6e9e8 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 @@ -1,5 +1,8 @@ ((global) => { - global.diffFileEditor = Vue.extend({ + + global.mergeConflicts = global.mergeConflicts || {}; + + global.mergeConflicts.diffFileEditor = Vue.extend({ props: ['file', 'loadFile'], template: '#diff-file-editor', data() { |