Ver código fonte

AMBARI-7901 Slider View: When metrics are being shown, page keeps jumping to the top. (atkach)

atkach 10 anos atrás
pai
commit
4e003e581a

+ 4 - 1
contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js

@@ -350,6 +350,8 @@ App.ChartView = Ember.View.extend({
       this.set('isPopup', true);
     }
     else {
+      //set height for empty container while graph drawing to avoid viewport shrinking by height
+      graph_container.css('height', graph_container.css('height'));
       graph_container.children().each(function (index, value) {
         $(value).children().remove();
       });
@@ -371,6 +373,7 @@ App.ChartView = Ember.View.extend({
       }
       this.set('isPopup', false);
     }
+    graph_container.css('height', 'auto');
   },
 
   /**
@@ -908,4 +911,4 @@ App.ChartView.CreateRateFormatter = function (unitsPrefix, valueFormatter) {
     value = valueFormatter(value) + suffix;
     return value;
   };
-};
+};

+ 2 - 4
contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js

@@ -27,9 +27,7 @@ test('getViewDisplayParametersSuccessCallback', function () {
         "description" : "description s1",
         "label" : "display s1",
         "instance_data": {
-          "java.home": "/usr/jdk64/jdk1.7.0_45"
-        },
-        "properties": {
+          "java.home": "/usr/jdk64/jdk1.7.0_45",
           "slider.user": "admin"
         }
       }
@@ -40,4 +38,4 @@ test('getViewDisplayParametersSuccessCallback', function () {
   equal(App.get('javaHome'), '/usr/jdk64/jdk1.7.0_45', 'valid default java_home property is set');
   equal(App.get('sliderUser'), 'admin', 'valid sliderUser is set');
 
-});
+});