summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine/scenery/randomize.js
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-10-14 10:45:25 -0400
committerJulie Lala <jules@okfoc.us>2014-10-14 10:45:25 -0400
commit3cb1983858c1314661592fa78c814eed44acb1b7 (patch)
treeac68510745ca98500f0bb427ea3c5d1abafb2d2e /public/assets/javascripts/rectangles/engine/scenery/randomize.js
parent40c85ef5f19139ae5b2cf3e3c0f4878f7acaeae4 (diff)
parent10a98d58fcba585dc13d251497c6028d04de0031 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/scenery/randomize.js')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/randomize.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
index 4f1144a..82b6bf9 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -10,11 +10,11 @@ Scenery.randomize = function (media_data) {
var media_list = media_data.map(function(media){
var width, height
if (media.width > media.height) {
- width = Math.min(300, media.width)
+ width = Math.min(DEFAULT_PICTURE_WIDTH, media.width)
height = media.height/media.width * width
}
else {
- height = Math.min(300, media.height)
+ height = Math.min(DEFAULT_PICTURE_WIDTH, media.height)
width = media.width/media.height * height
}
return {