Skip to content

added support for events: setPosition, beforeChange + added edgeFriction support #114

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

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

added support for events: setPosition, beforeChange + added edgeFriction support #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b85a6c6
added support for events: setPosition, beforeChange
Jul 16, 2015
891a848
added support for events: setPosition, beforeChange
galziv Jul 16, 2015
2fec79e
added support for edgeFriction
galziv Jul 16, 2015
24dcf8b
fixed currentIndex binding
galziv Jul 16, 2015
f54d19f
create new bower package name
galziv Jul 16, 2015
4ea609a
Update bower.json
galziv Jul 16, 2015
67f448e
Update bower.json
galziv Jul 16, 2015
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
8 changes: 4 additions & 4 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-slick",
"version": "0.2.1",
"name": "slick-angular",
"version": "0.3",
"main": "dist/slick.js",
"ignore": [
"app",
Expand All @@ -20,9 +20,9 @@
],
"dependencies": {
"angular": "~1.3.0",
"slick-carousel": "~1.4.1"
"slick-carousel": "1.5.6"
},
"author": {
"name": "Vasyl Stanislavchuk"
"name": "Gal Ziv"
}
}
323 changes: 168 additions & 155 deletions dist/slick.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,161 +2,174 @@
angular.module('slick', []).directive('slick', [
'$timeout',
function ($timeout) {
return {
restrict: 'AEC',
scope: {
initOnload: '@',
data: '=',
currentIndex: '=',
accessibility: '@',
adaptiveHeight: '@',
arrows: '@',
asNavFor: '@',
appendArrows: '@',
appendDots: '@',
autoplay: '@',
autoplaySpeed: '@',
centerMode: '@',
centerPadding: '@',
cssEase: '@',
customPaging: '&',
dots: '@',
draggable: '@',
easing: '@',
fade: '@',
focusOnSelect: '@',
infinite: '@',
initialSlide: '@',
lazyLoad: '@',
onBeforeChange: '&',
onAfterChange: '&',
onInit: '&',
onReInit: '&',
onSetPosition: '&',
pauseOnHover: '@',
pauseOnDotsHover: '@',
responsive: '=',
rtl: '@',
slide: '@',
slidesToShow: '@',
slidesToScroll: '@',
speed: '@',
swipe: '@',
swipeToSlide: '@',
touchMove: '@',
touchThreshold: '@',
useCSS: '@',
variableWidth: '@',
vertical: '@',
prevArrow: '@',
nextArrow: '@'
},
link: function (scope, element, attrs) {
var destroySlick, initializeSlick, isInitialized;
destroySlick = function () {
return $timeout(function () {
var slider;
slider = $(element);
slider.slick('unslick');
slider.find('.slick-list').remove();
return slider;
});
};
initializeSlick = function () {
return $timeout(function () {
var currentIndex, customPaging, slider;
slider = $(element);
if (scope.currentIndex != null) {
currentIndex = scope.currentIndex;
}
customPaging = function (slick, index) {
return scope.customPaging({
slick: slick,
index: index
});
};
slider.slick({
accessibility: scope.accessibility !== 'false',
adaptiveHeight: scope.adaptiveHeight === 'true',
arrows: scope.arrows !== 'false',
asNavFor: scope.asNavFor ? scope.asNavFor : void 0,
appendArrows: scope.appendArrows ? $(scope.appendArrows) : $(element),
appendDots: scope.appendDots ? $(scope.appendDots) : $(element),
autoplay: scope.autoplay === 'true',
autoplaySpeed: scope.autoplaySpeed != null ? parseInt(scope.autoplaySpeed, 10) : 3000,
centerMode: scope.centerMode === 'true',
centerPadding: scope.centerPadding || '50px',
cssEase: scope.cssEase || 'ease',
customPaging: attrs.customPaging ? customPaging : void 0,
dots: scope.dots === 'true',
draggable: scope.draggable !== 'false',
easing: scope.easing || 'linear',
fade: scope.fade === 'true',
focusOnSelect: scope.focusOnSelect === 'true',
infinite: scope.infinite !== 'false',
initialSlide: scope.initialSlide || 0,
lazyLoad: scope.lazyLoad || 'ondemand',
beforeChange: attrs.onBeforeChange ? scope.onBeforeChange : void 0,
onReInit: attrs.onReInit ? scope.onReInit : void 0,
onSetPosition: attrs.onSetPosition ? scope.onSetPosition : void 0,
pauseOnHover: scope.pauseOnHover !== 'false',
responsive: scope.responsive || void 0,
rtl: scope.rtl === 'true',
slide: scope.slide || 'div',
slidesToShow: scope.slidesToShow != null ? parseInt(scope.slidesToShow, 10) : 1,
slidesToScroll: scope.slidesToScroll != null ? parseInt(scope.slidesToScroll, 10) : 1,
speed: scope.speed != null ? parseInt(scope.speed, 10) : 300,
swipe: scope.swipe !== 'false',
swipeToSlide: scope.swipeToSlide === 'true',
touchMove: scope.touchMove !== 'false',
touchThreshold: scope.touchThreshold ? parseInt(scope.touchThreshold, 10) : 5,
useCSS: scope.useCSS !== 'false',
variableWidth: scope.variableWidth === 'true',
vertical: scope.vertical === 'true',
prevArrow: scope.prevArrow ? $(scope.prevArrow) : void 0,
nextArrow: scope.nextArrow ? $(scope.nextArrow) : void 0
});
slider.on('init', function (sl) {
if (attrs.onInit) {
scope.onInit();
return {
restrict: 'AEC',
scope: {
initOnload: '@',
data: '=?',
currentIndex: '=?',
accessibility: '@',
adaptiveHeight: '@',
arrows: '@',
asNavFor: '@',
appendArrows: '@',
appendDots: '@',
autoplay: '@',
autoplaySpeed: '@',
centerMode: '@',
centerPadding: '@',
cssEase: '@',
customPaging: '&',
dots: '@',
draggable: '@',
easing: '@',
edgeFriction: '@',
fade: '@',
focusOnSelect: '@',
infinite: '@',
initialSlide: '@',
lazyLoad: '@',
onBeforeChange: '&',
onAfterChange: '&',
onInit: '&',
onReInit: '&',
onSetPosition: '&',
pauseOnHover: '@',
pauseOnDotsHover: '@',
responsive: '=?',
rtl: '@',
slide: '@',
slidesToShow: '@',
slidesToScroll: '@',
speed: '@',
swipe: '@',
swipeToSlide: '@',
touchMove: '@',
touchThreshold: '@',
useCSS: '@',
variableWidth: '@',
vertical: '@',
prevArrow: '@',
nextArrow: '@'
},
link: function (scope, element, attrs) {
var destroySlick, initializeSlick, isInitialized;
destroySlick = function () {
return $timeout(function () {
var slider;
slider = $(element);
slider.slick('unslick');
slider.find('.slick-list').remove();
return slider;
});
};
initializeSlick = function () {
return $timeout(function () {
var currentIndex, customPaging, slider;
slider = $(element);
scope.currentIndex = scope.initialSlide || scope.currentIndex;
if (scope.currentIndex != null) {
currentIndex = scope.currentIndex;
}
customPaging = function (slick, index) {
return scope.customPaging({
slick: slick,
index: index
});
};
slider.slick({
accessibility: scope.accessibility !== 'false',
adaptiveHeight: scope.adaptiveHeight === 'true',
arrows: scope.arrows !== 'false',
asNavFor: scope.asNavFor ? scope.asNavFor : void 0,
appendArrows: scope.appendArrows ? $(scope.appendArrows) : $(element),
appendDots: scope.appendDots ? $(scope.appendDots) : $(element),
autoplay: scope.autoplay === 'true',
autoplaySpeed: scope.autoplaySpeed != null ? parseInt(scope.autoplaySpeed, 10) : 3000,
centerMode: scope.centerMode === 'true',
centerPadding: scope.centerPadding || '50px',
cssEase: scope.cssEase || 'ease',
customPaging: attrs.customPaging ? customPaging : void 0,
dots: scope.dots === 'true',
draggable: scope.draggable !== 'false',
easing: scope.easing || 'linear',
edgeFriction: scope.edgeFriction || 0.15, // default value as per slick's website
fade: scope.fade === 'true',
focusOnSelect: scope.focusOnSelect === 'true',
infinite: scope.infinite !== 'false',
initialSlide: scope.initialSlide || 0,
lazyLoad: scope.lazyLoad || 'ondemand',
beforeChange: attrs.onBeforeChange ? scope.onBeforeChange : void 0,
onReInit: attrs.onReInit ? scope.onReInit : void 0,
onSetPosition: attrs.onSetPosition ? scope.onSetPosition : void 0,
pauseOnHover: scope.pauseOnHover !== 'false',
responsive: scope.responsive || void 0,
rtl: scope.rtl === 'true',
slide: scope.slide || 'div',
slidesToShow: scope.slidesToShow != null ? parseInt(scope.slidesToShow, 10) : 1,
slidesToScroll: scope.slidesToScroll != null ? parseInt(scope.slidesToScroll, 10) : 1,
speed: scope.speed != null ? parseInt(scope.speed, 10) : 300,
swipe: scope.swipe !== 'false',
swipeToSlide: scope.swipeToSlide === 'true',
touchMove: scope.touchMove !== 'false',
touchThreshold: scope.touchThreshold ? parseInt(scope.touchThreshold, 10) : 5,
useCSS: scope.useCSS !== 'false',
variableWidth: scope.variableWidth === 'true',
vertical: scope.vertical === 'true',
prevArrow: scope.prevArrow ? $(scope.prevArrow) : void 0,
nextArrow: scope.nextArrow ? $(scope.nextArrow) : void 0
});
slider.on('init', function (event, slick) {
if (attrs.onInit) {
scope.onInit(event, slick);
}
if (currentIndex != null) {
return sl.slideHandler(currentIndex);
}
});
slider.on('setPosition', function (event, slick) {
if (attrs.onSetPosition) {
scope.onSetPosition(event, slick);
}
});
slider.on('beforeChange', function (event, slick, currentSlide, nextSlide) {
if (attrs.onBeforeChange) {
scope.onBeforeChange(event, slick, currentSlide, nextSlide);
}
});
slider.on('afterChange', function (event, slick, currentSlide) {
if (scope.onAfterChange) {
scope.onAfterChange(event, slick, currentSlide);
}
if (scope.currentIndex != null) {
return scope.$apply(function () {
currentIndex = currentSlide;
return scope.currentIndex = currentSlide;
});
}
});
return scope.$watch('currentIndex', function (newVal, oldVal) {
if (currentIndex != null && newVal != null && newVal !== currentIndex) {
return slider.slick('slickGoTo', newVal);
}
});
});
};
if (scope.initOnload) {
isInitialized = false;
return scope.$watch('data', function (newVal, oldVal) {
if (newVal != null) {
if (isInitialized) {
destroySlick();
}
initializeSlick();
return isInitialized = true;
}
});
} else {
return initializeSlick();
}
if (currentIndex != null) {
return sl.slideHandler(currentIndex);
}
});
slider.on('afterChange', function (event, slick, currentSlide, nextSlide) {
if (scope.onAfterChange) {
scope.onAfterChange();
}
if (currentIndex != null) {
return scope.$apply(function () {
currentIndex = currentSlide;
return scope.currentIndex = currentSlide;
});
}
});
return scope.$watch('currentIndex', function (newVal, oldVal) {
if (currentIndex != null && newVal != null && newVal !== currentIndex) {
return slider.slick('slickGoTo', newVal);
}
});
});
};
if (scope.initOnload) {
isInitialized = false;
return scope.$watch('data', function (newVal, oldVal) {
if (newVal != null) {
if (isInitialized) {
destroySlick();
}
initializeSlick();
return isInitialized = true;
}
});
} else {
return initializeSlick();
}
}
};
}
};
}
]);