autosave

11 files changed, 111 insertions, 48 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index c3f78d7..edeb24b 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -30,6 +30,9 @@ Scenery.move = function(base){
         redo: { id: base.id },
       })
 
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
 			Scenery.remove(base.id)
 			return
 		}
@@ -81,7 +84,10 @@ Scenery.move = function(base){
       undo: oldState,
       redo: base.serialize(),
     })
-    
+
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
     oldState = null
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index c5c754a..6b2e52c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -200,6 +200,9 @@ Scenery.resize = new function(){
       redo: obj.serialize(),
     })
 
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
 		document.body.classList.remove("dragging")
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 7798550..54ab755 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -4,9 +4,15 @@
 			type: "create-scenery",
       undo: function(state){
         Scenery.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         Scenery.deserialize([ state ])
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		{
@@ -19,6 +25,9 @@
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
         }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         var scenery = Scenery.find(state.id)
@@ -30,15 +39,24 @@
           Scenery.resize.rotate_dots()
           Scenery.resize.move_dots()
         }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		{
 			type: "destroy-scenery",
       undo: function(state){
         Scenery.deserialize([ state ])
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         Scenery.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 6e2c728..fa09444 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -50,6 +50,9 @@ window.Wall = (function(){
 					  undo: { id: scenery.id },
             redo: scenery.serialize(),
 					})
+					
+					// TODO: watch individual scenery object here
+					Minotaur.watch( app.router.editorView.settings )
 				}
 				else if (Scenery.nextWallpaper) {
 					base.wallpaper()
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 6eb36ec..039a053 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -1,54 +1,59 @@
 (function(){
 
   var Monitor = function () {
-    var base = this;
-    base.$el = $("#minotaur");
-    base.timeout = null;
-    base.delay = 500;
-    base.objects = {};
+    var base = this
+    base.$el = $("#minotaur")
+    base.timeout = null
+    base.delay = 500
+    base.objects = {}
     
     base.init = function () {
-      base.$el.addClass('saved');
-      base.$el.click(base.save);
+      base.$el.removeClass()
+      base.$el.click(base.save)
     }
 
     base.watch = function (object) {
-      base.objects[object.type] = base.objects[object.type] || {};
-      base.objects[object.type][object.id] = object;
-      base.clear();
-      base.timeout = setTimeout(base.save, base.delay);
+      base.objects[object.type] = base.objects[object.type] || {}
+      base.objects[object.type][object._id] = object
+      base.clear()
+      base.timeout = setTimeout(base.save, base.delay)
+    }
+    
+    base.unwatch = function (object) {
+      if (base.objects[object.type] && base.objects[object.type][object._id]) {
+        delete base.objects[object.type][object._id]
+      }
     }
     
     base.clear = function () {
-      if (base.timeout) clearTimeout(base.timeout);
-      base.timeout = false;
+      if (base.timeout) clearTimeout(base.timeout)
+      base.timeout = false
     }
     
     base.save = function () {
-      var saving = false;
-      base.clear();
+      var saving = false
+      base.clear()
       
       for (var type in base.objects) {
         for (var id in base.objects[type]) {
-          if (base.timeout)
-            return;
-          var obj = base.objects[type][id];
-          if (obj) obj.save(function(){
-            base.$el.removeClass('unsaved saving').addClass('saved');
-            saving = true;
-          });
-          base.objects[type][id] = false;
+          var obj = base.objects[type][id]
+          if (obj) {
+            obj.save(null, function(){ base.hide() }, function(){})
+          }
+          delete base.objects[type][id]
+          saving = true
         }
       }
 
-      if (saving) {
-        base.$el.removeClass('unsaved saved').addClass('saving');
-      }
-      else {
-        base.$el.removeClass('unsaved saving').addClass('saved');
-      }
-      
-      base.objects = {};
+      saving ? base.show() : base.hide()
+    }
+    
+    base.show = function () {
+      base.$el.removeClass().addClass('saving')
+    }
+    
+    base.hide = function () {
+      base.$el.removeClass()
     }
     
     base.init();
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index c551f95..0091454 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -122,6 +122,9 @@ var BuilderSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		Minotaur.unwatch(this)
+		Minotaur.hide()
+
 		window.history.pushState(null, document.title, "/layout/" + data.slug)
 	},
 
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",
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 219952d..ab33bc0 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -54,15 +54,20 @@ var FormView = View.extend({
 		return fd
 	},
 	
-	save: function(e){
-		e.preventDefault()
+	save: function(e, successCallback, errorCallback){
+		e && e.preventDefault()
 
 		this.$errors.hide().css("opacity", 0.0);
 		
 		if (this.validate) {
 			var errors = this.validate()
 			if (errors && errors.length) {
-				this.showErrors(errors)
+				if (errorCallback) {
+				  errorCallback(errors)
+				}
+				else {
+          this.showErrors(errors)
+				}
 				return
 			}
 		}
@@ -74,18 +79,29 @@ var FormView = View.extend({
 			dataType: "json",
 			processData: false,
 			contentType: false,
-		});
+		})
+		
 		request.done($.proxy(function (response) {
 			if (response.error) {
 				var errors = []
 				for (var key in response.error.errors) {
 					errors.push(response.error.errors[key].message);
 				}
-				this.showErrors(errors)
+				if (errorCallback) {
+				  errorCallback(errors)
+				}
+				else {
+          this.showErrors(errors)
+				}
 				return
 			}
 			else {
-				this.success && this.success(response)
+				if (successCallback) {
+				  successCallback(response)
+				}
+				if (this.success) {
+				  this.success(response)
+				}
 			}
 		}, this));
 	}
diff --git a/public/assets/javascripts/ui/lib/View.js b/public/assets/javascripts/ui/lib/View.js
index 999a0e5..d94e6db 100644
--- a/public/assets/javascripts/ui/lib/View.js
+++ b/public/assets/javascripts/ui/lib/View.js
@@ -1,13 +1,14 @@
 var View = (function($, _){
 
 	var View = function(options) {
-		this.cid = _.uniqueId('view');
+		this._id = _.uniqueId('view')
+		this.type = "view"
 		options || (options = {});
-		_.extend(this, _.pick(options, viewOptions));
-		this._ensureElement();
-		this.initialize.apply(this, arguments);
-		this.delegateEvents();
-	};
+		_.extend(this, _.pick(options, viewOptions))
+		this._ensureElement()
+		this.initialize.apply(this, arguments)
+		this.delegateEvents()
+	}
 
 	var delegateEventSplitter = /^(\S+)\s*(.*)$/;
 
@@ -58,7 +59,7 @@ var View = (function($, _){
 				var match = key.match(delegateEventSplitter);
 				var eventName = match[1], selector = match[2];
 				method = _.bind(method, this);
-				eventName += '.delegateEvents' + this.cid;
+				eventName += '.delegateEvents' + this._id;
 				if (selector === '') {
 					this.$el.on(eventName, method);
 				} else {
@@ -70,7 +71,7 @@ var View = (function($, _){
 
 		// Clears all callbacks previously bound to the view with `delegateEvents`.
 		undelegateEvents: function() {
-			this.$el.off('.delegateEvents' + this.cid);
+			this.$el.off('.delegateEvents' + this._id);
 			return this;
 		},
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index dfb3a83..4839de8 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -30,6 +30,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>