give up on trying to use only the chart area for drawers (for now) on…

… some screen sizes since the android keyboard messes it up
nightscout · Feb 17, 2016 · 9aab137 · 9aab137
1 parent 0fbf6ef
commit 9aab137
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/lib/client/browser-utils.js b/lib/client/browser-utils.js
@@ -97,17 +97,17 @@ function init ($) {
 
       var windowWidth = $(window).width();
       var windowHeight = $(window).height();
-      var chartTop = $('#chartContainer').offset().top - 45;
-      var chartHeight = windowHeight - chartTop - 45;
+      //var chartTop = $('#chartContainer').offset().top - 45;
+      //var chartHeight = windowHeight - chartTop - 45;
       if (windowWidth < SMALL_SCREEN || (windowHeight < SMALL_SCREEN) && windowWidth < 800) {
+        style.top = '0px';
+        style.height = windowHeight + 'px';
         style.width = windowWidth + 'px';
-        if (chartHeight > windowHeight * 0.4) {
-          style.top = chartTop + 'px';
-          style.height = chartHeight + 'px';
-        } else {
-          style.top = '0px';
-          style.height = windowHeight + 'px';
-        }
+        //TODO: maybe detect iOS and do this, doesn't work good with android
+        //if (chartHeight > windowHeight * 0.4) {
+        //  style.top = chartTop + 'px';
+        //  style.height = chartHeight + 'px';
+        //}
       } else {
         style.top = '0px';
         style.height = (windowHeight - 45) + 'px';

diff --git a/lib/client/chart.js b/lib/client/chart.js
@@ -237,9 +237,13 @@ function init (client, d3, $) {
     var currentBrushExtent = createAdjustedRange();
 
     // only redraw chart if chart size has changed
-    if ((chart.prevChartWidth !== chartWidth) || (chart.prevChartHeight !== chartHeight)) {
+    var widthChanged = (chart.prevChartWidth !== chartWidth);
+    if (widthChanged || (chart.prevChartHeight !== chartHeight)) {
 
-      client.browserUtils.closeLastOpenedDrawer();
+      //if rotated
+      if (widthChanged) {
+        client.browserUtils.closeLastOpenedDrawer();
+      }
 
       chart.prevChartWidth = chartWidth;
       chart.prevChartHeight = chartHeight;