Просмотр исходного кода

trim project and entiry names/renames

Henry Oswald 12 лет назад
Родитель
Сommit
b7b307e82b

+ 2 - 1
services/web/public/coffee/file-tree/FileTreeManager.coffee

@@ -159,6 +159,7 @@ define [
 
 
 
 
 		renameEntity: (entity, name) ->
 		renameEntity: (entity, name) ->
+			name = name?.trim()
 			@ide.socket.emit 'renameEntity', entity.id, entity.get("type"), name
 			@ide.socket.emit 'renameEntity', entity.id, entity.get("type"), name
 			entity.set("name", name)
 			entity.set("name", name)
 
 
@@ -197,7 +198,7 @@ define [
 			el = $($("#newEntityModalTemplate").html())
 			el = $($("#newEntityModalTemplate").html())
 			input = el.find("input")
 			input = el.find("input")
 			create = _.once () =>
 			create = _.once () =>
-				name = input.val()
+				name = input.val()?.trim()
 				if name != ""
 				if name != ""
 					callback(name)
 					callback(name)
 			modal = new Modal
 			modal = new Modal

+ 1 - 1
services/web/public/coffee/list.coffee

@@ -144,7 +144,7 @@ require [
 		$confirm.click (e) =>
 		$confirm.click (e) =>
 			$confirm.attr("disabled", true)
 			$confirm.attr("disabled", true)
 			$confirm.text("Creating...")
 			$confirm.text("Creating...")
-			projectName = $modal.find('input').val()
+			projectName = $modal.find('input').val()?.trim()
 			$.ajax
 			$.ajax
 				url: '/project/new'
 				url: '/project/new'
 				type:'POST'
 				type:'POST'

+ 4 - 1
services/web/public/coffee/settings/SettingsManager.coffee

@@ -126,7 +126,10 @@ define [
 				# http://stackoverflow.com/questions/6692031/check-if-event-is-triggered-by-a-human
 				# http://stackoverflow.com/questions/6692031/check-if-event-is-triggered-by-a-human
 				if e.originalEvent?
 				if e.originalEvent?
 					if @ide.isAllowedToDoIt "readAndWrite"
 					if @ide.isAllowedToDoIt "readAndWrite"
-						@project.set("name", e.target.value)
+						newName = e.target.value?.trim()
+						$("input.projectName").val(newName)
+						@project.set("name", newName)
+
 
 
 		bindToCompiler: ->
 		bindToCompiler: ->
 			$('select#compilers').val(@project.get("compiler"))
 			$('select#compilers').val(@project.get("compiler"))