Update to 2.0.6

IonDen · Feb 17, 2015 · 5cb90a7 · 5cb90a7
1 parent 79eb2c0
commit 5cb90a7
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 40 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "ion.rangeSlider",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "homepage": "https://github.com/IonDen/ion.rangeSlider",
     "authors": [
         {

diff --git a/history.md b/history.md
@@ -1,7 +1,11 @@
 # Ion.RangeSlider Update History
 
+### Version 2.0.6. February 17, 2015
+* Issues done: #197
+* Fixed bug with broken From and To
+
 ### Version 2.0.5. February 13, 2015
-* Issues done: #193, #195, #197, #201
+* Issues done: #193, #195, #201
 
 ### Version 2.0.4. February 12, 2015
 * Issues done: #174, #184

diff --git a/index.md b/index.md
@@ -1,10 +1,10 @@
-# Ion.Range Slider 2.0.5
+# Ion.Range Slider 2.0.6
 
 > English description | <a href="readme.ru.md">Описание на русском</a>
 
 Easy and light range slider
 * <a href="http://ionden.com/a/plugins/ion.rangeSlider/en.html">Project page and demos</a>
-* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip">Download ion.rangeSlider-2.0.5.zip</a>
+* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip">Download ion.rangeSlider-2.0.6.zip</a>
 
 ***
 

diff --git a/ion-rangeSlider.jquery.json b/ion-rangeSlider.jquery.json
@@ -1,6 +1,6 @@
 {
     "name": "ion-rangeSlider",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "title": "Ion.RangeSlider",
     "description": "Cool, comfortable and easily customizable range slider with many options and skin support",
     "keywords": [
@@ -30,7 +30,7 @@
     "homepage": "https://github.com/IonDen/ion.rangeSlider",
     "docs": "https://github.com/IonDen/ion.rangeSlider/blob/master/readme.md",
     "demo": "http://ionden.com/a/plugins/ion.rangeSlider/en.html",
-    "download": "http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip",
+    "download": "http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip",
     "dependencies": {
         "jquery": ">=1.8"
     }

diff --git a/js/ion.rangeSlider.js b/js/ion.rangeSlider.js
@@ -1,5 +1,5 @@
 // Ion.RangeSlider
-// version 2.0.5 Build: 298
+// version 2.0.6 Build: 300
 // © Denis Ineshin, 2015
 // https://github.com/IonDen
 //
@@ -76,6 +76,34 @@
             return bound;
         };
     }
+    if (!Array.prototype.indexOf) {
+        Array.prototype.indexOf = function(searchElement, fromIndex) {
+            var k;
+            if (this == null) {
+                throw new TypeError('"this" is null or not defined');
+            }
+            var O = Object(this);
+            var len = O.length >>> 0;
+            if (len === 0) {
+                return -1;
+            }
+            var n = +fromIndex || 0;
+            if (Math.abs(n) === Infinity) {
+                n = 0;
+            }
+            if (n >= len) {
+                return -1;
+            }
+            k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+            while (k < len) {
+                if (k in O && O[k] === searchElement) {
+                    return k;
+                }
+                k++;
+            }
+            return -1;
+        };
+    }
 
 
 
@@ -111,7 +139,7 @@
     // Core
 
     var IonRangeSlider = function (input, options, plugin_count) {
-        this.VERSION = "2.0.5";
+        this.VERSION = "2.0.6";
         this.input = input;
         this.plugin_count = plugin_count;
         this.current_plugin = 0;
@@ -209,14 +237,21 @@
         var val = $inp.prop("value");
         if (val) {
             val = val.split(";");
-        }
 
-        if (val && options.values && options.values.length) {
-            data.from = val[0] && options.values.indexOf(val[0]);
-            data.to = val[1] && options.values.indexOf(val[1]);
-        } else {
-            data.from = val[0] && +val[0];
-            data.to = val[1] && +val[1];
+            if (val[0] && val[0] == +val[0]) {
+                val[0] = +val[0];
+            }
+            if (val[1] && val[1] == +val[1]) {
+                val[1] = +val[1];
+            }
+
+            if (options.values && options.values.length) {
+                data.from = val[0] && options.values.indexOf(val[0]);
+                data.to = val[1] && options.values.indexOf(val[1]);
+            } else {
+                data.from = val[0] && +val[0];
+                data.to = val[1] && +val[1];
+            }
         }
 
         // get config from options

diff --git a/js/ion.rangeSlider.min.js b/js/ion.rangeSlider.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ion-rangeslider",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "description": "Cool, comfortable and easily customizable range slider with many options and skin support",
     "homepage": "http://ionden.com/a/plugins/ion.rangeSlider/en.html",
     "author": {

diff --git a/readme.md b/readme.md
@@ -1,10 +1,10 @@
-# Ion.Range Slider 2.0.5
+# Ion.Range Slider 2.0.6
 
 > English description | <a href="readme.ru.md">Описание на русском</a>
 
 Easy and light range slider
 * <a href="http://ionden.com/a/plugins/ion.rangeSlider/en.html">Project page and demos</a>
-* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip">Download ion.rangeSlider-2.0.5.zip</a>
+* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip">Download ion.rangeSlider-2.0.6.zip</a>
 
 ***
 

diff --git a/readme.ru.md b/readme.ru.md
@@ -1,10 +1,10 @@
-# Ion.Range Slider 2.0.5
+# Ion.Range Slider 2.0.6
 
 > <a href="readme.md">English description</a> | Описание на русском
 
 Удобный легкий слайдер диапазонов
 * <a href="http://ionden.com/a/plugins/ion.rangeSlider/index.html">Страница проекта и демо</a>
-* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip">Download ion.rangeSlider-2.0.5.zip</a>
+* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip">Download ion.rangeSlider-2.0.6.zip</a>
 
 ***