Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 19 insertions, 2 deletions

diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 67834e7..4fd145d 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -10,8 +10,11 @@ var BuilderInfo = View.extend({
 		"change [name=width]": 'changeWidth',
 		"change [name=depth]": 'changeDepth',
 		"change [name=height]": 'changeHeight',
+		"keydown [name=width]": 'enterWidth',
+		"keydown [name=depth]": 'enterDepth',
+		"keydown [name=height]": 'enterHeight',
 		"change [name=units]": 'changeUnits',
-		"change [name=resolution]": 'changeResolution',
+		"keydown [name=viewHeight]": 'enterViewHeight',
 		"change [name=viewHeight]": 'changeViewHeight',
 		"click [data-role=destroy-room]": 'destroy',
 	},
@@ -85,16 +88,27 @@ var BuilderInfo = View.extend({
 		this.hide()
 	},
 
+	enterWidth: function(e){
+	  if (e.keyCode == 13) this.changeWidth(e)
+	},
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	
+	enterDepth: function(e){
+	  if (e.keyCode == 13) this.changeDepth(e)
+	},
 	changeDepth: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	
+	enterHeight: function(e){
+	  if (e.keyCode == 13) this.changeHeight(e)
+	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.room.height = this.$height.unitVal()
@@ -114,7 +128,10 @@ var BuilderInfo = View.extend({
 		app.units = this.$units.val()
 		this.$('.units').resetUnitVal()
 	},
-	changeViewHeight: function(){
+	enterViewHeight: function(e){
+	  if (e.keyCode == 13) this.changeViewHeight(e)
+	},
+  changeViewHeight: function(){
  		window.viewHeight = this.$viewHeight.unitVal( )
 	},