From 09471ee2d220c0a6090f4d8d62525e21b67beded Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 7 Jun 2018 15:30:27 -0500 Subject: fix bug in call to monaco.Uri. first param is checked with `typeof param === 'object'` which is true for `null` due to a JS quirk --- app/assets/javascripts/ide/lib/common/model.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js index e5149b1f3ad..ecacc11d77c 100644 --- a/app/assets/javascripts/ide/lib/common/model.js +++ b/app/assets/javascripts/ide/lib/common/model.js @@ -13,12 +13,12 @@ export default class Model { (this.originalModel = this.monaco.editor.createModel( head ? head.content : this.file.raw, undefined, - new this.monaco.Uri(null, null, `original/${this.path}`), + new this.monaco.Uri(false, false, `original/${this.path}`), )), (this.model = this.monaco.editor.createModel( this.content, undefined, - new this.monaco.Uri(null, null, this.path), + new this.monaco.Uri(false, false, this.path), )), ); if (this.file.mrChange) { @@ -26,7 +26,7 @@ export default class Model { (this.baseModel = this.monaco.editor.createModel( this.file.baseRaw, undefined, - new this.monaco.Uri(null, null, `target/${this.path}`), + new this.monaco.Uri(false, false, `target/${this.path}`), )), ); } -- cgit v1.2.1