aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Bellingard <bellingard@gmail.com>2011-09-05 16:58:33 +0200
committerFabrice Bellingard <bellingard@gmail.com>2011-09-05 16:59:10 +0200
commit85de25a72bf386abb927da8047786bb97160d184 (patch)
tree505eadd51d8d47e554619c7ca919521094aa27b8
parent9d067cff77e01462cee0a60742410fc375197ca5 (diff)
downloadsonarqube-85de25a72bf386abb927da8047786bb97160d184.tar.gz
sonarqube-85de25a72bf386abb927da8047786bb97160d184.zip
SONAR-2074 Fix bug on IE6/7
-rw-r--r--plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb1
-rwxr-xr-xsonar-server/src/main/webapp/javascripts/protovis-sonar.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
index 224099ade83..7ca169be837 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag 'protovis-sonar' %>
<%
# Retrieve widget settings
metric_data_map = {}
diff --git a/sonar-server/src/main/webapp/javascripts/protovis-sonar.js b/sonar-server/src/main/webapp/javascripts/protovis-sonar.js
index 5590d9387e9..bf6899af2dd 100755
--- a/sonar-server/src/main/webapp/javascripts/protovis-sonar.js
+++ b/sonar-server/src/main/webapp/javascripts/protovis-sonar.js
@@ -48,7 +48,7 @@ SonarWidgets.Timeline.prototype.render = function() {
/* Sizing and scales. */
var headerHeight = 4 + Math.max(this.wMetrics.size(), events ? 2 : 1) * 18;
- var w = widgetDiv.parentNode.clientWidth - 60;
+ var w = widgetDiv.parentNode.offsetWidth - 60;
var h = (this.wHeight == null ? 80 : this.wHeight) + headerHeight;
var yMaxHeight = h-headerHeight;