modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java | 10 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java | 21 ++------ modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 26 +--------- 3 files changed, 14 insertions(+), 43 deletions(-)
New commits: commit 59df0f08367521576187063a6bbafaa6ba0be9c2 Author: Mike Thompson mithomps@redhat.com Date: Wed May 8 08:45:18 2013 -0700
Make x-axis more readable on Safari, IE. These browsers even though they are using the same SVG fonts, render wider fonts showing up as labels running into one another. Reduced the clutter on the x-axis for increased readability.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java index e38df39..f0db5a2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java @@ -162,7 +162,7 @@ public class AvailabilityOverUnderGraphType {
xAxis = $wnd.d3.svg.axis() .scale(timeScale) - .ticks(12) + .ticks(8) .tickSize(13, 0, 0) .orient("bottom"),
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java index bf08615..4d71192 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java @@ -129,13 +129,8 @@ public class StackedBarMetricGraphImpl extends AbstractGraph { else { console.log("Using Large Charts Profile"); // we use the width already defined above - if(isIEBrowserGreaterThanOrEqualTo(9)){ - xTicks = 8; - xTickSubDivide = 5; - }else { - xTicks = 12; - xTickSubDivide = 5; - } + xTicks = 8; + xTickSubDivide = 5; chartData = chartContext.data; }
commit c8bbd8b0c5dcfa51a2d653a95bc83d73d80178be Author: Mike Thompson mithomps@redhat.com Date: Wed May 8 08:30:08 2013 -0700
[BZ 960521] Globally uncaught exception on clicking on resource name link on IE9.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java index 4e6a0ce..e38df39 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityOverUnderGraphType.java @@ -215,7 +215,7 @@ public class AvailabilityOverUnderGraphType { } else { // should not ever happen, but... - console.warn("AvailabilityType not valid."); + console.log("AvailabilityType not valid."); return "#000"; //black } }, @@ -318,13 +318,11 @@ public class AvailabilityOverUnderGraphType {
return { // Public API - draw: function (chartContext) { + draw: function (availChartContext) { "use strict"; - console.info("AvailabilityChart"); - //console.time("availabilityChart"); + console.log("AvailabilityChart"); drawBars(availChartContext); createHovers(); - //console.timeEnd("availabilityChart"); } }; // end public closure
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java index 15f400d..bf08615 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/StackedBarMetricGraphImpl.java @@ -38,7 +38,7 @@ public class StackedBarMetricGraphImpl extends AbstractGraph { */ @Override public native void drawJsniChart() /*-{ - //console.log("Draw Stacked Bar jsni chart"); + console.log("Draw Stacked Bar jsni chart"); var global = this,
// create a chartContext object (from rhq.js) with the data required to render to a chart @@ -120,14 +120,14 @@ public class StackedBarMetricGraphImpl extends AbstractGraph {
// if window is too small server up small chart if (useSmallCharts()) { - //console.log("Using Small Charts Profile for width: "+getChartWidth()); + console.log("Using Small Charts Profile for width: "+getChartWidth()); width = 250; xTicks = 3; xTickSubDivide = 2; chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1); } else { - //console.log("Using Large Charts Profile"); + console.log("Using Large Charts Profile"); // we use the width already defined above if(isIEBrowserGreaterThanOrEqualTo(9)){ xTicks = 8; @@ -613,8 +613,7 @@ public class StackedBarMetricGraphImpl extends AbstractGraph { "use strict"; // Guard condition that can occur when a portlet has not been configured yet if (chartContext.data.length > 0) { - //console.info("Creating Chart: "+ chartContext.chartSelection + " --> "+ chartContext.chartTitle); - //console.time("chart"); + console.log("Creating Chart: "+ chartContext.chartSelection + " --> "+ chartContext.chartTitle);
determineScale(); createHeader(chartContext.chartTitle); @@ -624,11 +623,10 @@ public class StackedBarMetricGraphImpl extends AbstractGraph { createXandYAxes(); createAvgLines(); if (oobMax > 0) { - //console.info("OOB Data Exists!"); + console.log("OOB Data Exists!"); createOOBLines(); } createHovers(chartContext); - //console.timeEnd("chart"); } } }; // end public closure diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 27c4cc0..081a9a2 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -2,29 +2,9 @@ * Charting Javascript Functions. */
-// Avoid `console` errors in browsers that lack a console. -(function() { - var method; - var noop = function () {}; - var methods = [ - 'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error', - 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log', - 'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd', - 'timeStamp', 'trace', 'warn' - ]; - var length = methods.length; - var console = (window.console = window.console || {}); - - while (length--) { - method = methods[length]; - - // Only stub undefined methods. - if (!console[method]) { - console[method] = noop; - } - } -} ()); - +// Handle browsers not supporting console object +if (!window.console) window.console = {}; +if (!window.console.log) window.console.log = function () { };
/** * ChartContext Constructor Object
rhq-commits@lists.fedorahosted.org