Skip to content

Commit 5cb90a7

Browse files
IonDenIonDen
committed
Update to 2.0.6
1 parent 79eb2c0 commit 5cb90a7

File tree

9 files changed

+80
-40
lines changed

9 files changed

+80
-40
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ion.rangeSlider",
3-
"version": "2.0.5",
3+
"version": "2.0.6",
44
"homepage": "https://github.com/IonDen/ion.rangeSlider",
55
"authors": [
66
{

‎history.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Ion.RangeSlider Update History
22

3+
### Version 2.0.6. February 17, 2015
4+
* Issues done: #197
5+
* Fixed bug with broken From and To
6+
37
### Version 2.0.5. February 13, 2015
4-
* Issues done: #193, #195, #197, #201
8+
* Issues done: #193, #195, #201
59

610
### Version 2.0.4. February 12, 2015
711
* Issues done: #174, #184

‎index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Ion.Range Slider 2.0.5
1+
# Ion.Range Slider 2.0.6
22

33
> English description | <a href="readme.ru.md">Описание на русском</a>
44
55
Easy and light range slider
66
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/en.html">Project page and demos</a>
7-
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip">Download ion.rangeSlider-2.0.5.zip</a>
7+
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip">Download ion.rangeSlider-2.0.6.zip</a>
88

99
***
1010

‎ion-rangeSlider.jquery.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ion-rangeSlider",
3-
"version": "2.0.5",
3+
"version": "2.0.6",
44
"title": "Ion.RangeSlider",
55
"description": "Cool, comfortable and easily customizable range slider with many options and skin support",
66
"keywords": [
@@ -30,7 +30,7 @@
3030
"homepage": "https://github.com/IonDen/ion.rangeSlider",
3131
"docs": "https://github.com/IonDen/ion.rangeSlider/blob/master/readme.md",
3232
"demo": "http://ionden.com/a/plugins/ion.rangeSlider/en.html",
33-
"download": "http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip",
33+
"download": "http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip",
3434
"dependencies": {
3535
"jquery": ">=1.8"
3636
}

‎js/ion.rangeSlider.js‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Ion.RangeSlider
2-
// version 2.0.5 Build: 298
2+
// version 2.0.6 Build: 300
33
// © Denis Ineshin, 2015
44
// https://github.com/IonDen
55
//
@@ -76,6 +76,34 @@
7676
return bound;
7777
};
7878
}
79+
if (!Array.prototype.indexOf) {
80+
Array.prototype.indexOf = function(searchElement, fromIndex) {
81+
var k;
82+
if (this == null) {
83+
throw new TypeError('"this" is null or not defined');
84+
}
85+
var O = Object(this);
86+
var len = O.length >>> 0;
87+
if (len === 0) {
88+
return -1;
89+
}
90+
var n = +fromIndex || 0;
91+
if (Math.abs(n) === Infinity) {
92+
n = 0;
93+
}
94+
if (n >= len) {
95+
return -1;
96+
}
97+
k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
98+
while (k < len) {
99+
if (k in O && O[k] === searchElement) {
100+
return k;
101+
}
102+
k++;
103+
}
104+
return -1;
105+
};
106+
}
79107

80108

81109

@@ -111,7 +139,7 @@
111139
// Core
112140

113141
var IonRangeSlider = function (input, options, plugin_count) {
114-
this.VERSION = "2.0.5";
142+
this.VERSION = "2.0.6";
115143
this.input = input;
116144
this.plugin_count = plugin_count;
117145
this.current_plugin = 0;
@@ -209,14 +237,21 @@
209237
var val = $inp.prop("value");
210238
if (val) {
211239
val = val.split(";");
212-
}
213240

214-
if (val && options.values && options.values.length) {
215-
data.from = val[0] && options.values.indexOf(val[0]);
216-
data.to = val[1] && options.values.indexOf(val[1]);
217-
} else {
218-
data.from = val[0] && +val[0];
219-
data.to = val[1] && +val[1];
241+
if (val[0] && val[0] == +val[0]) {
242+
val[0] = +val[0];
243+
}
244+
if (val[1] && val[1] == +val[1]) {
245+
val[1] = +val[1];
246+
}
247+
248+
if (options.values && options.values.length) {
249+
data.from = val[0] && options.values.indexOf(val[0]);
250+
data.to = val[1] && options.values.indexOf(val[1]);
251+
} else {
252+
data.from = val[0] && +val[0];
253+
data.to = val[1] && +val[1];
254+
}
220255
}
221256

222257
// get config from options

‎js/ion.rangeSlider.min.js‎

Lines changed: 21 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ion-rangeslider",
3-
"version": "2.0.5",
3+
"version": "2.0.6",
44
"description": "Cool, comfortable and easily customizable range slider with many options and skin support",
55
"homepage": "http://ionden.com/a/plugins/ion.rangeSlider/en.html",
66
"author": {

‎readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Ion.Range Slider 2.0.5
1+
# Ion.Range Slider 2.0.6
22

33
> English description | <a href="readme.ru.md">Описание на русском</a>
44
55
Easy and light range slider
66
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/en.html">Project page and demos</a>
7-
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip">Download ion.rangeSlider-2.0.5.zip</a>
7+
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip">Download ion.rangeSlider-2.0.6.zip</a>
88

99
***
1010

‎readme.ru.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Ion.Range Slider 2.0.5
1+
# Ion.Range Slider 2.0.6
22

33
> <a href="readme.md">English description</a> | Описание на русском
44
55
Удобный легкий слайдер диапазонов
66
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/index.html">Страница проекта и демо</a>
7-
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.5.zip">Download ion.rangeSlider-2.0.5.zip</a>
7+
* <a href="http://ionden.com/a/plugins/ion.rangeSlider/ion.rangeSlider-2.0.6.zip">Download ion.rangeSlider-2.0.6.zip</a>
88

99
***
1010

0 commit comments

Comments
 (0)