Commit e1ce1418 authored by eli's avatar eli

updated interval to get int from attribute, account for null vals

parent f66b750a
......@@ -233,11 +233,12 @@ function throttle(func, wait, options) {
this.disabled = this.scope.rzSliderDisabled;
/**
* Set the speed at which the slider updates
* The interval at which the slider updates when the model/high values
* are altered from outside the slider
*
* @type {number}
*/
this.interval = this.scope.rzSliderInterval || 350;
this.interval = this.scope.rzSliderInterval !== null ? this.scope.rzSliderInterval : 350;
/**
* The delta between min and max value
......@@ -337,7 +338,7 @@ function throttle(func, wait, options) {
self.updateCmbLabel();
}
}, self.interval, { leading: false });
}, self.interval);
thrHigh = throttle(function()
{
......@@ -346,7 +347,7 @@ function throttle(func, wait, options) {
self.updateSelectionBar();
self.updateTicksScale();
self.updateCmbLabel();
}, self.interval, { leading: false });
}, self.interval);
this.scope.$on('rzSliderForceRender', function()
{
......@@ -1421,7 +1422,7 @@ function throttle(func, wait, options) {
rzSliderShowTicks: '=?',
rzSliderShowTicksValue: '=?',
rzSliderDisabled: '=?',
rzSliderInterval: '@',
rzSliderInterval: '=?',
},
/**
......
This diff is collapsed.
......@@ -233,11 +233,12 @@ function throttle(func, wait, options) {
this.disabled = this.scope.rzSliderDisabled;
/**
* Set the speed at which the slider updates
* The interval at which the slider updates when the model/high values
* are altered from outside the slider
*
* @type {number}
*/
this.interval = this.scope.rzSliderInterval || 350;
this.interval = this.scope.rzSliderInterval !== null ? this.scope.rzSliderInterval : 350;
/**
* The delta between min and max value
......@@ -337,7 +338,7 @@ function throttle(func, wait, options) {
self.updateCmbLabel();
}
}, self.interval, { leading: false });
}, self.interval);
thrHigh = throttle(function()
{
......@@ -346,7 +347,7 @@ function throttle(func, wait, options) {
self.updateSelectionBar();
self.updateTicksScale();
self.updateCmbLabel();
}, self.interval, { leading: false });
}, self.interval);
this.scope.$on('rzSliderForceRender', function()
{
......@@ -1421,7 +1422,7 @@ function throttle(func, wait, options) {
rzSliderShowTicks: '=?',
rzSliderShowTicksValue: '=?',
rzSliderDisabled: '=?',
rzSliderInterval: '@',
rzSliderInterval: '=?',
},
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment