From 4cdf0483794a2dcdfc3e23098ef8dcff71256631 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 1 Mar 2015 11:36:18 +0200 Subject: view/graph_view: yet another fix for scaling --- src/client/view/graph_view.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/client/view') diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js index 7356a23d..52952645 100644 --- a/src/client/view/graph_view.js +++ b/src/client/view/graph_view.js @@ -570,10 +570,7 @@ function GraphView(spec) { scaled_high = forward(rect_high), new_scale; - if (segment_in_segment(scaled_low, scaled_high, screen_low, screen_high)) { - return [current_scale, function () { return current_translate; }]; - } - new_scale = (rect_high == rect_low ? + new_scale = ((rect_high === rect_low || segment_in_segment(scaled_low, scaled_high, screen_low, screen_high)) ? current_scale : (screen_high - screen_low) / (rect_high - rect_low) * percent); new_scale = Math.min(3, Math.max(0.1, new_scale)); return [ -- cgit v1.3.1