From 084632a985b32b1452663437410a37e624a7dbff Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Fri, 13 Jun 2014 16:52:49 -0700 Subject: [PATCH] Rename Selection(s)Component to Highlight(s)Component --- spec/editor-component-spec.coffee | 2 +- ...ion-component.coffee => highlight-component.coffee} | 4 ++-- ...ns-component.coffee => highlights-component.coffee} | 10 +++++----- src/lines-component.coffee | 4 ++-- src/react-editor-view.coffee | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/{selection-component.coffee => highlight-component.coffee} (96%) rename src/{selections-component.coffee => highlights-component.coffee} (71%) diff --git a/spec/editor-component-spec.coffee b/spec/editor-component-spec.coffee index 3e1d5df50..5bc7f1011 100644 --- a/spec/editor-component-spec.coffee +++ b/spec/editor-component-spec.coffee @@ -232,7 +232,7 @@ describe "EditorComponent", -> editor.setText("a\0b") expect(editor.pixelPositionForScreenPosition([0, Infinity]).left).toEqual 2 * charWidth - fdescribe "gutter rendering", -> + describe "gutter rendering", -> [gutter] = [] lineNumberHasClass = (screenRow, klass) -> diff --git a/src/selection-component.coffee b/src/highlight-component.coffee similarity index 96% rename from src/selection-component.coffee rename to src/highlight-component.coffee index 9db81ab1e..acd75021c 100644 --- a/src/selection-component.coffee +++ b/src/highlight-component.coffee @@ -2,8 +2,8 @@ React = require 'react-atom-fork' {div} = require 'reactionary-atom-fork' module.exports = -SelectionComponent = React.createClass - displayName: 'SelectionComponent' +HighlightComponent = React.createClass + displayName: 'HighlightComponent' render: -> {editor, screenRange, lineHeightInPixels} = @props diff --git a/src/selections-component.coffee b/src/highlights-component.coffee similarity index 71% rename from src/selections-component.coffee rename to src/highlights-component.coffee index 0d4484421..99895b2b3 100644 --- a/src/selections-component.coffee +++ b/src/highlights-component.coffee @@ -1,21 +1,21 @@ React = require 'react-atom-fork' {div} = require 'reactionary-atom-fork' {isEqualForProperties} = require 'underscore-plus' -SelectionComponent = require './selection-component' +HighlightComponent = require './highlight-component' module.exports = -SelectionsComponent = React.createClass - displayName: 'SelectionsComponent' +HighlightsComponent = React.createClass + displayName: 'HighlightsComponent' render: -> - div className: 'selections', @renderSelections() + div className: 'highlights', @renderSelections() renderSelections: -> {editor, selectionScreenRanges, lineHeightInPixels} = @props selectionComponents = [] for selectionId, screenRange of selectionScreenRanges - selectionComponents.push(SelectionComponent({key: selectionId, screenRange, editor, lineHeightInPixels})) + selectionComponents.push(HighlightComponent({key: selectionId, screenRange, editor, lineHeightInPixels})) selectionComponents componentWillMount: -> diff --git a/src/lines-component.coffee b/src/lines-component.coffee index bbe2be24e..f2ca50cb5 100644 --- a/src/lines-component.coffee +++ b/src/lines-component.coffee @@ -3,7 +3,7 @@ React = require 'react-atom-fork' {debounce, isEqual, isEqualForProperties, multiplyString, toArray} = require 'underscore-plus' {$$} = require 'space-pen' -SelectionsComponent = require './selections-component' +HighlightsComponent = require './highlights-component' DummyLineNode = $$(-> @div className: 'line', style: 'position: absolute; visibility: hidden;', => @span 'x')[0] AcceptFilter = {acceptNode: -> NodeFilter.FILTER_ACCEPT} @@ -22,7 +22,7 @@ LinesComponent = React.createClass WebkitTransform: "translate3d(#{-scrollLeft}px, #{-scrollTop}px, 0px)" div {className: 'lines editor-colors', style}, - SelectionsComponent({editor, selectionScreenRanges, lineHeightInPixels, defaultCharWidth}) if @isMounted() + HighlightsComponent({editor, selectionScreenRanges, lineHeightInPixels, defaultCharWidth}) if @isMounted() componentWillMount: -> @measuredLines = new WeakSet diff --git a/src/react-editor-view.coffee b/src/react-editor-view.coffee index 0b8b88c3a..6667b4ecb 100644 --- a/src/react-editor-view.coffee +++ b/src/react-editor-view.coffee @@ -36,7 +36,7 @@ class ReactEditorView extends View node = @component.getDOMNode() @scrollView = $(node).find('.scroll-view') - @underlayer = $(node).find('.selections').addClass('underlayer') + @underlayer = $(node).find('.highlights').addClass('underlayer') @overlayer = $(node).find('.lines').addClass('overlayer') @hiddenInput = $(node).find('.hidden-input')