Skip to content

Commit 1b62e27

Browse files
author
Mark
committed
version 3.0.5
1 parent 5f13cfc commit 1b62e27

7 files changed

Lines changed: 17 additions & 292 deletions

File tree

‎README.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ as either a `<div>` attribute or a `<slick>` element.
4343

4444
<slick
4545
settings="slickConfig"
46-
data="number">
46+
data="number" ng-if="numberLoaded">
4747
</slick>
4848
```
4949

@@ -90,31 +90,33 @@ as shown in the example.
9090
<button ng-click='slickConfig.method.slickPlay()'>slickPlay()</button>
9191
<button ng-click='slickConfig.method.slickPause()'>slickPause()</button>
9292
```
93-
### Data ###
94-
95-
If you gonna make a ng-repeat for slick.
96-
you have to set `data` attribute
93+
### Slide change ###
94+
For change slide content, you have to set `data` attribute AND `ng-if`
9795

9896
- controller:
9997
```js
10098
$scope.number = [{label: 1}, {label: 2}, {label: 3}, {label: 4}, {label: 5}, {label: 6}, {label: 7}, {label: 8}];
99+
$scope.numberLoaded = true;
100+
$scope.numberUpdate = function(){
101+
$scope.numberLoaded = false; //disable slick
102+
103+
//number update
104+
105+
$scope.numberLoaded = true; //enable slick
106+
};
101107
```
102108
- html:
103109
```html
104110
<script type="text/ng-template" id="tpl.html">
105111
<h3>{{ i.label }}</h3>
106112
</script>
107113

108-
<slick data="number">
114+
<slick data="number" ng-if="numberLoaded">
109115
<div ng-repeat="i in number">
110116
<div class="" ng-include="'tpl.html'"></div>
111117
</div>
112118
</slick>
113119
```
114-
- change data? 2 options
115-
1. use slick event handler: ```slickAdd("<div>HTML</div>")``` function
116-
2. update data object directly.
117-
118120

