From 051f28a0daf5b527c842359d0bc339b0292aadef Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Sun, 21 Jul 2013 21:44:00 -0700 Subject: [PATCH 1/2] IE9 support; closes #96 --- common/css/main.css | 2 +- panels/histogram/module.html | 6 +++--- panels/histogram/module.js | 6 +++++- panels/hits/module.html | 8 ++++---- panels/hits/module.js | 5 ++--- panels/pie/module.html | 6 +++--- panels/pie/module.js | 4 ++++ panels/query/meta.html | 2 +- panels/query/module.html | 2 +- 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/common/css/main.css b/common/css/main.css index 419320593fb..1532591ff83 100644 --- a/common/css/main.css +++ b/common/css/main.css @@ -49,9 +49,9 @@ -webkit-transform-origin: 40px; transform-origin: 40px; transform: rotate(-90deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg); + -ms-transform: rotate(-90deg); } .row-open i { diff --git a/panels/histogram/module.html b/panels/histogram/module.html index 18b994811d6..b8ce6893374 100644 --- a/panels/histogram/module.html +++ b/panels/histogram/module.html @@ -26,11 +26,11 @@ Zoom Out | -
-
{{series.info.alias}} ({{series.hits}})
+ + {{series.info.alias}} ({{series.hits}}) {{panel.value_field}} {{panel.mode}} per {{panel.interval}} | ({{hits}} hits)
-
+
\ No newline at end of file diff --git a/panels/histogram/module.js b/panels/histogram/module.js index 0030d453fa3..22a72439144 100644 --- a/panels/histogram/module.js +++ b/panels/histogram/module.js @@ -266,6 +266,7 @@ angular.module('kibana.histogram', []) .directive('histogramChart', function(dashboard, eventBus, filterSrv, $rootScope) { return { restrict: 'A', + template: '
', link: function(scope, elem, attrs, ctrl) { // Receive render events @@ -280,7 +281,10 @@ angular.module('kibana.histogram', []) // Function for rendering panel function render_panel() { - + + // IE doesn't work without this + elem.css({height:scope.panel.height||scope.row.height}); + // Populate from the query service try { _.each(scope.data,function(series) { diff --git a/panels/hits/module.html b/panels/hits/module.html index fb99a3737f0..5eb77e865aa 100644 --- a/panels/hits/module.html +++ b/panels/hits/module.html @@ -10,26 +10,26 @@
-
{{query.info.alias}} ({{query.data[0][1]}}) + {{query.info.alias}} ({{query.data[0][1]}})

-
+
- +
{{query.info.alias}}{{query.data[0][1]}} {{query.info.alias}}{{query.data[0][1]}}
-
{{query.info.alias}} ({{query.data[0][1]}}) + {{query.info.alias}} ({{query.data[0][1]}})

diff --git a/panels/hits/module.js b/panels/hits/module.js index 3a0e03fe974..dcff20324c7 100644 --- a/panels/hits/module.js +++ b/panels/hits/module.js @@ -161,6 +161,8 @@ angular.module('kibana.hits', []) // Function for rendering panel function render_panel() { + // IE doesn't work without this + elem.css({height:scope.panel.height||scope.row.height}); try { _.each(scope.data,function(series) { @@ -228,9 +230,6 @@ angular.module('kibana.hits', []) colors: query.colors }); } - // Compensate for the height of the legend. Gross - elem.height( - (scope.panel.height || scope.row.height).replace('px','') - $("#"+scope.$id+"-legend").height()); // Work around for missing legend at initialization if(!scope.$$phase) { diff --git a/panels/pie/module.html b/panels/pie/module.html index a8ca59bf55b..485cc637b9f 100644 --- a/panels/pie/module.html +++ b/panels/pie/module.html @@ -4,13 +4,13 @@
-
{{query.label}} ({{query.data[0][1]}}) + {{query.label}} ({{query.data[0][1]}})

-
+
-
{{query.label}} ({{query.data[0][1]}}) + {{query.label}} ({{query.data[0][1]}})
\ No newline at end of file diff --git a/panels/pie/module.js b/panels/pie/module.js index 3e0c8740386..56413c9e800 100644 --- a/panels/pie/module.js +++ b/panels/pie/module.js @@ -181,10 +181,14 @@ angular.module('kibana.pie', []) // Function for rendering panel function render_panel() { + // IE doesn't work without this + elem.css({height:scope.panel.height||scope.row.height}); + var scripts = $LAB.script("common/lib/panels/jquery.flot.js").wait() .script("common/lib/panels/jquery.flot.pie.js"); var label; + if(scope.panel.mode === 'goal') { label = { show: scope.panel.labels, diff --git a/panels/query/meta.html b/panels/query/meta.html index 8af862ff5bf..b807e5e99a7 100644 --- a/panels/query/meta.html +++ b/panels/query/meta.html @@ -9,7 +9,7 @@
- +
\ No newline at end of file diff --git a/panels/query/module.html b/panels/query/module.html index 81108c57268..b92480c47a2 100644 --- a/panels/query/module.html +++ b/panels/query/module.html @@ -38,7 +38,7 @@
- + From fabf9f383538cdf026e3f4ee3432103c8a7da1b4 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Sun, 21 Jul 2013 21:44:59 -0700 Subject: [PATCH 2/2] removed debugging statements --- panels/timepicker/module.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/panels/timepicker/module.js b/panels/timepicker/module.js index f3f4ac32705..1740b9f67ef 100644 --- a/panels/timepicker/module.js +++ b/panels/timepicker/module.js @@ -92,8 +92,6 @@ angular.module('kibana.timepicker', []) if($scope.time.from.diff(moment.utc(time.from),'seconds') !== 0 || $scope.time.to.diff(moment.utc(time.to),'seconds') !== 0) { - console.log($scope.time.from+ " and "+ moment.utc(time.from)); - console.log($scope.time.to+" and "+moment.utc(time.to)); $scope.set_mode('absolute');