summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-09-30 14:11:05 -0400
committerJules Laplace <jules@okfoc.us>2014-09-30 14:11:05 -0400
commite3b1885a05f78a41ffc51f60324976c2330a0d20 (patch)
tree3cddbc72973e3b36a451c2a115bf30475adb84c9
parentd929430f16c88b405482a55a93eae9cc4e8dbf76 (diff)
fix video resize
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/types/video.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index ef25d8d..76f32ac 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -4,8 +4,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
var exports = {
init: function(opt){
- opt.scale = opt.scale || 300 / max(300, opt.media.width)
-
+ opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
+
base.init.call(this, opt)
this.build()
@@ -106,6 +106,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
deserialize: function(data){
this.mx.move(data.position)
+ this.mx.ops.width = data.dimensions.a
+ this.mx.ops.height = data.dimensions.b
},
}