Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extract ui.confine_to_range(). 

(imported from commit d95fd01e9783d01908a1155e260bac52339eb6ca)
This commit is contained in:
Steve Howell 2013-12-06 12:02:50 -05:00
parent c1dcf38b0a
commit 90d97a39c6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
static/js/ui.js
View File

@ -314,6 +314,16 @@ function need_skinny_mode() {
} }
} }
function confine_to_range(lo, val, hi) {
if (val < lo) {
return lo;
}
if (val > hi) {
return hi;
}
return val;
}
function size_blocks(blocks, usable_height) { function size_blocks(blocks, usable_height) {
// The algorithm here is to give each block an amount of space proportional // The algorithm here is to give each block an amount of space proportional
// to its size, but we don't let either block hog more than 80%. // to its size, but we don't let either block hog more than 80%.
@ -323,11 +333,8 @@ function size_blocks(blocks, usable_height) {
blocks[1].max_height = blocks[1].real_height; blocks[1].max_height = blocks[1].real_height;
} else { } else {
var ratio = (blocks[0].real_height) / sum_height; var ratio = (blocks[0].real_height) / sum_height;
ratio = Math.max(0.2, ratio); ratio = confine_to_range(0.2, ratio, 0.8);
ratio = Math.min(0.8, ratio); blocks[0].max_height = confine_to_range(40, usable_height * ratio, blocks[0].real_height);
blocks[0].max_height = Math.max(40, usable_height * ratio);
blocks[0].max_height = Math.min(blocks[0].real_height, blocks[0].max_height);
blocks[1].max_height = usable_height - blocks[0].max_height; blocks[1].max_height = usable_height - blocks[0].max_height;
var wasted_space = blocks[1].max_height - blocks[1].real_height; var wasted_space = blocks[1].max_height - blocks[1].real_height;