disarm delete after upload

6 files changed, 19 insertions, 7 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 3117112..2d7961b 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -93,6 +93,7 @@ app.position = function(obj){
 		rotationX: obj.rotationX,
 		rotationY: obj.rotationY
 	}
+	console.log(obj.scale)
 	if (obj.scale !== 1) {
 		pos.scale = obj.scale
 	}
diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index 8b11473..e36c857 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -9,6 +9,7 @@ MX.Image = MX.Object3D.extend({
 		layer.x = ops.x || 0
 		layer.y = ops.y || 0
 		layer.z = ops.z || 0
+		layer.scale = ops.scale || 1
 		layer.backface = ops.backface || false
 		layer.media = ops.media
 		
@@ -37,8 +38,8 @@ MX.Image = MX.Object3D.extend({
     var image = new Image()
     image.onload = function(){
       layer.scale = layer.ops.scale || 1
-      layer.width = image.naturalWidth
-      layer.height = image.naturalHeight
+      layer.width = layer.ops.width || image.naturalWidth
+      layer.height = layer.ops.height || image.naturalHeight
       layer.x = layer.ops.x || 0
       layer.y = layer.ops.y || 0
       layer.z = layer.ops.z || 0
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 2a400f5..33efd05 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -164,13 +164,15 @@ Scenery.resize = new function(){
 		
 		var translation = new vec2( x_sign * cursor.x.magnitude() * cursor_amp, y_sign * cursor.y.magnitude() * cursor_amp )
 
+		// resize using scale here instead of width and height
+
 		if (selected_dot.side & LEFT_RIGHT) {
-			obj.mx.width = dimensions.a + translation.a
+// 			obj.mx.width = dimensions.a + translation.a
 			obj.mx.x = position.a + x_sign * cos(rotationY) * translation.a/2 * obj.mx.scale
 			obj.mx.z = position.c + x_sign * sin(rotationY) * translation.a/2 * obj.mx.scale
 		}
 		if (selected_dot.side & TOP_BOTTOM) {
-			obj.mx.height = dimensions.b + translation.b
+// 			obj.mx.height = dimensions.b + translation.b
 			obj.mx.y = position.b - y_sign * translation.b/2 * obj.mx.scale
 		}
 		
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 98b26f4..b5b5551 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -16,6 +16,7 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 		build: function(){
 			this.mx = new MX.Image({
 				src: this.media.url,
+				scale: this.scale,
 				y: this.scale * this.media.height/2,
 				backface: false,
 			})
@@ -24,12 +25,14 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 
 		serialize: function(){
 			var data = base.serialize.call(this)
-			console.log(data)
+// 			console.log(data)
 			return data
 		},
 	
 		deserialize: function(data){
 			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
 		},
 	}
 	
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 30287a5..b7fea07 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -60,6 +60,8 @@ var MediaUpload = View.extend({
 	handleFileSelect: function(e) {
 		e.stopPropagation();
 		e.preventDefault();
+		
+		this.parent.mediaViewer.deleteArmed(false)
 
 		var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
 
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 05e666b..2535f1b 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -35,7 +35,7 @@ var MediaViewer = ModalView.extend({
 	
 	hide: function(){
 		this.__super__.hide.call(this)
-		this.deleteArmed(null, false)
+		this.deleteArmed(false)
 		this.parent.mediaUpload.hide()
 	},
 
@@ -72,7 +72,10 @@ var MediaViewer = ModalView.extend({
 
 	deleteIsArmed: false,
 	deleteArmed: function(e, state){
-		if (typeof state != "boolean") {
+		if (typeof e == "boolean") {
+			state = e
+		}
+		else if (typeof state != "boolean") {
 			state = ! this.deleteIsArmed
 		}
 		this.deleteIsArmed = state