From c91575f6b51e7045f6574294467f2c15c5a2c962 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 24 Nov 2015 10:43:14 +0800 Subject: [PATCH] fix customPaging not work --- bower.json | 2 +- dist/angular-slick.js | 12 +++++++----- dist/angular-slick.min.js | 4 ++-- package.json | 2 +- src/slick.js | 4 +++- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index 0d1f960..354922c 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-slick-carousel", - "version": "3.1.1", + "version": "3.1.2", "homepage": "https://github.com/devmark/angular-slick-carousel", "authors": [ "DevMark " diff --git a/dist/angular-slick.js b/dist/angular-slick.js index 69af9fa..ab3b158 100644 --- a/dist/angular-slick.js +++ b/dist/angular-slick.js @@ -2,7 +2,7 @@ * angular-slick-carousel * DevMark * https://github.com/devmark/angular-slick-carousel - * Version: 3.1.1 - 2015-10-26T14:22:13.640Z + * Version: 3.1.2 - 2015-11-24T02:43:00.279Z * License: MIT */ @@ -83,13 +83,15 @@ angular autoplaySpeed: scope.autoplaySpeed != null ? parseInt(scope.autoplaySpeed, 10) : 3000, arrows: scope.arrows !== 'false', asNavFor: scope.asNavFor ? scope.asNavFor : void 0, - appendArrows: scope.appendArrows ? $(scope.appendArrows) : $(element), - prevArrow: scope.prevArrow ? $(scope.prevArrow) : void 0, - nextArrow: scope.nextArrow ? $(scope.nextArrow) : void 0, + appendArrows: scope.appendArrows ? angular.element(scope.appendArrows) : angular.element(element), + prevArrow: scope.prevArrow ? angular.element(scope.prevArrow) : void 0, + nextArrow: scope.nextArrow ? angular.element(scope.nextArrow) : void 0, centerMode: scope.centerMode === 'true', centerPadding: scope.centerPadding || '50px', cssEase: scope.cssEase || 'ease', - customPaging: attr.customPaging ? customPaging : void 0, + customPaging: attr.customPaging ? function (slick, index) { + return scope.customPaging({ slick: slick, index: index }); + } : void 0, dots: attr.dots || scope.dots === 'true', draggable: scope.draggable !== 'false', fade: scope.fade === 'true', diff --git a/dist/angular-slick.min.js b/dist/angular-slick.min.js index 1239dbb..d080588 100644 --- a/dist/angular-slick.min.js +++ b/dist/angular-slick.min.js @@ -2,7 +2,7 @@ * angular-slick-carousel * DevMark * https://github.com/devmark/angular-slick-carousel - * Version: 3.1.1 - 2015-10-26T14:22:13.640Z + * Version: 3.1.2 - 2015-11-24T02:43:00.279Z * License: MIT */ -"use strict";angular.module("slickCarousel",[]).constant("slickCarouselConfig",{method:{},event:{}}).directive("slick",["$timeout","slickCarouselConfig",function(e,n){var i,t;return i=["slickGoTo","slickNext","slickPrev","slickPause","slickPlay","slickAdd","slickRemove","slickFilter","slickUnfilter","unslick"],t=["afterChange","beforeChange","breakpoint","destroy","edge","init","reInit","setPosition","swipe"],{scope:{settings:"=",accessibility:"@",adaptiveHeight:"@",autoplay:"@",autoplaySpeed:"@",arrows:"@",asNavFor:"@",appendArrows:"@",prevArrow:"@",nextArrow:"@",centerMode:"@",centerPadding:"@",cssEase:"@",customPaging:"&",dots:"@",draggable:"@",fade:"@",focusOnSelect:"@",easing:"@",edgeFriction:"@",infinite:"@",initialSlide:"@",lazyLoad:"@",mobileFirst:"@",pauseOnHover:"@",pauseOnDotsHover:"@",respondTo:"@",responsive:"=?",rows:"@",slide:"@",slidesPerRow:"@",slidesToShow:"@",slidesToScroll:"@",speed:"@",swipe:"@",swipeToSlide:"@",touchMove:"@",touchThreshold:"@",useCSS:"@",variableWidth:"@",vertical:"@",verticalSwiping:"@",rtl:"@"},restrict:"AE",link:function(t,o,s){angular.element(o).css("display","none");var r,a,l,d,u,c;return a=function(){r=angular.extend(angular.copy(n),{accessibility:"false"!==t.accessibility,adaptiveHeight:"true"===t.adaptiveHeight,autoplay:"true"===t.autoplay,autoplaySpeed:null!=t.autoplaySpeed?parseInt(t.autoplaySpeed,10):3e3,arrows:"false"!==t.arrows,asNavFor:t.asNavFor?t.asNavFor:void 0,appendArrows:$(t.appendArrows?t.appendArrows:o),prevArrow:t.prevArrow?$(t.prevArrow):void 0,nextArrow:t.nextArrow?$(t.nextArrow):void 0,centerMode:"true"===t.centerMode,centerPadding:t.centerPadding||"50px",cssEase:t.cssEase||"ease",customPaging:s.customPaging?customPaging:void 0,dots:s.dots||"true"===t.dots,draggable:"false"!==t.draggable,fade:"true"===t.fade,focusOnSelect:"true"===t.focusOnSelect,easing:t.easing||"linear",edgeFriction:t.edgeFriction||.15,infinite:"false"!==t.infinite,initialSlide:t.initialSlide||0,lazyLoad:t.lazyLoad||"ondemand",mobileFirst:"true"===t.mobileFirst,pauseOnHover:"false"!==t.pauseOnHover,pauseOnDotsHover:"true"===t.pauseOnDotsHover,respondTo:null!=t.respondTo?t.respondTo:"window",responsive:t.responsive||void 0,rows:null!=t.rows?parseInt(t.rows,10):1,slide:t.slide||"",slidesPerRow:null!=t.slidesPerRow?parseInt(t.slidesPerRow,10):1,slidesToShow:null!=t.slidesToShow?parseInt(t.slidesToShow,10):1,slidesToScroll:null!=t.slidesToScroll?parseInt(t.slidesToScroll,10):1,speed:null!=t.speed?parseInt(t.speed,10):300,swipe:"false"!==t.swipe,swipeToSlide:"true"===t.swipeToSlide,touchMove:"false"!==t.touchMove,touchThreshold:t.touchThreshold?parseInt(t.touchThreshold,10):5,useCSS:"false"!==t.useCSS,variableWidth:"true"===t.variableWidth,vertical:"true"===t.vertical,verticalSwiping:"true"===t.verticalSwiping,rtl:"true"===t.rtl},t.settings)},l=function(){var e=angular.element(o);return e.hasClass("slick-initialized")&&(e.remove("slick-list"),e.slick("unslick")),e},d=function(){a();var n=angular.element(o);return angular.element(o).hasClass("slick-initialized")?n.slick("getSlick"):(angular.element(o).css("display","block"),n.on("init",function(e,n){return"undefined"!=typeof r.event.init&&r.event.init(e,n),"undefined"!=typeof c?n.slideHandler(c):void 0}),e(function(){n.slick(r)}),t.internalControl=r.method||{},i.forEach(function(e){t.internalControl[e]=function(){var i;i=Array.prototype.slice.call(arguments),i.unshift(e),n.slick.apply(o,i)}}),n.on("afterChange",function(e,n,i,t){c=i,"undefined"!=typeof r.event.afterChange&&r.event.afterChange(e,n,i,t)}),n.on("beforeChange",function(e,n,i,t){"undefined"!=typeof r.event.beforeChange&&r.event.beforeChange(e,n,i,t)}),n.on("reInit",function(e,n){"undefined"!=typeof r.event.reInit&&r.event.reInit(e,n)}),"undefined"!=typeof r.event.breakpoint&&n.on("breakpoint",function(e,n,i){r.event.breakpoint(e,n,i)}),"undefined"!=typeof r.event.destroy&&n.on("destroy",function(e,n){r.event.destroy(e,n)}),"undefined"!=typeof r.event.edge&&n.on("edge",function(e,n,i){r.event.edge(e,n,i)}),"undefined"!=typeof r.event.setPosition&&n.on("setPosition",function(e,n){r.event.setPosition(e,n)}),void("undefined"!=typeof r.event.swipe&&n.on("swipe",function(e,n,i){r.event.swipe(e,n,i)})))},u=function(){l(),d()},o.one("$destroy",function(){l()}),t.$watch("settings",function(e,n){return null!==e?u():void 0},!0)}}}]); \ No newline at end of file +"use strict";angular.module("slickCarousel",[]).constant("slickCarouselConfig",{method:{},event:{}}).directive("slick",["$timeout","slickCarouselConfig",function(e,n){var i,t;return i=["slickGoTo","slickNext","slickPrev","slickPause","slickPlay","slickAdd","slickRemove","slickFilter","slickUnfilter","unslick"],t=["afterChange","beforeChange","breakpoint","destroy","edge","init","reInit","setPosition","swipe"],{scope:{settings:"=",accessibility:"@",adaptiveHeight:"@",autoplay:"@",autoplaySpeed:"@",arrows:"@",asNavFor:"@",appendArrows:"@",prevArrow:"@",nextArrow:"@",centerMode:"@",centerPadding:"@",cssEase:"@",customPaging:"&",dots:"@",draggable:"@",fade:"@",focusOnSelect:"@",easing:"@",edgeFriction:"@",infinite:"@",initialSlide:"@",lazyLoad:"@",mobileFirst:"@",pauseOnHover:"@",pauseOnDotsHover:"@",respondTo:"@",responsive:"=?",rows:"@",slide:"@",slidesPerRow:"@",slidesToShow:"@",slidesToScroll:"@",speed:"@",swipe:"@",swipeToSlide:"@",touchMove:"@",touchThreshold:"@",useCSS:"@",variableWidth:"@",vertical:"@",verticalSwiping:"@",rtl:"@"},restrict:"AE",link:function(t,o,s){angular.element(o).css("display","none");var r,a,l,d,u,c;return a=function(){r=angular.extend(angular.copy(n),{accessibility:"false"!==t.accessibility,adaptiveHeight:"true"===t.adaptiveHeight,autoplay:"true"===t.autoplay,autoplaySpeed:null!=t.autoplaySpeed?parseInt(t.autoplaySpeed,10):3e3,arrows:"false"!==t.arrows,asNavFor:t.asNavFor?t.asNavFor:void 0,appendArrows:angular.element(t.appendArrows?t.appendArrows:o),prevArrow:t.prevArrow?angular.element(t.prevArrow):void 0,nextArrow:t.nextArrow?angular.element(t.nextArrow):void 0,centerMode:"true"===t.centerMode,centerPadding:t.centerPadding||"50px",cssEase:t.cssEase||"ease",customPaging:s.customPaging?function(e,n){return t.customPaging({slick:e,index:n})}:void 0,dots:s.dots||"true"===t.dots,draggable:"false"!==t.draggable,fade:"true"===t.fade,focusOnSelect:"true"===t.focusOnSelect,easing:t.easing||"linear",edgeFriction:t.edgeFriction||.15,infinite:"false"!==t.infinite,initialSlide:t.initialSlide||0,lazyLoad:t.lazyLoad||"ondemand",mobileFirst:"true"===t.mobileFirst,pauseOnHover:"false"!==t.pauseOnHover,pauseOnDotsHover:"true"===t.pauseOnDotsHover,respondTo:null!=t.respondTo?t.respondTo:"window",responsive:t.responsive||void 0,rows:null!=t.rows?parseInt(t.rows,10):1,slide:t.slide||"",slidesPerRow:null!=t.slidesPerRow?parseInt(t.slidesPerRow,10):1,slidesToShow:null!=t.slidesToShow?parseInt(t.slidesToShow,10):1,slidesToScroll:null!=t.slidesToScroll?parseInt(t.slidesToScroll,10):1,speed:null!=t.speed?parseInt(t.speed,10):300,swipe:"false"!==t.swipe,swipeToSlide:"true"===t.swipeToSlide,touchMove:"false"!==t.touchMove,touchThreshold:t.touchThreshold?parseInt(t.touchThreshold,10):5,useCSS:"false"!==t.useCSS,variableWidth:"true"===t.variableWidth,vertical:"true"===t.vertical,verticalSwiping:"true"===t.verticalSwiping,rtl:"true"===t.rtl},t.settings)},l=function(){var e=angular.element(o);return e.hasClass("slick-initialized")&&(e.remove("slick-list"),e.slick("unslick")),e},d=function(){a();var n=angular.element(o);return angular.element(o).hasClass("slick-initialized")?n.slick("getSlick"):(angular.element(o).css("display","block"),n.on("init",function(e,n){return"undefined"!=typeof r.event.init&&r.event.init(e,n),"undefined"!=typeof c?n.slideHandler(c):void 0}),e(function(){n.slick(r)}),t.internalControl=r.method||{},i.forEach(function(e){t.internalControl[e]=function(){var i;i=Array.prototype.slice.call(arguments),i.unshift(e),n.slick.apply(o,i)}}),n.on("afterChange",function(e,n,i,t){c=i,"undefined"!=typeof r.event.afterChange&&r.event.afterChange(e,n,i,t)}),n.on("beforeChange",function(e,n,i,t){"undefined"!=typeof r.event.beforeChange&&r.event.beforeChange(e,n,i,t)}),n.on("reInit",function(e,n){"undefined"!=typeof r.event.reInit&&r.event.reInit(e,n)}),"undefined"!=typeof r.event.breakpoint&&n.on("breakpoint",function(e,n,i){r.event.breakpoint(e,n,i)}),"undefined"!=typeof r.event.destroy&&n.on("destroy",function(e,n){r.event.destroy(e,n)}),"undefined"!=typeof r.event.edge&&n.on("edge",function(e,n,i){r.event.edge(e,n,i)}),"undefined"!=typeof r.event.setPosition&&n.on("setPosition",function(e,n){r.event.setPosition(e,n)}),void("undefined"!=typeof r.event.swipe&&n.on("swipe",function(e,n,i){r.event.swipe(e,n,i)})))},u=function(){l(),d()},o.one("$destroy",function(){l()}),t.$watch("settings",function(e,n){return null!==e?u():void 0},!0)}}}]); \ No newline at end of file diff --git a/package.json b/package.json index a9459bf..56f029a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-slick-carousel", - "version": "3.1.1", + "version": "3.1.2", "main": "dist/angular-slick.js", "repository": { "type": "git", diff --git a/src/slick.js b/src/slick.js index 42e8cf8..a85971a 100644 --- a/src/slick.js +++ b/src/slick.js @@ -80,7 +80,9 @@ angular centerMode: scope.centerMode === 'true', centerPadding: scope.centerPadding || '50px', cssEase: scope.cssEase || 'ease', - customPaging: attr.customPaging ? customPaging : void 0, + customPaging: attr.customPaging ? function (slick, index) { + return scope.customPaging({ slick: slick, index: index }); + } : void 0, dots: attr.dots || scope.dots === 'true', draggable: scope.draggable !== 'false', fade: scope.fade === 'true',