Skip to content

feat(maxRange): Add a maxRange option #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2016
Merged

feat(maxRange): Add a maxRange option #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,10 @@ The default options are:
ceil: null, //defaults to rz-slider-model
step: 1,
precision: 0,
minRange: 0,
minLimit: null,
maxLimit: null,
minRange: null,
maxRange: null,
id: null,
translate: null,
getLegend: null,
Expand Down Expand Up @@ -231,12 +232,14 @@ The default options are:

**precision** - _Number (defaults to 0)_: The precision to display values with. The `toFixed()` is used internally for this.

**minRange** - _Number (defaults to 0)_: The minimum range authorized on the slider. *Applies to range slider only.*

**minLimit** - _Number (defaults to null)_: The minimum value authorized on the slider.

**maxLimit** - _Number (defaults to null)_: The maximum value authorized on the slider.

**minRange** - _Number (defaults to null)_: The minimum range authorized on the slider. *Applies to range slider only.*

**maxRange** - _Number (defaults to null)_: The minimum range authorized on the slider. *Applies to range slider only.*

**translate** - _Function(value, sliderId, label)_: Custom translate function. Use this if you want to translate values displayed on the slider.
`sliderId` can be used to determine the slider for which we are translating the value. `label` is a string that can take the following values:
- *'model'*: the model label
Expand Down
13 changes: 7 additions & 6 deletions demo/demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
}
};

//Range slider with minRange config
//Range slider with minLimit and maxLimit config
$scope.minMaxLimitSlider = {
value: 50,
options: {
Expand All @@ -29,15 +29,16 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
}
};

