From eba18092fb84560d433ccd3d0eec38ef668a4092 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 6 Oct 2015 14:24:24 +0200 Subject: [PATCH] Don't use atom globals in LinesComponent --- src/lines-component.coffee | 4 ++-- src/lines-tile-component.coffee | 4 ++-- src/text-editor-component.coffee | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lines-component.coffee b/src/lines-component.coffee index 0cda90d5c..87e4e235e 100644 --- a/src/lines-component.coffee +++ b/src/lines-component.coffee @@ -13,7 +13,7 @@ module.exports = class LinesComponent extends TiledComponent placeholderTextDiv: null - constructor: ({@presenter, @hostElement, @useShadowDOM, visible, @domElementPool}) -> + constructor: ({@presenter, @hostElement, @useShadowDOM, visible, @domElementPool, @assert}) -> @domNode = document.createElement('div') @domNode.classList.add('lines') @tilesNode = document.createElement("div") @@ -63,7 +63,7 @@ class LinesComponent extends TiledComponent @oldState.indentGuidesVisible = @newState.indentGuidesVisible - buildComponentForTile: (id) -> new LinesTileComponent({id, @presenter, @domElementPool}) + buildComponentForTile: (id) -> new LinesTileComponent({id, @presenter, @domElementPool, @assert}) buildEmptyState: -> {tiles: {}} diff --git a/src/lines-tile-component.coffee b/src/lines-tile-component.coffee index 627630e03..723591d9c 100644 --- a/src/lines-tile-component.coffee +++ b/src/lines-tile-component.coffee @@ -13,7 +13,7 @@ cloneObject = (object) -> module.exports = class LinesTileComponent - constructor: ({@presenter, @id, @domElementPool}) -> + constructor: ({@presenter, @id, @domElementPool, @assert}) -> @tokenIterator = new TokenIterator @measuredLines = new Set @lineNodesByLineId = {} @@ -361,7 +361,7 @@ class LinesTileComponent rangeForMeasurement.setEnd(textNode, i + charLength) else rangeForMeasurement.setEnd(textNode, textNodeLength) - atom.assert false, "Expected index to be less than the length of text node while measuring", (error) => + @assert false, "Expected index to be less than the length of text node while measuring", (error) => editor = @presenter.model screenRow = tokenizedLine.screenRow bufferRow = editor.bufferRowForScreenRow(screenRow) diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee index e207a4deb..d36cbbb05 100644 --- a/src/text-editor-component.coffee +++ b/src/text-editor-component.coffee @@ -85,7 +85,7 @@ class TextEditorComponent @hiddenInputComponent = new InputComponent @scrollViewNode.appendChild(@hiddenInputComponent.getDomNode()) - @linesComponent = new LinesComponent({@presenter, @hostElement, @useShadowDOM, @domElementPool}) + @linesComponent = new LinesComponent({@presenter, @hostElement, @useShadowDOM, @domElementPool, @assert}) @scrollViewNode.appendChild(@linesComponent.getDomNode()) @horizontalScrollbarComponent = new ScrollbarComponent({orientation: 'horizontal', onScroll: @onHorizontalScroll})