Skip to content

Commit 51532fe

Browse files
committed
fix(scale option): Fix Slider goes back when moved and scaled
close #346
1 parent 7cae6d8 commit 51532fe

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

demo/demo.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
1313
options: {
1414
floor: 0,
1515
ceil: 100,
16-
rightToLeft: true,
1716
step: 1
1817
}
1918
};

dist/rzslider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! angularjs-slider - v5.7.0 -
22
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
33
https://github.com/angular-slider/angularjs-slider -
4-
2016-10-16 */
4+
2016-10-22 */
55
/*jslint unparam: true */
66
/*global angular: false, console: false, define, module */
77
(function(root, factory) {
@@ -1526,7 +1526,7 @@
15261526
eventPos = -this.getEventXY(event) + sliderPos;
15271527
else
15281528
eventPos = this.getEventXY(event) - sliderPos;
1529-
return (eventPos - this.handleHalfDim) * this.options.scale;
1529+
return eventPos * this.options.scale - this.handleHalfDim; // #346 handleHalfDim is already scaled
15301530
},
15311531

15321532
/**

dist/rzslider.min.js

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

src/rzslider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@
15301530
eventPos = -this.getEventXY(event) + sliderPos;
15311531
else
15321532
eventPos = this.getEventXY(event) - sliderPos;
1533-
return (eventPos - this.handleHalfDim) * this.options.scale;
1533+
return eventPos * this.options.scale - this.handleHalfDim; // #346 handleHalfDim is already scaled
15341534
},
15351535

15361536
/**

tests/specs/helper-functions-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
helper.slider.sliderElem.rzsp = 10;
342342
helper.slider.handleHalfDim = 16;
343343

344-
expect(helper.slider.getEventPosition(event)).to.equal(10);
344+
expect(helper.slider.getEventPosition(event)).to.equal(2);
345345
});
346346

347347
it('should have a valid getEventPosition for vertical sliders with scale option', function() {
@@ -355,7 +355,7 @@
355355
helper.slider.sliderElem.rzsp = 10;
356356
helper.slider.handleHalfDim = 16;
357357

358-
expect(helper.slider.getEventPosition(event)).to.equal(-26);
358+
expect(helper.slider.getEventPosition(event)).to.equal(-34);
359359
});
360360

361361
it('should have a valid getEventNames for desktop', function() {

0 commit comments

Comments
 (0)