diff options
author | Phil Hughes <me@iamphill.com> | 2018-03-28 13:05:26 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-03-28 14:08:38 +0100 |
commit | 029f7e6cd87ec0d59b85f12b57ee3c3a889dac1f (patch) | |
tree | f41cea322d4731466e1d768aa4c96c3c97663f2d /app/assets/javascripts/ide/lib | |
parent | af20c4423c85c263f34a09c276a7bb917e3554a5 (diff) | |
download | gitlab-ce-029f7e6cd87ec0d59b85f12b57ee3c3a889dac1f.tar.gz |
removed file changes that have no changes to make diff easier
simplified SET_FILE_ACTIVE openFiles map
use .find in router so that it returns early instead of looping all the
values
Diffstat (limited to 'app/assets/javascripts/ide/lib')
-rw-r--r-- | app/assets/javascripts/ide/lib/diff/controller.js | 13 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/diff/diff_worker.js | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/lib/diff/controller.js b/app/assets/javascripts/ide/lib/diff/controller.js index 1af358a6467..b136545ad11 100644 --- a/app/assets/javascripts/ide/lib/diff/controller.js +++ b/app/assets/javascripts/ide/lib/diff/controller.js @@ -3,7 +3,7 @@ import { throttle } from 'underscore'; import DirtyDiffWorker from './diff_worker'; import Disposable from '../common/disposable'; -export const getDiffChangeType = change => { +export const getDiffChangeType = (change) => { if (change.modified) { return 'modified'; } else if (change.added) { @@ -16,12 +16,15 @@ export const getDiffChangeType = change => { }; export const getDecorator = change => ({ - range: new monaco.Range(change.lineNumber, 1, change.endLineNumber, 1), + range: new monaco.Range( + change.lineNumber, + 1, + change.endLineNumber, + 1, + ), options: { isWholeLine: true, - linesDecorationsClassName: `dirty-diff dirty-diff-${getDiffChangeType( - change, - )}`, + linesDecorationsClassName: `dirty-diff dirty-diff-${getDiffChangeType(change)}`, }, }); diff --git a/app/assets/javascripts/ide/lib/diff/diff_worker.js b/app/assets/javascripts/ide/lib/diff/diff_worker.js index ba9e270d5f0..e74c4046330 100644 --- a/app/assets/javascripts/ide/lib/diff/diff_worker.js +++ b/app/assets/javascripts/ide/lib/diff/diff_worker.js @@ -1,6 +1,6 @@ import { computeDiff } from './diff'; -self.addEventListener('message', e => { +self.addEventListener('message', (e) => { const data = e.data; self.postMessage({ |