119121
### Global config ###
120122
```js

‎dist/angular-slick.js‎

Lines changed: 2 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22
* angular-slick-carousel
33
* DevMark <hc.devmark@gmail.com>,Karan Batra-Daitch <karanganesha04@gmail.com>
44
* https://github.com/devmark/angular-slick-carousel
5-
<<<<<<< HEAD
6-
* Version: 3.0.2 - 2015-07-28T15:43:02.387Z
7-
=======
8-
* Version: 3.0.2 - 2015-07-28T10:42:08.174Z
9-
>>>>>>> origin/master
5+
* Version: 3.0.2 - 2015-07-28T15:47:15.793Z
106
* License: MIT
117
*/
128

139

14-
<<<<<<< HEAD
1510
/*!
1611
* angular-slick-carousel
1712
* DevMark <hc.devmark@gmail.com>,Karan Batra-Daitch <karanganesha04@gmail.com>
@@ -23,11 +18,6 @@
2318

2419
'use strict';
2520

26-
=======
27-
'use strict';
28-
29-
30-
>>>>>>> origin/master
3121
angular
3222
.module('slickCarousel', [])
3323
//global config
@@ -40,11 +30,7 @@ angular
4030
event: {}
4131
})
4232
.directive('slick', [
43-
<<<<<<< HEAD
4433
'$timeout', 'slickCarouselConfig', function ($timeout, slickCarouselConfig) {
45-
=======
46-
'$timeout', 'slickCarouselConfig', '$compile', function ($timeout, slickCarouselConfig, $compile) {
47-
>>>>>>> origin/master
4834
var slickOptionList, slickMethodList, slickEventList;
4935
slickOptionList = ['accessibility', 'adaptiveHeight', 'autoplay', 'autoplaySpeed', 'asNavFor', 'appendArrows', 'prevArrow', 'nextArrow', 'centerMode', 'centerPadding', 'cssEase', 'customPaging', 'dots', 'draggable', 'fade', 'focusOnSelect', 'edgeFriction', 'infinite', 'initialSlide', 'lazyLoad', 'mobileFirst', 'pauseOnHover', 'pauseOnDotsHover', 'respondTo', 'rows', 'slide', 'slidesPerRow', 'slidesToShow', 'slidesToScroll', 'speed', 'swipe', 'swipeToSlide', 'touchMove', 'touchThreshold', 'useCSS', 'variableWidth', 'vertical', 'verticalSwiping', 'rtl'];
5036
slickMethodList = ['slickGoTo', 'slickNext', 'slickPrev', 'slickPause', 'slickPlay', 'slickAdd', 'slickRemove', 'slickFilter', 'slickUnfilter', 'unslick'];
@@ -57,11 +43,7 @@ angular
5743
},
5844
restrict: 'AE',
5945
link: function (scope, element, attr) {
60-
<<<<<<< HEAD
6146
var options, initOptions, destroy, init, destroyAndInit, currentIndex = 0;
62-
=======
63-
var options, initOptions, destroy, init, destroyAndInit;
64-
>>>>>>> origin/master
6547

6648
initOptions = function () {
6749
options = angular.extend(angular.copy(slickCarouselConfig), scope.settings);
@@ -71,7 +53,6 @@ angular
7153
}
7254
});
7355
};
74-
<<<<<<< HEAD
7556

7657
destroy = function () {
7758
var slickness = angular.element(element);
@@ -132,87 +113,20 @@ angular
132113
options.event.edge(event, slick, direction);
133114
});
134115
}
135-
=======
136-
137-
destroy = function () {
138-
//remove current slides
139-
var slickness = element.slick('getSlick');
140-
for (var i = 0; i < slickness.slideCount; i++) {
141-
element.slick('slickRemove', i);
142-
}
143-
slickness = element.slick('unslick');
144-
return slickness;
145-
};
146-
147-
init = function () {
148-
return $timeout(function () {
149-
initOptions();
150-
var slickness = $(element);
151-
152-
if (angular.element(element).hasClass('slick-initialized')) {
153-
slickness.slick('getSlick');
154-
} else {
155-
slickness.slick(options);
156-
}
157-
158-
scope.internalControl = options.method || {};
159-
160-
// Method
161-
slickMethodList.forEach(function (value) {
162-
scope.internalControl[value] = function () {
163-
var args;
164-
args = Array.prototype.slice.call(arguments);
165-
args.unshift(value);
166-
slickness.slick.apply(element, args);
167-
};
168-
});
169-
170-
// Event
171-
slickness.on('afterChange', function (event, slick, currentSlide, nextSlide) {
172-
if (typeof options.event.afterChange !== 'undefined') {
173-
options.event.afterChange(event, slick, currentSlide, nextSlide);
174-
}
175-
});
176-
177-
if (typeof options.event.beforeChange !== 'undefined') {
178-
slickness.on('beforeChange', function (event, slick, currentSlide, nextSlide) {
179-
options.event.beforeChange(event, slick, currentSlide, nextSlide);
180-
});
181-
}
182-
if (typeof options.event.breakpoint !== 'undefined') {
183-
slickness.on('breakpoint', function (event, slick, breakpoint) {
184-
options.event.breakpoint(event, slick, breakpoint);
185-
});
186-
}
187-
if (typeof options.event.destroy !== 'undefined') {
188-
slickness.on('destroy', function (event, slick) {
189-
options.event.destroy(event, slick);
190-
});
191-
}
192-
if (typeof options.event.edge !== 'undefined') {
193-
slickness.on('edge', function (event, slick, direction) {
194-
options.event.edge(event, slick, direction);
195-
});
196-
}
197-
>>>>>>> origin/master
198116

199117
slickness.on('init', function (event, slick) {
200118
if (typeof options.event.init !== 'undefined') {
201119
options.event.init(event, slick);
202-
<<<<<<< HEAD
203120
}
204121
if (currentIndex != null) {
205122
return slick.slideHandler(currentIndex);
206-
=======
207-
>>>>>>> origin/master
208123
}
209124
});
210125

211126
if (typeof options.event.reInit !== 'undefined') {
212127
slickness.on('reInit', function (event, slick) {
213128
options.event.reInit(event, slick);
214129
});
215-
<<<<<<< HEAD
216130
}
217131
if (typeof options.event.setPosition !== 'undefined') {
218132
slickness.on('setPosition', function (event, slick) {
@@ -225,34 +139,15 @@ angular
225139
});
226140
}
227141

228-
=======
229-
}
230-
if (typeof options.event.setPosition !== 'undefined') {
231-
slickness.on('setPosition', function (event, slick) {
232-
options.event.setPosition(event, slick);
233-
});
234-
}
235-
if (typeof options.event.swipe !== 'undefined') {
236-
slickness.on('swipe', function (event, slick, direction) {
237-
options.event.swipe(event, slick, direction);
238-
});
239-
}
240-
>>>>>>> origin/master
241142
});
242143
};
243144

244145
destroyAndInit = function () {
245146
if (angular.element(element).hasClass('slick-initialized')) {
246147
destroy();
247148
}
248-
<<<<<<< HEAD
249149
$timeout(function () {
250150
init();
251-
=======
252-
253-
return $timeout(function () {
254-
return init();
255-
>>>>>>> origin/master
256151
}, 1);
257152
};
258153

@@ -261,7 +156,6 @@ angular
261156
return destroyAndInit();
262157
}
263158
}, true);
264-
<<<<<<< HEAD
265159

266160
return scope.$watch('data', function (newVal, oldVal) {
267161
if (newVal != null) {
@@ -273,17 +167,4 @@ angular
273167
}
274168
};
275169
}
276-
]);
277-
=======
278-
279-
return scope.$watch('data', function (newVal, oldVal) {
280-
if (newVal !== null) {
281-
destroyAndInit();
282-
}
283-
}, true);
284-
285-
}
286-
};
287-
}
288-
]);
289-
>>>>>>> origin/master
170+
]);

‎dist/angular-slick.min.js‎

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

‎examples/index.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@
5656
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular.min.js"></script>
5757
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-route.min.js"></script>
5858

59-
<<<<<<< HEAD
6059
<script src="//cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.5.7/slick.min.js"></script>
61-
=======
62-
<script src="../dist/angular-slick.js"></script>
63-
>>>>>>> origin/master
6460

6561
<script src="../dist/angular-slick.js"></script>
6662

0 commit comments

Comments
 (0)