//Range slider with minRange config
$scope.minRangeSlider = {
minValue: 10,
maxValue: 90,
//Range slider with minRange and maxRange config
$scope.minMaxRangeSlider = {
minValue: 40,
maxValue: 60,
options: {
floor: 0,
ceil: 100,
step: 1,
minRange: 10
minRange: 10,
maxRange: 50
}
};

Expand Down
8 changes: 4 additions & 4 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ <h2>Range slider with min limit set to 10 and max limit set to 90 </h2>
</article>

<article>
<h2>Range slider with minimum range of 10</h2>
<h2>Range slider with minimum range of 10 and maximum of 50</h2>
<rzslider
rz-slider-model="minRangeSlider.minValue"
rz-slider-high="minRangeSlider.maxValue"
rz-slider-options="minRangeSlider.options"
rz-slider-model="minMaxRangeSlider.minValue"
rz-slider-high="minMaxRangeSlider.maxValue"
rz-slider-options="minMaxRangeSlider.options"
></rzslider>
</article>

Expand Down
30 changes: 19 additions & 11 deletions dist/rzslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
ceil: null, //defaults to rz-slider-model
step: 1,
precision: 0,
minRange: 0,
minRange: null,
maxRange: null,
minLimit: null,
maxLimit: null,
id: null,
Expand Down Expand Up @@ -1758,11 +1759,11 @@

newValue = this.applyMinMaxLimit(newValue);
if (this.range) {
newValue = this.applyMinRange(newValue);
newValue = this.applyMinMaxRange(newValue);
/* This is to check if we need to switch the min and max handles */
if (this.tracking === 'rzSliderModel' && newValue > this.scope.rzSliderHigh) {
if (this.options.noSwitching && this.scope.rzSliderHigh !== this.minValue) {
newValue = this.applyMinRange(this.scope.rzSliderHigh);
newValue = this.applyMinMaxRange(this.scope.rzSliderHigh);
}
else {
this.scope[this.tracking] = this.scope.rzSliderHigh;
Expand All @@ -1777,7 +1778,7 @@
valueChanged = true;
} else if (this.tracking === 'rzSliderHigh' && newValue < this.scope.rzSliderModel) {
if (this.options.noSwitching && this.scope.rzSliderModel !== this.maxValue) {
newValue = this.applyMinRange(this.scope.rzSliderModel);
newValue = this.applyMinMaxRange(this.scope.rzSliderModel);
}
else {
this.scope[this.tracking] = this.scope.rzSliderModel;
Expand Down Expand Up @@ -1806,24 +1807,31 @@

applyMinMaxLimit: function(newValue) {
if (this.options.minLimit != null && newValue < this.options.minLimit)
return this.options.minLimit
return this.options.minLimit;
if (this.options.maxLimit != null && newValue > this.options.maxLimit)
return this.options.maxLimit
return this.options.maxLimit;
return newValue;
},

applyMinRange: function(newValue) {
if (this.options.minRange !== 0) {
var oppositeValue = this.tracking === 'rzSliderModel' ? this.scope.rzSliderHigh : this.scope.rzSliderModel,
difference = Math.abs(newValue - oppositeValue);

applyMinMaxRange: function(newValue) {
var oppositeValue = this.tracking === 'rzSliderModel' ? this.scope.rzSliderHigh : this.scope.rzSliderModel,
difference = Math.abs(newValue - oppositeValue);
if (this.options.minRange != null) {
if (difference < this.options.minRange) {
if (this.tracking === 'rzSliderModel')
return this.scope.rzSliderHigh - this.options.minRange;
else
return this.scope.rzSliderModel + this.options.minRange;
}
}
if (this.options.maxRange != null) {
if (difference > this.options.maxRange) {
if (this.tracking === 'rzSliderModel')
return this.scope.rzSliderHigh - this.options.maxRange;
else
return this.scope.rzSliderModel + this.options.maxRange;
}
}
return newValue;
},

Expand Down
2 changes: 1 addition & 1 deletion dist/rzslider.min.js
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 19 additions & 11 deletions src/rzslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
ceil: null, //defaults to rz-slider-model
step: 1,
precision: 0,
minRange: 0,
minRange: null,
maxRange: null,
minLimit: null,
maxLimit: null,
id: null,
Expand Down Expand Up @@ -1762,11 +1763,11 @@

newValue = this.applyMinMaxLimit(newValue);
if (this.range) {
newValue = this.applyMinRange(newValue);
newValue = this.applyMinMaxRange(newValue);
/* This is to check if we need to switch the min and max handles */
if (this.tracking === 'rzSliderModel' && newValue > this.scope.rzSliderHigh) {
if (this.options.noSwitching && this.scope.rzSliderHigh !== this.minValue) {
newValue = this.applyMinRange(this.scope.rzSliderHigh);
newValue = this.applyMinMaxRange(this.scope.rzSliderHigh);
}
else {
this.scope[this.tracking] = this.scope.rzSliderHigh;
Expand All @@ -1781,7 +1782,7 @@
valueChanged = true;
} else if (this.tracking === 'rzSliderHigh' && newValue < this.scope.rzSliderModel) {
if (this.options.noSwitching && this.scope.rzSliderModel !== this.maxValue) {
newValue = this.applyMinRange(this.scope.rzSliderModel);
newValue = this.applyMinMaxRange(this.scope.rzSliderModel);
}
else {
this.scope[this.tracking] = this.scope.rzSliderModel;
Expand Down Expand Up @@ -1810,24 +1811,31 @@

applyMinMaxLimit: function(newValue) {
if (this.options.minLimit != null && newValue < this.options.minLimit)
return this.options.minLimit
return this.options.minLimit;
if (this.options.maxLimit != null && newValue > this.options.maxLimit)
return this.options.maxLimit
return this.options.maxLimit;
return newValue;
},

applyMinRange: function(newValue) {
if (this.options.minRange !== 0) {
var oppositeValue = this.tracking === 'rzSliderModel' ? this.scope.rzSliderHigh : this.scope.rzSliderModel,
difference = Math.abs(newValue - oppositeValue);

applyMinMaxRange: function(newValue) {
var oppositeValue = this.tracking === 'rzSliderModel' ? this.scope.rzSliderHigh : this.scope.rzSliderModel,
difference = Math.abs(newValue - oppositeValue);
if (this.options.minRange != null) {
if (difference < this.options.minRange) {
if (this.tracking === 'rzSliderModel')
return this.scope.rzSliderHigh - this.options.minRange;
else
return this.scope.rzSliderModel + this.options.minRange;
}
}
if (this.options.maxRange != null) {
if (difference > this.options.maxRange) {
if (this.tracking === 'rzSliderModel')
return this.scope.rzSliderHigh - this.options.maxRange;
else
return this.scope.rzSliderModel + this.options.maxRange;
}
}
return newValue;
},

Expand Down
96 changes: 96 additions & 0 deletions tests/specs/keyboard-controls/specific-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,53 @@
expect(helper.scope.slider.max).to.equal(56);
});

it('should not be modified by keyboard if new range is above maxRange', function() {
var sliderConf = {
min: 45,
max: 55,
options: {
floor: 0,
ceil: 100,
step: 1,
maxRange: 10
}
};
helper.createRangeSlider(sliderConf);
//try to move minH left
helper.slider.minH.triggerHandler('focus');
helper.pressKeydown(helper.slider.minH, 'LEFT');
expect(helper.scope.slider.min).to.equal(45);

//try to move maxH right
helper.slider.maxH.triggerHandler('focus');
helper.pressKeydown(helper.slider.maxH, 'RIGHT');
expect(helper.scope.slider.max).to.equal(55);
});

it('should be modified by keyboard if new range is below maxRange', function() {
var sliderConf = {
min: 45,
max: 55,
options: {
floor: 0,
ceil: 100,
step: 1,
maxRange: 10
}
};
helper.createRangeSlider(sliderConf);

//try to move minH right
helper.slider.minH.triggerHandler('focus');
helper.pressKeydown(helper.slider.minH, 'RIGHT');
expect(helper.scope.slider.min).to.equal(46);

//try to move maxH left
helper.slider.maxH.triggerHandler('focus');
helper.pressKeydown(helper.slider.maxH, 'LEFT');
expect(helper.scope.slider.max).to.equal(54);
});

it('should be modified by keyboard if new value is above minLimit', function() {
var sliderConf = {
value: 10,
Expand Down Expand Up @@ -327,6 +374,55 @@
helper.pressKeydown(helper.slider.maxH, 'LEFT');
expect(helper.scope.slider.max).to.equal(56);
});

it('should not be modified by keyboard if new range is above maxRange', function() {
var sliderConf = {
min: 45,
max: 55,
options: {
floor: 0,
ceil: 100,
step: 1,
maxRange: 10,
rightToLeft: true
}
};
helper.createRangeSlider(sliderConf);
//try to move minH right ( increase in rtl )
helper.slider.minH.triggerHandler('focus');
helper.pressKeydown(helper.slider.minH, 'RIGHT');
expect(helper.scope.slider.min).to.equal(45);

//try to move maxH left (decrease in rtl )
helper.slider.maxH.triggerHandler('focus');
helper.pressKeydown(helper.slider.maxH, 'LEFT');
expect(helper.scope.slider.max).to.equal(55);
});

it('should be modified by keyboard if new range is below maxRange', function() {
var sliderConf = {
min: 45,
max: 55,
options: {
floor: 0,
ceil: 100,
step: 1,
maxRange: 10,
rightToLeft: true
}
};
helper.createRangeSlider(sliderConf);

//try to move minH LEFT
helper.slider.minH.triggerHandler('focus');
helper.pressKeydown(helper.slider.minH, 'LEFT');
expect(helper.scope.slider.min).to.equal(46);

//try to move maxH RIGHT
helper.slider.maxH.triggerHandler('focus');
helper.pressKeydown(helper.slider.maxH, 'RIGHT');
expect(helper.scope.slider.max).to.equal(54);
});
});
}());

0 ...Switching-range-slider-horizontal-test.js → ...Switching-range-slider-horizontal-test.js
View file
Open in desktop
File renamed without changes.
Loading