You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/07/09 17:29:31 UTC

[3/3] ambari git commit: AMBARI-12357. Properties with slider widget is formatting not properly (onechiporenko)

AMBARI-12357. Properties with slider widget is formatting not properly (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bef90472
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bef90472
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bef90472

Branch: refs/heads/trunk
Commit: bef904722a685ca3eb2c87863016399da7098a18
Parents: a51accc
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Jul 9 18:26:48 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Jul 9 18:26:48 2015 +0300

----------------------------------------------------------------------
 .../configs/widgets/slider_config_widget_view.js | 18 +++++++++++++++---
 .../widgets/slider_config_widget_view_test.js    | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bef90472/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index b9cbc46..77161e3 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -333,7 +333,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
     for (var i = 1; i <= 3; i++) {
       var val = minMirrorValue + this.valueForTickProportionalToStep(range * (i / (isSmallInt ? 3 : 4)));
       // if value's type is float, ticks may be float too
-      ticks.push(val);
+      ticks.push(this._extraRound(val));
     }
 
     ticks.push(this.valueForTick(maxMirrorValue));
@@ -465,7 +465,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
    * @returns {Number}
    */
   valueForTick: function(val) {
-    return this.get('unitType') === 'int' ? Math.round(val) : parseFloat(val.toFixed(3));
+    return this.get('unitType') === 'int' ? Math.round(val) : this._extraRound(val);
   },
 
   /**
@@ -482,7 +482,19 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
     }
     var mirrorStep = this.get('mirrorStep');
     var r = Math.round(val / mirrorStep);
-    return parseFloat((r * mirrorStep).toFixed(3));
+    return this._extraRound(r * mirrorStep);
+  },
+
+  /**
+   * Round number to 3 digits after "."
+   * Used for all slider's ticks
+   * @param {Number} v
+   * @returns {Number} number with 3 digits after "."
+   * @private
+   * @method _extraRound
+   */
+  _extraRound: function(v) {
+    return parseFloat(v.toFixed(3));
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/bef90472/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
index 38c382c..ec408f6 100644
--- a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
+++ b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
@@ -398,6 +398,25 @@ describe('App.SliderConfigWidgetView', function () {
           ticks: [1, 26, 51, 75, 100],
           ticksLabels: ["1 GB", "", "51 GB", "", "100 GB"]
         }
+      },
+      {
+        viewSetup: {
+          minMirrorValue: 0.166,
+          maxMirrorValue: 0.5,
+          isCompareMode: false,
+          widgetRecommendedValue: 0.166,
+          config: Em.Object.create({
+            isOriginalSCP: true,
+            stackConfigProperty: Em.Object.create({
+              valueAttributes: {unit: "MB", type: "int", minimum: "170", maximum: "512", increment_step: "256"},
+              widget: {"units":[{"unit-name":"GB"}]}
+            })
+          })
+        },
+        e: {
+          ticks: [0.166, 0.416, 0.5],
+          ticksLabels: ["0.166 GB", "0.416 GB", "0.5 GB"]
+        }
       }
     ];