summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/lib
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-23 11:16:42 +0000
committerPhil Hughes <me@iamphill.com>2018-03-28 14:08:31 +0100
commitc5c7baec60184b89dad63a8123c4c0661256f83e (patch)
tree3830618419dffda347412185d81982e4b54145ce /app/assets/javascripts/ide/lib
parent5dbb7a2519d6eaed634aeee6c78502941ff527fb (diff)
downloadgitlab-ce-c5c7baec60184b89dad63a8123c4c0661256f83e.tar.gz
opens the next open tab correctly
fixes model being cached as undefined fixed open files not being correctly mutated
Diffstat (limited to 'app/assets/javascripts/ide/lib')
-rw-r--r--app/assets/javascripts/ide/lib/common/model_manager.js2
-rw-r--r--app/assets/javascripts/ide/lib/diff/controller.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/lib/common/model_manager.js b/app/assets/javascripts/ide/lib/common/model_manager.js
index 12f1389f559..9a0baffceee 100644
--- a/app/assets/javascripts/ide/lib/common/model_manager.js
+++ b/app/assets/javascripts/ide/lib/common/model_manager.js
@@ -23,7 +23,7 @@ export default class ModelManager {
}
const model = new Model(this.monaco, file);
- this.models.set(model.key, model);
+ this.models.set(model.path, model);
this.disposable.add(model);
eventHub.$on(
diff --git a/app/assets/javascripts/ide/lib/diff/controller.js b/app/assets/javascripts/ide/lib/diff/controller.js
index 0447a1d13f8..5408cb97199 100644
--- a/app/assets/javascripts/ide/lib/diff/controller.js
+++ b/app/assets/javascripts/ide/lib/diff/controller.js
@@ -44,7 +44,7 @@ export default class DirtyDiffController {
computeDiff(model) {
this.dirtyDiffWorker.postMessage({
- key: model.key,
+ key: model.path,
originalContent: model.getOriginalModel().getValue(),
newContent: model.getModel().getValue(),
});