merge

1 files changed, 39 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 89040e1..240f713 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -15,6 +15,10 @@ var EditorSettings = FormView.extend({
 		"click [data-role='clone-project']": 'clone',
 		"click [data-role='clear-project']": 'clear',
 		"click [data-role='destroy-project']": 'destroy',
+    "click #startText": "setStartPosition",
+    "click #moveText": "confirmStartPosition",
+    "click #confirmText": "setStartPosition",
+    "click #goText": "goToStartPosition",
 	},
 	
 	initialize: function(opt){
@@ -26,6 +30,7 @@ var EditorSettings = FormView.extend({
 		this.$name = this.$("[name=name]")
 		this.$description = this.$("[name=description]")
 		this.$privacy = this.$("[name=privacy]")
+		this.$startPoint = this.$("#startpoint")
 	},
 	
 	load: function(data){
@@ -33,13 +38,17 @@ var EditorSettings = FormView.extend({
     this.parent.data = data
     
 		data.rooms && Rooms.deserialize(data.rooms, data.walls)
-		data.startPosition && scene.camera.move(data.startPosition)
+		if (data.startPosition) {
+		  scene.camera.move(data.startPosition)
+		  this.startPosition = data.startPosition
+		  this.$startPoint.addClass("confirmed")
+		}
 
     if (data.colors && data.colors.wall) {
-      this.parent.lightControl.load(data.colors)
+      this.parent.colorControl.load(data.colors)
     }
     else {
-		  this.parent.lightControl.loadDefaults()
+		  this.parent.colorControl.loadDefaults()
     }
     
     if (data.walls) {
@@ -72,7 +81,9 @@ var EditorSettings = FormView.extend({
 	  this.parent.collaborators.show()
 	},
 	
-	clone: function(){
+	clone: function(e){
+		e.preventDefault()
+
 		var names = this.$name.val().split(" ")
 		if ( ! isNaN(Number( names[names.length-1] )) ) {
 			names[names.length-1] = Number( names[names.length-1] ) + 1
@@ -84,11 +95,14 @@ var EditorSettings = FormView.extend({
 		this.$id.val('new')
 		this.$name.val( names.join(" ") )
 		this.action = this.createAction
+		this.thumbnailState = null
 		
-		window.history.pushState(null, document.title, "/builder/new")
+		window.history.pushState(null, document.title, "/project/new")
 	},
 	
-	clear: function(){
+	clear: function(e){
+		e.preventDefault()
+
 		Scenery.removeAll()
 	},
 	
@@ -112,6 +126,9 @@ var EditorSettings = FormView.extend({
 		
  	  $(".inuse").removeClass("inuse")
 		$("[data-role='toggle-project-settings']").toggleClass("inuse", state)
+    if (state) {
+      this.parent.cursor.message("settings")
+    }
 	},
 
 	enterSubmit: function (e) {
@@ -141,6 +158,19 @@ var EditorSettings = FormView.extend({
 		ErrorModal.alert($errors)
 	},
 	
+	startPosition: null,
+	setStartPosition: function(){
+	  this.$startPoint.addClass("active").removeClass("confirmed")
+	},
+	confirmStartPosition: function(){
+	  this.$startPoint.removeClass("active").addClass("confirmed")
+	  this.startPosition = app.position(scene.camera)
+	},
+	goToStartPosition: function(){
+	  if (! this.startPosition) return
+		scene.camera.move(this.startPosition)
+	},
+	
 	serialize: function(){
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
@@ -148,11 +178,13 @@ var EditorSettings = FormView.extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
+		fd.append( "viewHeight", window.viewHeight )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+		fd.append( "startPosition", JSON.stringify( this.startPosition || false ) )
+		fd.append( "lastPosition", JSON.stringify( app.position(scene.camera) ) )
 		
 		if (this.thumbnailIsStale()) {
       var thumbnail = map.draw.render()