merge

1 files changed, 5 insertions, 1 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index d9cce18..e26c0a7 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -109,6 +109,7 @@ Scenery.resize = new function(){
 	}
 
 	base.hide = function () {
+	  if (! obj) return
 		obj = null
 		dots.forEach(function(dot){
 			scene.remove(dot)
@@ -175,7 +176,8 @@ Scenery.resize = new function(){
 			mag = y_sign * mag * sign(height)
 		}
 
- 		obj.mx.scale = ( dimension.a + mag ) / naturalDimension.a // dimension.a // scale * (old_width + mag) / old_width
+ 		obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
+ 		// dimension.a // scale * (old_width + mag) / old_width
 
 // console.log(scale, obj.mx.scale, dimension.a + mag, naturalDimension.a)
 
@@ -188,6 +190,8 @@ Scenery.resize = new function(){
 		}
 
 		base.move_dots()
+		
+		app.router.editorView.mediaEditor.setDimensions()
 	}
 
 	function up (e, cursor){