summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-23 12:27:20 +0000
committerPhil Hughes <me@iamphill.com>2018-03-23 12:27:20 +0000
commite10bd302a5f1739c9f43b12798b8c29d19690a64 (patch)
tree0c5629d450bfbc3eea96d3aace32cb283458f36e
parent49e871680ce4ca4ef947916da4969cc4e80991eb (diff)
downloadgitlab-ce-ide-diff-cursor.tar.gz
Disable cursor for review mode in the IDEide-diff-cursor
Also disables occurrences highlights & the line highlight for the review mode. Closes #44307
-rw-r--r--app/assets/javascripts/ide/lib/editor.js4
-rw-r--r--app/assets/stylesheets/pages/repo.scss4
-rw-r--r--spec/javascripts/ide/lib/editor_spec.js4
3 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index 38de2fe2b27..887dd7e39b1 100644
--- a/app/assets/javascripts/ide/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -65,6 +65,10 @@ export default class Editor {
(this.instance = this.monaco.editor.createDiffEditor(domElement, {
...defaultEditorOptions,
readOnly: true,
+ quickSuggestions: false,
+ occurrencesHighlight: false,
+ renderLineHighlight: 'none',
+ hideCursorInOverviewRuler: true,
})),
);
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 7a8fbfc517d..57b995adb64 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -290,6 +290,10 @@
.margin-view-overlays .delete-sign {
opacity: 0.4;
}
+
+ .cursors-layer {
+ display: none;
+ }
}
}
diff --git a/spec/javascripts/ide/lib/editor_spec.js b/spec/javascripts/ide/lib/editor_spec.js
index d6df35c90e8..3c48d94d17a 100644
--- a/spec/javascripts/ide/lib/editor_spec.js
+++ b/spec/javascripts/ide/lib/editor_spec.js
@@ -74,6 +74,10 @@ describe('Multi-file editor library', () => {
},
readOnly: true,
scrollBeyondLastLine: false,
+ quickSuggestions: false,
+ occurrencesHighlight: false,
+ renderLineHighlight: 'none',
+ hideCursorInOverviewRuler: true,
},
);
});