Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
I
i20rzslider
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jedife
i20rzslider
Commits
51532fe8
Commit
51532fe8
authored
Oct 22, 2016
by
Valentin Hervieu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(scale option): Fix Slider goes back when moved and scaled
close #346
parent
7cae6d86
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
demo.js
demo/demo.js
+0
-1
rzslider.js
dist/rzslider.js
+2
-2
rzslider.min.js
dist/rzslider.min.js
+2
-2
rzslider.js
src/rzslider.js
+1
-1
helper-functions-test.js
tests/specs/helper-functions-test.js
+2
-2
No files found.
demo/demo.js
View file @
51532fe8
...
...
@@ -13,7 +13,6 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
options
:
{
floor
:
0
,
ceil
:
100
,
rightToLeft
:
true
,
step
:
1
}
};
...
...
dist/rzslider.js
View file @
51532fe8
/*! angularjs-slider - v5.7.0 -
(c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> -
https://github.com/angular-slider/angularjs-slider -
2016-10-
16
*/
2016-10-
22
*/
/*jslint unparam: true */
/*global angular: false, console: false, define, module */
(
function
(
root
,
factory
)
{
...
...
@@ -1526,7 +1526,7 @@
eventPos
=
-
this
.
getEventXY
(
event
)
+
sliderPos
;
else
eventPos
=
this
.
getEventXY
(
event
)
-
sliderPos
;
return
(
eventPos
-
this
.
handleHalfDim
)
*
this
.
options
.
scale
;
return
eventPos
*
this
.
options
.
scale
-
this
.
handleHalfDim
;
// #346 handleHalfDim is already scaled
},
/**
...
...
dist/rzslider.min.js
View file @
51532fe8
This diff is collapsed.
Click to expand it.
src/rzslider.js
View file @
51532fe8
...
...
@@ -1530,7 +1530,7 @@
eventPos
=
-
this
.
getEventXY
(
event
)
+
sliderPos
;
else
eventPos
=
this
.
getEventXY
(
event
)
-
sliderPos
;
return
(
eventPos
-
this
.
handleHalfDim
)
*
this
.
options
.
scale
;
return
eventPos
*
this
.
options
.
scale
-
this
.
handleHalfDim
;
// #346 handleHalfDim is already scaled
},
/**
...
...
tests/specs/helper-functions-test.js
View file @
51532fe8
...
...
@@ -341,7 +341,7 @@
helper
.
slider
.
sliderElem
.
rzsp
=
10
;
helper
.
slider
.
handleHalfDim
=
16
;
expect
(
helper
.
slider
.
getEventPosition
(
event
)).
to
.
equal
(
10
);
expect
(
helper
.
slider
.
getEventPosition
(
event
)).
to
.
equal
(
2
);
});
it
(
'should have a valid getEventPosition for vertical sliders with scale option'
,
function
()
{
...
...
@@ -355,7 +355,7 @@
helper
.
slider
.
sliderElem
.
rzsp
=
10
;
helper
.
slider
.
handleHalfDim
=
16
;
expect
(
helper
.
slider
.
getEventPosition
(
event
)).
to
.
equal
(
-
26
);
expect
(
helper
.
slider
.
getEventPosition
(
event
)).
to
.
equal
(
-
34
);
});
it
(
'should have a valid getEventNames for desktop'
,
function
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment