From 410607684c7273a61f937635b41397208e245473 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Aug 2014 13:57:42 -0400
Subject: autosave

---
 public/assets/javascripts/ui/editor/EditorSettings.js | 10 ++++++++--
 public/assets/javascripts/ui/editor/MediaEditor.js    |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'public/assets/javascripts/ui/editor')

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index d6a79fb..9d75f66 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -5,7 +5,7 @@ var EditorSettings = FormView.extend({
 	createAction: "/api/project/new",
 	updateAction: "/api/project/edit",
 	destroyAction: "/api/project/destroy",
-
+  
 	events: {
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
@@ -32,7 +32,10 @@ var EditorSettings = FormView.extend({
 		data.rooms && Rooms.deserialize(data.rooms)
 		data.startPosition && scene.camera.move(data.startPosition)
 		
-		if (! data.isNew) {
+		if (data.isNew) {
+		  this.$name.val( "Room " + moment().format("DD/MM/YYYY ha") )
+		}
+		else {
 			// console.log(data)
 			
 			this.$id.val( data._id )
@@ -130,6 +133,9 @@ var EditorSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		Minotaur.unwatch(this)
+		Minotaur.hide()
+		
 		window.history.pushState(null, document.title, "/project/" + data.slug + "/edit")
 	},
 
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index e3a8f2e..cc924da 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -4,6 +4,7 @@ var MediaEditor = FormView.extend({
 		
 	events: {
 		"keydown": 'stopPropagation',
+		"focus [name]": "clearMinotaur",
 		"click [data-role=play-media]": "togglePaused",
 		"mousedown [name=keyframe]": "stopPropagation",
 		"mousedown": "stopPropagation",
-- 
cgit v1.2.3-70-g09d2


From 63da3ba331aa3d9714151ba5f502e6e1851d75bb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Aug 2014 15:21:48 -0400
Subject: only clobber thumbnail if layout changed

---
 .../assets/javascripts/ui/editor/EditorSettings.js | 19 ++++++++++++++++--
 server/lib/api/projects.js                         | 23 +++++++++++++---------
 2 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'public/assets/javascripts/ui/editor')

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 9d75f66..e9239e4 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -37,11 +37,12 @@ var EditorSettings = FormView.extend({
 		}
 		else {
 			// console.log(data)
+			this.thumbnailIsStale()
 			
 			this.$id.val( data._id )
 			this.$name.val( data.name )
 			this.$description.val( data.description )
-			data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop('checked', "checked")
+			data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop("checked", "checked")
 			
 			data.media && Scenery.deserialize(data.media)
 		}
@@ -124,10 +125,24 @@ var EditorSettings = FormView.extend({
  		fd.append( "walls", JSON.stringify( Rooms.serializeWalls() ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
-		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+		
+		if (this.thumbnailIsStale()) {
+      fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+    }
 		return fd
 	},
 	
+	thumbnailState: null,
+	thumbnailIsStale: function(){
+	  var newState = JSON.stringify( Rooms.serialize() )
+	  
+	  if (newState !== this.thumbnailState) {
+	    this.thumbnailState = newState
+	    return true
+	  }
+	  return false
+	},
+	
 	success: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index fc54a5f..bd3cb81 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -72,15 +72,20 @@ var projects = {
 		data.slug = util.slugify(data.name)
 		data.description = util.sanitize(data.description)
 
-		upload.put("projects", req.files.thumbnail, {
-			unacceptable: function(err){
-				res.json({ error: { errors: { thumbnail: { message: "Problem saving thumbnail: " + err } } } })
-			},
-			success: function(url){
-				data.photo = url
-				done()
-			}
-		})
+    if (req.files.thumbnail) {
+      upload.put("projects", req.files.thumbnail, {
+        unacceptable: function(err){
+          res.json({ error: { errors: { thumbnail: { message: "Problem saving thumbnail: " + err } } } })
+        },
+        success: function(url){
+          data.photo = url
+          done()
+        }
+      })
+    }
+    else {
+      done()
+    }
 
 		function done() {
 			Project.findOne({ _id: _id }, function(err, doc){
-- 
cgit v1.2.3-70-g09d2