Skip to content
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

RTL Support proposal (Issue #156) #199

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

RTL Support proposal (Issue #156) #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a946447
slide index
aurovrata Sep 20, 2020
fc35cb7
slide index
aurovrata Sep 20, 2020
44e0301
Merge remote-tracking branch 'upstream/master'
Jan 8, 2021
20176f8
Merge branch 'master' of https://github.com/NickPiscitelli/Glider.js …
aurovrata Aug 31, 2021
b683bcf
Add _.opt.dir
aurovrata Sep 1, 2021
5a7619f
enable rtl
aurovrata Sep 1, 2021
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
.config
.npm
/*~
43 changes: 24 additions & 19 deletions glider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,15 @@
slidesToShow: 1,
resizeLock: true,
duration: 0.5,
dir: (_window.getComputedStyle(_.ele).direction === 'rtl') ? -1:1,
// easeInQuad
easing: function (x, t, b, c, d) {
return c * (t /= d) * t + b
}
},
settings
)

if(Math.abs(_.opt.dir) != 1) _.opt.dir = 1;
// set defaults
_.animate_id = _.page = _.slide = 0
_.arrows = {}
Expand Down Expand Up @@ -100,6 +101,7 @@

_.slides = _.track.children;


[].forEach.call(_.slides, function (_, i) {
_.classList.add('glider-slide')
_.setAttribute('data-gslide', i)
Expand Down Expand Up @@ -260,7 +262,7 @@
if (_.arrows.prev) {
_.arrows.prev.classList.toggle(
'disabled',
_.ele.scrollLeft <= 0 || disableArrows
(_.opt.dir * _.ele.scrollLeft) <= 0 || disableArrows
)
_.arrows.prev.classList.contains('disabled')
? _.arrows.prev.setAttribute('aria-disabled', true)
Expand All @@ -269,7 +271,7 @@
if (_.arrows.next) {
_.arrows.next.classList.toggle(
'disabled',
Math.ceil(_.ele.scrollLeft + _.containerWidth) >=
Math.ceil((_.opt.dir * _.ele.scrollLeft) + _.containerWidth) >=
Math.floor(_.trackWidth) || disableArrows
)
_.arrows.next.classList.contains('disabled')
Expand All @@ -278,8 +280,8 @@
}
}

_.slide = Math.round(_.ele.scrollLeft / _.itemWidth)
_.page = Math.round(_.ele.scrollLeft / _.containerWidth)
_.slide = Math.round((_.opt.dir * _.ele.scrollLeft) / _.itemWidth)
_.page = Math.round((_.opt.dir * _.ele.scrollLeft) / _.containerWidth)

var middle = _.slide + Math.floor(Math.floor(_.opt.slidesToShow) / 2)

Expand All @@ -290,7 +292,7 @@

// the last page may be less than one half of a normal page width so
// the page is rounded down. when at the end, force the page to turn
if (_.ele.scrollLeft + _.containerWidth >= Math.floor(_.trackWidth)) {
if ((_.opt.dir * _.ele.scrollLeft) + _.containerWidth >= Math.floor(_.trackWidth)) {
_.page = _.dots ? _.dots.children.length - 1 : 0
}

Expand All @@ -299,9 +301,9 @@

var wasVisible = slideClasses.contains('visible')

var start = _.ele.scrollLeft
var start = (_.opt.dir * _.ele.scrollLeft)

var end = _.ele.scrollLeft + _.containerWidth
var end = (_.opt.dir * _.ele.scrollLeft) + _.containerWidth

var itemStart = _.itemWidth * index

Expand Down Expand Up @@ -344,10 +346,10 @@
_.scrollLock = setTimeout(function () {
clearTimeout(_.scrollLock)
// dont attempt to scroll less than a pixel fraction - causes looping
if (Math.abs(_.ele.scrollLeft / _.itemWidth - _.slide) > 0.02) {
if (Math.abs((_.opt.dir * _.ele.scrollLeft) / _.itemWidth - _.slide) > 0.02) {
if (!_.mouseDown) {
// Only scroll if not at the end (#94)
if (_.trackWidth > _.containerWidth + _.ele.scrollLeft) {
if (_.trackWidth > (_.containerWidth + _.opt.dir * _.ele.scrollLeft)) {
_.scrollItem(_.getCurrentSlide())
}
}
Expand All @@ -358,7 +360,7 @@

gliderPrototype.getCurrentSlide = function () {
var _ = this
return _.round(_.ele.scrollLeft / _.itemWidth)
return _.round((_.opt.dir * _.ele.scrollLeft) / _.itemWidth)
}

gliderPrototype.scrollItem = function (slide, dot, e) {
Expand Down Expand Up @@ -387,7 +389,7 @@
else slide += _.opt.slidesToScroll

if (_.opt.rewind) {
var scrollLeft = _.ele.scrollLeft
var scrollLeft = (_.opt.dir * _.ele.scrollLeft)
slide =
backwards && !scrollLeft
? _.slides.length
Expand All @@ -406,7 +408,7 @@

_.scrollTo(
slide,
_.opt.duration * Math.abs(_.ele.scrollLeft - slide),
_.opt.duration * Math.abs((_.opt.dir * _.ele.scrollLeft) - slide),
function () {
_.updateControls()
_.emit('animated', {
Expand Down Expand Up @@ -459,14 +461,17 @@

var animate = function () {
var now = new Date().getTime() - start
_.ele.scrollLeft =
_.ele.scrollLeft +
(scrollTarget - _.ele.scrollLeft) *
_.opt.easing(0, now, 0, 1, scrollDuration)

var scrollLeft = _.opt.dir * _.ele.scrollLeft
_.ele.scrollLeft = _.opt.dir * (
scrollLeft +
(scrollTarget - scrollLeft) *
_.opt.easing(0, now, 0, 1, scrollDuration)
)
if (now < scrollDuration && animateIndex === _.animate_id) {
_window.requestAnimationFrame(animate)
} else {
_.ele.scrollLeft = scrollTarget
_.ele.scrollLeft = _.opt.dir * scrollTarget
callback && callback.call(_)
}
}
Expand Down Expand Up @@ -497,7 +502,7 @@
if (_.mouseDown) {
_.isDrag = true
_.ele.scrollLeft +=
(_.mouseDown - e.clientX) * (_.opt.dragVelocity || 3.3)
_.opt.dir * (_.mouseDown - e.clientX) * (_.opt.dragVelocity || 3.3)
_.mouseDown = e.clientX
}
}
Expand Down