Merge pull request #973 from paulharfenmeister/master

add full-range padding
leongersen · Apr 24, 2019 · 579dce6 · 579dce6
2 parents f73551d + 950191c
commit 579dce6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,8 @@
 # Changelog
 
+### 13.1.5 (*2019-03-20*)
+- Fixed: Full-range padding (#880);
+
 ### 13.1.4 (*2019-03-20*)
 - Fixed: Keyboard interaction does not work with `snap` option (#961);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nouislider",
-  "version": "13.1.4",
+  "version": "13.1.5",
   "main": "distribute/nouislider.js",
   "style": "distribute/nouislider.min.css",
   "license": "MIT",

diff --git a/src/nouislider.js b/src/nouislider.js
@@ -689,7 +689,7 @@
             throw new Error("noUiSlider (" + VERSION + "): 'padding' option must be a positive number(s).");
         }
 
-        if (parsed.padding[0] + parsed.padding[1] >= 100) {
+        if (parsed.padding[0] + parsed.padding[1] > 100) {
             throw new Error("noUiSlider (" + VERSION + "): 'padding' option must not exceed 100% of the range.");
         }
     }

diff --git a/tests/slider_padding.js b/tests/slider_padding.js
@@ -64,3 +64,24 @@ QUnit.test("Padding option", function (assert) {
     assert.deepEqual(slider.noUiSlider.get(), ['0.00', '90.00'], 'One of the padding values is 0');
 
 });
+
+QUnit.test("Padding values <= 100%", function (assert) {
+
+    document.getElementById('qunit-fixture').innerHTML = '<div class="slider"></div>';
+
+    var settings = {
+        start: [0, 100],
+        padding: [30, 70],
+        range: {
+            'min': 0,
+            'max': 100
+        }
+    };
+
+    var slider = document.getElementById('qunit-fixture').querySelector('.slider');
+
+    noUiSlider.create(slider, settings);
+
+    assert.deepEqual(slider.noUiSlider.get(), ['30.00', '30.00'], 'Slider values can only be 30');
+
+});