Highlight name when renaming or creating new file

services/web/app/views/project/editor/file-tree.jade

@@ -70,7 +70,7 @@ script(type='text/ng-template', id='entityListItemTemplate')
 					ng-show="entity.renaming",
 					ng-model="inputs.name",
 					ng-blur="finishRenaming()",
-					focus-input="entity.renaming",
+					select-name-when="entity.renaming",
 					on-enter="finishRenaming()"
 				)
 
@@ -104,7 +104,7 @@ script(type='text/ng-template', id='entityListItemTemplate')
 					ng-show="entity.renaming",
 					ng-model="inputs.name",
 					ng-blur="finishRenaming()",
-					focus-input="entity.renaming",
+					select-name-when="entity.renaming",
 					on-enter="finishRenaming()"
 				)
 
@@ -130,7 +130,7 @@ script(type='text/ng-template', id='newDocModalTemplate')
 				required,
 				ng-model="inputs.name",
 				on-enter="create()",
-				focus-on="open"
+				select-name-on="open"
 			)
 	.modal-footer
 		button.btn.btn-default(
@@ -155,7 +155,7 @@ script(type='text/ng-template', id='newFolderModalTemplate')
 				required,
 				ng-model="inputs.name",
 				on-enter="create()",
-				focus-on="open"
+				select-name-on="open"
 			)
 	.modal-footer
 		button.btn.btn-default(

services/web/app/views/project/list.jade

@@ -117,7 +117,7 @@ block content
 													ng-model="userInfoForm.first_name",
 													ng-blur="sendUpdate()",
 													placeholder="First Name",
-													focus-input="formVisable"
+													select-when="formVisable"
 												)
 											.form-group
 												input.form-control(

services/web/public/coffee/app/directives/focus.coffee

@@ -0,0 +1,67 @@
+define [
+	"base"
+], (App) ->
+	App.directive "focusWhen", ($timeout) ->
+		return {
+			restrict: "A"
+			link: (scope, element, attr) ->
+				scope.$watch attr.focusWhen, (value) ->
+					if value
+						$timeout ->
+							element.focus()
+		}
+
+	App.directive 'focusOn', ($timeout) ->
+		return {
+			restrict: 'A'
+			link: (scope, element, attrs) ->
+				scope.$on attrs.focusOn, () ->
+					element.focus()
+		}
+
+	App.directive "selectWhen", ($timeout) ->
+		return {
+			restrict: "A"
+			link: (scope, element, attr) ->
+				scope.$watch attr.selectWhen, (value) ->
+					if value
+						$timeout ->
+							element.select()
+		}
+
+	App.directive 'selectOn', ($timeout) ->
+		return {
+			restrict: 'A'
+			link: (scope, element, attrs) ->
+				scope.$on attrs.selectOn, () ->
+					element.select()
+		}
+
+	App.directive "selectNameWhen", ($timeout) ->
+		return {
+			restrict: 'A'
+			link: (scope, element, attrs) ->
+				scope.$watch attrs.selectNameWhen, (value) ->
+					if value
+						$timeout () ->
+							selectName(element)
+		}
+
+	App.directive "selectNameOn", () ->
+		return {
+			restrict: 'A'
+			link: (scope, element, attrs) ->
+				scope.$on attrs.selectNameOn, () ->
+					selectName(element)
+		}
+
+	selectName = (element) ->
+		# Select up to last '.'. I.e. everything
+		# except the file extension
+		element.focus()
+		name = element.val()
+		if element[0].setSelectionRange?
+			selectionEnd = name.lastIndexOf(".")
+			if selectionEnd == -1
+				selectionEnd = name.length
+			element[0].setSelectionRange(0, selectionEnd)

services/web/public/coffee/app/directives/focusInput.coffee

@@ -1,9 +0,0 @@
-define [
-	"base"
-], (App) ->
-	App.directive "focusInput", ($timeout) ->
-		return (scope, element, attr) ->
-			scope.$watch attr.focusInput, (value) ->
-				if value
-					$timeout ->
-						element.select()

services/web/public/coffee/app/directives/focusOn.coffee

@@ -1,10 +0,0 @@
-define [
-	"base"
-], (App) ->
-	App.directive 'focusOn', ($timeout) ->
-		return {
-			restrict: 'AC'
-			link: (scope, element, attrs) ->
-				scope.$on attrs.focusOn, () ->
-					element.focus()
-		}

services/web/public/coffee/app/ide.coffee

@@ -3,8 +3,7 @@ define [
 	"ide/file-tree/FileTreeManager"
 	"ide/directives/layout"
 	"ide/services/ide"
-	"directives/focusOn"
-	"directives/focusInput"
+	"directives/focus"
 	"directives/fineUpload"
 	"directives/onEnter"
 ], (

services/web/public/coffee/app/ide/file-tree/controllers/FileTreeController.coffee

@@ -43,7 +43,7 @@ define [
 			$modalInstance.opened.then () ->
 				$timeout () ->
 					$scope.$broadcast "open"
-				, 700
+				, 200
 
 			$scope.create = () ->
 				$scope.state.inflight = true
@@ -68,7 +68,7 @@ define [
 			$modalInstance.opened.then () ->
 				$timeout () ->
 					$scope.$broadcast "open"
-				, 700
+				, 200
 
 			$scope.create = () ->
 				$scope.state.inflight = true