From ca39b9dccb864b45b9dc0d0a245477066a704ce7 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Wed, 26 Dec 2012 13:06:27 -0800 Subject: [PATCH] re-organizing the cursor position text --- src/packages/status-bar/spec/status-bar-spec.coffee | 6 +++--- src/packages/status-bar/src/status-bar.coffee | 4 ++-- static/status-bar.css | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/packages/status-bar/spec/status-bar-spec.coffee b/src/packages/status-bar/spec/status-bar-spec.coffee index 4cb099e25..3f9f47d11 100644 --- a/src/packages/status-bar/spec/status-bar-spec.coffee +++ b/src/packages/status-bar/spec/status-bar-spec.coffee @@ -30,7 +30,7 @@ describe "StatusBar", -> it "displays the editor's buffer path, cursor buffer position, and buffer modified indicator", -> expect(statusBar.currentPath.text()).toBe 'sample.js' expect(statusBar.bufferModified.text()).toBe '' - expect(statusBar.cursorPosition.text()).toBe 'Line 1, Column 1' + expect(statusBar.cursorPosition.text()).toBe '1,1' describe "when associated with an unsaved buffer", -> it "displays 'untitled' instead of the buffer's path, but still displays the buffer position", -> @@ -41,7 +41,7 @@ describe "StatusBar", -> StatusBar.activate(rootView) statusBar = rootView.find('.status-bar').view() expect(statusBar.currentPath.text()).toBe 'untitled' - expect(statusBar.cursorPosition.text()).toBe 'Line 1, Column 1' + expect(statusBar.cursorPosition.text()).toBe '1,1' describe "when the associated editor's path changes", -> it "updates the path in the status bar", -> @@ -105,7 +105,7 @@ describe "StatusBar", -> describe "when the associated editor's cursor position changes", -> it "updates the cursor position in the status bar", -> editor.setCursorScreenPosition([1, 2]) - expect(statusBar.cursorPosition.text()).toBe 'Line 2, Column 3' + expect(statusBar.cursorPosition.text()).toBe '2,3' describe "git branch label", -> beforeEach -> diff --git a/src/packages/status-bar/src/status-bar.coffee b/src/packages/status-bar/src/status-bar.coffee index ade0e798d..83a3e4833 100644 --- a/src/packages/status-bar/src/status-bar.coffee +++ b/src/packages/status-bar/src/status-bar.coffee @@ -23,10 +23,10 @@ class StatusBar extends View @span class: 'octicons branch-icon' @span class: 'branch-label', outlet: 'branchLabel' @span class: 'git-status', outlet: 'gitStatusIcon' - @span class: 'cursor-position', outlet: 'cursorPosition' @span class: 'file-info', => @span class: 'current-path', outlet: 'currentPath' @span class: 'buffer-modified', outlet: 'bufferModified' + @span class: 'cursor-position', outlet: 'cursorPosition' initialize: (@rootView, @editor) -> @@ -90,4 +90,4 @@ class StatusBar extends View updateCursorPositionText: -> { row, column } = @editor.getCursorBufferPosition() - @cursorPosition.text("Line #{row + 1}, Column #{column + 1}") + @cursorPosition.text("#{row + 1},#{column + 1}") diff --git a/static/status-bar.css b/static/status-bar.css index 38011d579..97437e161 100644 --- a/static/status-bar.css +++ b/static/status-bar.css @@ -9,7 +9,7 @@ } .status-bar .cursor-position { - padding-right: 20px; + padding-left: 10px; } .status-bar .git-branch {