Add support for multipleOf when using range input. Fixes jdorn#17

LinguList · Dec 11, 2013 · 1c0f157 · 1c0f157
1 parent d81479b
commit 1c0f157
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /node_modules/
+/.idea/
diff --git a/dist/jquery.jsoneditor.js b/dist/jquery.jsoneditor.js
@@ -289,8 +289,18 @@
 
         // Set the min/max for format="range"
         if(this.input_type === 'range') {
-          this.input.attr('min',(this.schema.minimum || 0));
-          this.input.attr('max',(this.schema.maximum || 100));
+          var min = this.schema.minimum || 0;
+          var max = this.schema.maximum || 100;
+
+          // If multipleOf is set, make sure minimum and maximum are multiples of multipleOf
+          if(this.schema.multipleOf) {
+            if(min%this.schema.multipleOf) min = Math.ceil(min/this.schema.multipleOf)*this.schema.multipleOf;
+            if(max%this.schema.multipleOf) max = Math.floor(max/this.schema.multipleOf)*this.schema.multipleOf;
+            this.input.attr('step',this.schema.multipleOf);
+          }
+
+          this.input.attr('min',min);
+          this.input.attr('max',max);
           this.input.css({
             marginBottom: '10px'
           });

diff --git a/dist/jquery.jsoneditor.min.js b/dist/jquery.jsoneditor.min.js
diff --git a/src/editors/string.js b/src/editors/string.js
@@ -35,8 +35,18 @@
 
         // Set the min/max for format="range"
         if(this.input_type === 'range') {
-          this.input.attr('min',(this.schema.minimum || 0));
-          this.input.attr('max',(this.schema.maximum || 100));
+          var min = this.schema.minimum || 0;
+          var max = this.schema.maximum || 100;
+
+          // If multipleOf is set, make sure minimum and maximum are multiples of multipleOf
+          if(this.schema.multipleOf) {
+            if(min%this.schema.multipleOf) min = Math.ceil(min/this.schema.multipleOf)*this.schema.multipleOf;
+            if(max%this.schema.multipleOf) max = Math.floor(max/this.schema.multipleOf)*this.schema.multipleOf;
+            this.input.attr('step',this.schema.multipleOf);
+          }
+
+          this.input.attr('min',min);
+          this.input.attr('max',max);
           this.input.css({
             marginBottom: '10px'
           });