Change how images are loaded in image type. Fixes #115.

christabor · May 22, 2017 · 7e06213 · 7e06213
1 parent a8f21c1
commit 7e06213
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/flask_jsondash/static/css/app.css b/flask_jsondash/static/css/app.css
@@ -35,9 +35,6 @@ body {
     */
     position: relative;
 }
-.dashboard-charts .widget .chart-container {
-    margin: 0 auto;
-}
 .dashboard-charts small {
     font-weight: 400;
 }
@@ -228,8 +225,12 @@ body {
     color: #444;
     text-shadow: 1px 1px rgba(255, 255, 255, 1);
 }
+.dashboard-charts .widget .chart-container {
+    margin: 0 auto;
+}
 .dashboard-charts .widget iframe,
 .dashboard-charts .widget svg,
+.dashboard-charts .widget .chart-container .img,
 .dashboard-charts .widget .chart-centered {
     margin: 0 auto;
     display: block;

diff --git a/flask_jsondash/static/js/handlers.js b/flask_jsondash/static/js/handlers.js
@@ -682,16 +682,11 @@ jsondash.handlers.handleTimeline = function(container, config) {
  */
 jsondash.handlers.handleImage = function(container, config) {
     'use strict';
-    var img = container
-        .select('.chart-container')
-        .append('div')
-        .append('img');
-    var width = isNaN(config.width) ? '100%' : config.width - jsondash.config.WIDGET_MARGIN_X;
+    var img = container.select('.chart-container').append('img');
     var height = (config.height - jsondash.config.WIDGET_MARGIN_Y) + 'px';
     img.attr({
         src: config.dataSource,
-        height: height,
-        width: width
+        height: height
     });
     img.classed({img: true});
     // Look for callbacks potentially registered for third party code.