Merge "Closes-Bug: #1465853 IE related issues on Network Monitoring -…

… Fixed Black background for zoomed VN - Fixed VM link which was not visible - Fixed height for ZoomedScatterChart" into R2.20
Juniper · Jun 17, 2015 · 043cd27 · 043cd27
2 parents be49d3a + fb457e7
commit 043cd27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/webroot/js/joint.contrail.js b/webroot/js/joint.contrail.js
@@ -1938,7 +1938,7 @@ joint.shapes.contrail.ZoomedCloudElement = joint.shapes.basic.Rect.extend({
     defaults: joint.util.deepSupplement({
         type: 'contrail.ZoomedElement.VirtualNetwork',
         attrs: {
-            rect: {rx: 0, ry: 0, 'stroke-width': 0, stroke: '#EEE', fill: 'url(#dotted)'},
+            rect: {rx: 0, ry: 0, 'stroke-width': 0, stroke: '#EEE', fill: '#FFF'},
             text: {
                 'ref-x': 0.01,
                 'ref-y': 5,

diff --git a/webroot/js/views/ZoomScatterChartView.js b/webroot/js/views/ZoomScatterChartView.js
@@ -93,10 +93,13 @@ define([
                 height = chartModel.height,
                 timer = null, circleRadius = chartConfig.circleRadius;
 
+            $(chartSelector).height(height + margin.top + margin.bottom)
+
             chartSVG = d3.select($(chartSelector)[0]).append("svg")
                 .attr("class", "zoom-scatter-chart")
                 .attr("width", width + margin.left + margin.right + circleRadius)
                 .attr("height", height + margin.top + margin.bottom)
+                .attr("viewbox", '0 0 ' + (width + margin.left + margin.right + circleRadius) + ' ' + (height + margin.top + margin.bottom))
                 .append("g")
                 .attr("transform", "translate(" + margin.left + "," + margin.top + ")")
                 .call(self.zm)