[Gutter] Rename current references to 'Gutter' -> 'LineNumberGutter'

This commit is contained in:
Jess Lin 2015-03-04 15:15:04 -08:00
parent a6efa104db
commit fccc9ebee4
6 changed files with 20 additions and 20 deletions

View File

@ -578,10 +578,10 @@ describe "TextEditorComponent", ->
nextAnimationFrame()
expect(lineNumbersNode.style.backgroundColor).toBe 'rgb(255, 0, 0)'
it "hides or shows the gutter based on the '::isGutterVisible' property on the model and the global 'editor.showLineNumbers' config setting", ->
it "hides or shows the gutter based on the '::isLineNumberGutterVisible' property on the model and the global 'editor.showLineNumbers' config setting", ->
expect(component.gutterComponent?).toBe true
editor.setGutterVisible(false)
editor.setLineNumberGutterVisible(false)
nextAnimationFrame()
expect(componentNode.querySelector('.gutter')).toBeNull()
@ -591,7 +591,7 @@ describe "TextEditorComponent", ->
expect(componentNode.querySelector('.gutter')).toBeNull()
editor.setGutterVisible(true)
editor.setLineNumberGutterVisible(true)
nextAnimationFrame()
expect(componentNode.querySelector('.gutter')).toBeNull()

View File

@ -23,7 +23,7 @@ describe "TextEditorElement", ->
it "honors the 'gutter-hidden' attribute", ->
jasmineContent.innerHTML = "<atom-text-editor gutter-hidden>"
element = jasmineContent.firstChild
expect(element.getModel().isGutterVisible()).toBe false
expect(element.getModel().isLineNumberGutterVisible()).toBe false
it "honors the text content", ->
jasmineContent.innerHTML = "<atom-text-editor>testing</atom-text-editor>"

View File

@ -2166,10 +2166,10 @@ describe "TextEditorPresenter", ->
expect(lineNumberStateForScreenRow(presenter, 11).foldable).toBe false
describe ".visible", ->
it "is true iff the editor isn't mini, ::isGutterVisible is true on the editor, and 'editor.showLineNumbers' is enabled in config", ->
it "is true iff the editor isn't mini, ::isLineNumberGutterVisible is true on the editor, and 'editor.showLineNumbers' is enabled in config", ->
presenter = buildPresenter()
expect(editor.isGutterVisible()).toBe true
expect(editor.isLineNumberGutterVisible()).toBe true
expect(presenter.getState().gutter.visible).toBe true
expectStateUpdate presenter, -> editor.setMini(true)
@ -2178,10 +2178,10 @@ describe "TextEditorPresenter", ->
expectStateUpdate presenter, -> editor.setMini(false)
expect(presenter.getState().gutter.visible).toBe true
expectStateUpdate presenter, -> editor.setGutterVisible(false)
expectStateUpdate presenter, -> editor.setLineNumberGutterVisible(false)
expect(presenter.getState().gutter.visible).toBe false
expectStateUpdate presenter, -> editor.setGutterVisible(true)
expectStateUpdate presenter, -> editor.setLineNumberGutterVisible(true)
expect(presenter.getState().gutter.visible).toBe true
expectStateUpdate presenter, -> atom.config.set('editor.showLineNumbers', false)

View File

@ -100,7 +100,7 @@ class TextEditorElement extends HTMLElement
tabLength: 2
softTabs: true
mini: @hasAttribute('mini')
gutterVisible: not @hasAttribute('gutter-hidden')
lineNumberGutterVisible: not @hasAttribute('gutter-hidden')
placeholderText: @getAttribute('placeholder-text')
))

View File

@ -117,7 +117,7 @@ class TextEditorPresenter
@updateLinesState()
@updateGutterState()
@updateLineNumbersState()
@disposables.add @model.onDidChangeGutterVisible =>
@disposables.add @model.onDidChangeLineNumberGutterVisible =>
@updateGutterState()
@disposables.add @model.onDidAddDecoration(@didAddDecoration.bind(this))
@disposables.add @model.onDidAddCursor(@didAddCursor.bind(this))
@ -364,7 +364,7 @@ class TextEditorPresenter
return
updateGutterState: -> @batch "shouldUpdateGutterState", ->
@state.gutter.visible = not @model.isMini() and (@model.isGutterVisible() ? true) and @showLineNumbers
@state.gutter.visible = not @model.isMini() and (@model.isLineNumberGutterVisible() ? true) and @showLineNumbers
@state.gutter.maxLineNumberDigits = @model.getLineCount().toString().length
@state.gutter.backgroundColor = if @gutterBackgroundColor isnt "rgba(0, 0, 0, 0)"
@gutterBackgroundColor

View File

@ -73,7 +73,7 @@ class TextEditor extends Model
'autoDecreaseIndentForBufferRow', 'toggleLineCommentForBufferRow', 'toggleLineCommentsForBufferRows',
toProperty: 'languageMode'
constructor: ({@softTabs, initialLine, initialColumn, tabLength, softWrapped, @displayBuffer, buffer, registerEditor, suppressCursorCreation, @mini, @placeholderText, @gutterVisible}) ->
constructor: ({@softTabs, initialLine, initialColumn, tabLength, softWrapped, @displayBuffer, buffer, registerEditor, suppressCursorCreation, @mini, @placeholderText, @lineNumberGutterVisible}) ->
super
@emitter = new Emitter
@ -488,16 +488,16 @@ class TextEditor extends Model
onDidChangeMini: (callback) ->
@emitter.on 'did-change-mini', callback
setGutterVisible: (gutterVisible) ->
unless gutterVisible is @gutterVisible
@gutterVisible = gutterVisible
@emitter.emit 'did-change-gutter-visible', @gutterVisible
@gutterVisible
setLineNumberGutterVisible: (lineNumberGutterVisible) ->
unless lineNumberGutterVisible is @lineNumberGutterVisible
@lineNumberGutterVisible = lineNumberGutterVisible
@emitter.emit 'did-change-line-number-gutter-visible', @lineNumberGutterVisible
@lineNumberGutterVisible
isGutterVisible: -> @gutterVisible ? true
isLineNumberGutterVisible: -> @lineNumberGutterVisible ? true
onDidChangeGutterVisible: (callback) ->
@emitter.on 'did-change-gutter-visible', callback
onDidChangeLineNumberGutterVisible: (callback) ->
@emitter.on 'did-change-line-number-gutter-visible', callback
# Set the number of characters that can be displayed horizontally in the
# editor.