From 15d69fbc41a35a4af0d6fdb2443ece705131a0eb Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 1 May 2012 17:25:48 -0700 Subject: [PATCH] Don't add a trailing slash when adding file to projects root dir --- spec/extensions/tree-view-spec.coffee | 9 +++++++++ src/extensions/tree-view/add-dialog.coffee | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/spec/extensions/tree-view-spec.coffee b/spec/extensions/tree-view-spec.coffee index bded59948..02bdc6a2c 100644 --- a/spec/extensions/tree-view-spec.coffee +++ b/spec/extensions/tree-view-spec.coffee @@ -382,6 +382,15 @@ describe "TreeView", -> expect(addDialog.miniEditor.getCursorBufferPosition().column).toBe addDialog.miniEditor.getText().length expect(addDialog.miniEditor.isFocused).toBeTruthy() + describe "when the root directory is selected", -> + it "opens an add dialog with no path populated", -> + addDialog.cancel() + treeView.root.click() + treeView.trigger "tree-view:add" + addDialog = rootView.find(".add-dialog").view() + + expect(addDialog.miniEditor.getText().length).toBe 0 + describe "tree-view:move", -> describe "when a file is selected", -> moveDialog = null diff --git a/src/extensions/tree-view/add-dialog.coffee b/src/extensions/tree-view/add-dialog.coffee index 69009dc81..5c8b9f9c5 100644 --- a/src/extensions/tree-view/add-dialog.coffee +++ b/src/extensions/tree-view/add-dialog.coffee @@ -21,7 +21,8 @@ class AddDialog extends View @miniEditor.on 'focusout', => @remove() directoryPath = if fs.isFile(@path) then fs.directory(@path) else @path - relativePath = @rootView.project.relativize(directoryPath) + '/' + relativePath = @rootView.project.relativize(directoryPath) + relativePath += '/' if relativePath.length > 0 @miniEditor.setText(relativePath) confirm: ->