merge

4 files changed, 10 insertions, 8 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index fd251b7..0c08369 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -146,7 +146,6 @@ var EditorSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		map.draw.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
@@ -160,7 +159,8 @@ var EditorSettings = FormView.extend({
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		
 		if (this.thumbnailIsStale()) {
-      fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+      var thumbnail = map.draw.render()
+      fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
     }
 		return fd
 	},
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 971fb15..3f425c3 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -42,7 +42,6 @@ var MediaUpload = UploadView.extend({
 			}
 			
 			media._csrf = $("[name=_csrf]").val()
-			console.log(media)
 			
 			var request = $.ajax({
 				type: "post",
@@ -55,7 +54,7 @@ var MediaUpload = UploadView.extend({
 	
 	add: function(media){
 		console.log(media)
-		this.parent.mediaViewer.add(media)
+		this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
     this.parent.mediaViewer.$deleteMedia.show()
 	},
 	
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index b51d8f2..1414e16 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -20,6 +20,7 @@ var MediaViewer = ModalView.extend({
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
+		this.$noMedia = this.$(".noMedia")
   },
 
 	foundToggle: function(){
@@ -103,9 +104,11 @@ var MediaViewer = ModalView.extend({
 		  data.forEach(function(media){
 		    this.add(media, this.$myMedia)
 		  }.bind(this))
+		  this.$noMedia.hide()
       this.$deleteMedia.show()
 		}
 		else {
+		  this.$noMedia.show()
 		  this.$deleteMedia.hide()
 		}
 		this.__super__.show.call(this)
@@ -176,6 +179,7 @@ var MediaViewer = ModalView.extend({
 
 			if ($(".myMedia .mediaContainer").length == 0) {
         this.$deleteMedia.hide()
+        this.$noMedia.show()
         this.deleteArmed(false)
 			}
 			return
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 140076d..6bf2542 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -133,7 +133,7 @@ var WallpaperPicker = UploadView.extend({
 	
 	wall: null,
 	pickWall: function(wall){
-    if (wall.background.src == "none") {
+    if (! wall.background || wall.background.src == "none") {
       return;
     }
     this.wall = wall
@@ -148,16 +148,16 @@ var WallpaperPicker = UploadView.extend({
 	
 	initializePositionCursor: function(){
 	  var base = this
-	  var dx = 0, dy = 0, dragging = false
+	  var dx = 0, dy = 0, dragging = false, delta
 	  var x = 0, y = 0, s = 1
     var mymouse = new mouse({
       el: this.$position[0],
       down: function(e, cursor){
         if (! base.wall) return
+        dragging = true
         s = parseFloat( base.$scale.val() )
         x = base.wall.background.x
         y = base.wall.background.y
-        dragging = true
       },
       drag: function(e, cursor){
         if (! dragging) return
@@ -172,7 +172,6 @@ var WallpaperPicker = UploadView.extend({
         })
       },
       up: function(e, cursor, new_cursor){
-        delta.zero()
         dragging = false
       },
     })