merge

7 files changed, 46 insertions, 33 deletions

diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 4fd145d..e1c90c8 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -46,6 +46,12 @@ var BuilderInfo = View.extend({
     this.$settings.toggle( !! this.room )
     this.$noSelection.toggle( ! this.room )
 		this.$el.toggleClass("active", state)
+		if (state) {
+      this.parent.cursor.message("builder")
+		}
+		else {
+      this.parent.cursor.message("start")
+		}
 	},
 	
 	show: function(){	
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 430acc7..b96943e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -114,7 +114,7 @@ var EditorSettings = FormView.extend({
 				type: "delete",
 				data: { _id: this.$id.val(), _csrf: this.$csrf.val() },
 				success: function(data){
-					window.location.href = "/project"
+					window.location.href = "/profile"
 				}
 			})
 		}.bind(this))
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 3c75b95..277718a 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -55,16 +55,14 @@ var EditorToolbar = View.extend({
 	},
 	
 	openMediaViewer: function(){
-		this.parent.mediaViewer.show()
-		this.parent.mediaUpload.show()
 		this.resetMode()
 		this.resetControls()
 		this.toggleMap(false)
+		this.parent.mediaViewer.show()
+		this.parent.mediaUpload.show()
 	},
 
 	resetMode: function(){
-		// this.resizeMedia(true)
-		// this.destroyMedia(false)
  	  $(".inuse").removeClass("inuse")
     $("body").removeClass("addText")
 		this.parent.hideExtras()
@@ -88,26 +86,6 @@ var EditorToolbar = View.extend({
     editor.permissions.remove("destroy")
 	},
 	
-	destroyMedia: function(e, state){
-		this.resetControls()
-		if (! state && typeof e == "boolean") {
-			state = e
-			editor.permissions.assign("destroy", state)
-		}
-		else {
-			state = editor.permissions.toggle("destroy")
-		}
-		if (! state) {
-      this.resetPermissions()
-    }
-    else {
-      app.controller.hideExtras()
-		}
-		$(".inuse").removeClass("inuse")
-		$("[data-role='destroy-media']").toggleClass("inuse", state)
-		$("body").toggleClass("destroyActive", state)
-	},
-	
 	toggleWallpaper: function(){
 		var state = ! $("[data-role='toggle-wallpaper-panel']").hasClass("inuse")
 		this.resetMode()
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 8ada237..4c8ff0c 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -13,12 +13,14 @@ var HelpCursor = View.extend({
 	  wallpaper: "Click the wallpaper you want then apply it to the walls. Feel free to upload your own too!",
 	  colors: "Use these colors to change the color of the walls, floor, and ceiling.",
 	  settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.",
+	  builder: "This is a map of your rooms.  Draw new boxes, or move and resize the ones that are there.  Hit ESCAPE to toggle the map.",
 	},
 
   initialize: function(){
 		this.helpButton = $('#help-button')
 		
 		this.helpButton.click(this.toggle.bind(this))
+    this.$el.html(this.messages['start'])
   },
   
   toggle: function(){
@@ -28,7 +30,6 @@ var HelpCursor = View.extend({
   start: function(){
     if (this.active) return
     this.active = true
-    this.message('start')
     this.helpButton.addClass('active')
     this.$el.show()
     this.move({ pageX: -1000, pageY: -10000 })
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index b3f4ac3..65778dd 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -62,6 +62,11 @@ var MediaUpload = UploadView.extend({
 		this.parent.mediaViewer.addUploadedMedia(media)
 	},
 	
+	error: function(error){
+	console.log(error)
+    alert(error.errors.media.message)
+	},
+	
 	beforeUpload: function(){
 		this.parent.mediaViewer.deleteArmed(false)
 	}
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index ac77d6b..5f5ac35 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -4,7 +4,6 @@ var Presets = View.extend({
 	events: {
 		"mousedown": "stopPropagation",
     "click .presets span": "selectPreset",
-    "click .swatches span": "selectColor",
 	},
 	
   presets: {
@@ -21,7 +20,7 @@ var Presets = View.extend({
       ceiling: [159,163,157],
       background: [109,116,106],
     },
-    "p.Funk": {
+    "P.Funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
@@ -53,7 +52,9 @@ var Presets = View.extend({
   	}.bind(this))
   },
 
-  modified: false,
+  modified: true,
+  lastPreset: "wireframe",
+  
   toggle: function(state){
     this.$el.toggleClass("active", state)
     this.parent.cursor.message(state ? "presets" : "start")
@@ -75,15 +76,31 @@ var Presets = View.extend({
     if (! this.presets[preset]) return
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
+    if (this.modified) {
+      UndoStack.push({
+        type: "choose-preset",
+        undo: { walls: Walls.serialize(), colors: Walls.copyColors(Walls.colors) },
+        redo: preset,
+      })
+      Minotaur.watch( app.router.editorView.settings )
+    }
+    else {
+      UndoStack.push({
+        type: "choose-another-preset",
+        undo: this.lastPreset,
+        redo: preset,
+      })
+      Minotaur.watch( app.router.editorView.settings )
+    }
+    this.lastPreset = preset
     this.load(this.presets[preset])
     this.modified = false
   },
   
-  selectColor: function(e){
-    var preset = $(e.currentTarget).data('color')
-    console.log(preset)
+  loadByName: function(name){
+    var preset = this.presets[name]
+    this.load(preset)
   },
-  
   load: function(preset){
     this.parent.colorControl.modes.forEach(function(mode){
       var color
diff --git a/public/assets/javascripts/ui/lib/UploadView.js b/public/assets/javascripts/ui/lib/UploadView.js
index 2d2c2c7..4b56828 100644
--- a/public/assets/javascripts/ui/lib/UploadView.js
+++ b/public/assets/javascripts/ui/lib/UploadView.js
@@ -77,6 +77,9 @@ var UploadView = View.extend({
 	
 	success: function(media){
 		if (media.error) {
+		  // console.log(media.error)
+      this.$upload.removeClass('uploading')
+		  this.error(media.error)
 			return
 		}
 		this.$upload.removeClass('uploading')
@@ -86,5 +89,8 @@ var UploadView = View.extend({
 	add: function(media){
 	  console.log(media)
 	},
+	
+	error: function(error){
+	},
 
 })