Skip to content

Commit 8015997

Browse files
author
Wong Ho Chi Mark
committed
3.1.5
1 parent 0868a20 commit 8015997

6 files changed

Lines changed: 78 additions & 42 deletions

File tree

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-slick-carousel",
3-
"version": "3.1.4",
3+
"version": "3.1.5",
44
"homepage": "https://github.com/devmark/angular-slick-carousel",
55
"authors": [
66
"DevMark <hc.devmark@gmail.com>"
@@ -19,7 +19,7 @@
1919
"bower.json"
2020
],
2121
"dependencies": {
22-
"slick-carousel": "~1.5.9",
22+
"slick-carousel": "~1.6.0",
2323
"angular": ">=1.3.0"
2424
},
2525
"devDependencies": {

‎dist/angular-slick.js‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* angular-slick-carousel
33
* DevMark <hc.devmark@gmail.com>
44
* https://github.com/devmark/angular-slick-carousel
5-
* Version: 3.1.4 - 2015-12-26T03:01:55.410Z
5+
* Version: 3.1.5 - 2016-05-17T16:15:23.062Z
66
* License: MIT
77
*/
88

@@ -149,8 +149,6 @@ angular
149149
destroy();
150150
}
151151
} else {
152-
angular.element(element).css('display', 'block');
153-
154152
if (!options.enabled) {
155153
return;
156154
}
@@ -163,7 +161,9 @@ angular
163161
return slick.slideHandler(currentIndex);
164162
}
165163
});
164+
166165
$timeout(function () {
166+
angular.element(element).css('display', 'block');
167167
slickness.slick(options);
168168
});
169169
}
@@ -184,61 +184,79 @@ angular
184184
slickness.on('afterChange', function (event, slick, currentSlide, nextSlide) {
185185
currentIndex = currentSlide;
186186
if (typeof options.event.afterChange !== 'undefined') {
187-
scope.$apply(function () {
188-
options.event.afterChange(event, slick, currentSlide, nextSlide);
187+
$timeout(function () {
188+
scope.$apply(function () {
189+
options.event.afterChange(event, slick, currentSlide, nextSlide);
190+
});
189191
});
190192
}
191193
});
192194

193195
slickness.on('beforeChange', function (event, slick, currentSlide, nextSlide) {
194196
if (typeof options.event.beforeChange !== 'undefined') {
195-
scope.$apply(function () {
196-
options.event.beforeChange(event, slick, currentSlide, nextSlide);
197+
$timeout(function () {
198+
$timeout(function () {
199+
scope.$apply(function () {
200+
options.event.beforeChange(event, slick, currentSlide, nextSlide);
201+
});
202+
});
197203
});
198204
}
199205
});
200206

201207
slickness.on('reInit', function (event, slick) {
202208
if (typeof options.event.reInit !== 'undefined') {
203-
scope.$apply(function () {
204-
options.event.reInit(event, slick);
209+
$timeout(function () {
210+
scope.$apply(function () {
211+
options.event.reInit(event, slick);
212+
});
205213
});
206214
}
207215
});
208216

209217
if (typeof options.event.breakpoint !== 'undefined') {
210218
slickness.on('breakpoint', function (event, slick, breakpoint) {
211-
scope.$apply(function () {
212-
options.event.breakpoint(event, slick, breakpoint);
219+
$timeout(function () {
220+
scope.$apply(function () {
221+
options.event.breakpoint(event, slick, breakpoint);
222+
});
213223
});
214224
});
215225
}
216226
if (typeof options.event.destroy !== 'undefined') {
217227
slickness.on('destroy', function (event, slick) {
218-
scope.$apply(function () {
219-
options.event.destroy(event, slick);
228+
$timeout(function () {
229+
scope.$apply(function () {
230+
options.event.destroy(event, slick);
231+
});
220232
});
221233
});
222234
}
223235
if (typeof options.event.edge !== 'undefined') {
224236
slickness.on('edge', function (event, slick, direction) {
225-
scope.$apply(function () {
226-
options.event.edge(event, slick, direction);
237+
$timeout(function () {
238+
scope.$apply(function () {
239+
options.event.edge(event, slick, direction);
240+
});
227241
});
228242
});
229243
}
230244

231245
if (typeof options.event.setPosition !== 'undefined') {
232246
slickness.on('setPosition', function (event, slick) {
233-
scope.$apply(function () {
234-
options.event.setPosition(event, slick);
247+
$timeout(function () {
248+
scope.$apply(function () {
249+
options.event.setPosition(event, slick);
250+
});
235251
});
236252
});
237253
}
238254
if (typeof options.event.swipe !== 'undefined') {
239255
slickness.on('swipe', function (event, slick, direction) {
240-
scope.$apply(function () {
241-
options.event.swipe(event, slick, direction);
256+
$timeout(function () {
257+
scope.$apply(function () {
258+
options.event.swipe(event, slick, direction);
259+
});
242260
});
243261
});
244262
}

‎dist/angular-slick.min.js‎

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

‎examples/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-alpha1/jquery.min.js"></script>
5454
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"></script>
5555

56-
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular.min.js"></script>
57-
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-route.min.js"></script>
56+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular.min.js"></script>
57+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.5/angular-route.min.js"></script>
5858

5959
<script src="//cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.js"></script>
6060

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-slick-carousel",
3-
"version": "3.1.4",
3+
"version": "3.1.5",
44
"main": "dist/angular-slick.js",
55
"repository": {
66
"type": "git",

‎src/slick.js‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,61 +175,79 @@ angular
175175
slickness.on('afterChange', function (event, slick, currentSlide, nextSlide) {
176176
currentIndex = currentSlide;
177177
if (typeof options.event.afterChange !== 'undefined') {
178-
scope.$apply(function () {
179-
options.event.afterChange(event, slick, currentSlide, nextSlide);
178+
$timeout(function () {
179+
scope.$apply(function () {
180+
options.event.afterChange(event, slick, currentSlide, nextSlide);
181+
});
180182
});
181183
}
182184
});
183185

184186
slickness.on('beforeChange', function (event, slick, currentSlide, nextSlide) {
185187
if (typeof options.event.beforeChange !== 'undefined') {
186-
scope.$apply(function () {
187-
options.event.beforeChange(event, slick, currentSlide, nextSlide);
188+
$timeout(function () {
189+
$timeout(function () {
190+
scope.$apply(function () {
191+
options.event.beforeChange(event, slick, currentSlide, nextSlide);
192+
});
193+
});
188194
});
189195
}
190196
});
191197

192198
slickness.on('reInit', function (event, slick) {
193199
if (typeof options.event.reInit !== 'undefined') {
194-
scope.$apply(function () {
195-
options.event.reInit(event, slick);
200+
$timeout(function () {
201+
scope.$apply(function () {
202+
options.event.reInit(event, slick);
203+
});
196204
});
197205
}
198206
});
199207

200208
if (typeof options.event.breakpoint !== 'undefined') {
201209
slickness.on('breakpoint', function (event, slick, breakpoint) {
202-
scope.$apply(function () {
203-
options.event.breakpoint(event, slick, breakpoint);
210+
$timeout(function () {
211+
scope.$apply(function () {
212+
options.event.breakpoint(event, slick, breakpoint);
213+
});
204214
});
205215
});
206216
}
207217
if (typeof options.event.destroy !== 'undefined') {
208218
slickness.on('destroy', function (event, slick) {
209-
scope.$apply(function () {
210-
options.event.destroy(event, slick);
219+
$timeout(function () {
220+
scope.$apply(function () {
221+
options.event.destroy(event, slick);
222+
});
211223
});
212224
});
213225
}
214226
if (typeof options.event.edge !== 'undefined') {
215227
slickness.on('edge', function (event, slick, direction) {
216-
scope.$apply(function () {
217-
options.event.edge(event, slick, direction);
228+
$timeout(function () {
229+
scope.$apply(function () {
230+
options.event.edge(event, slick, direction);
231+
});
218232
});
219233
});
220234
}
221235

222236
if (typeof options.event.setPosition !== 'undefined') {
223237
slickness.on('setPosition', function (event, slick) {
224-
scope.$apply(function () {
225-
options.event.setPosition(event, slick);
238+
$timeout(function () {
239+
scope.$apply(function () {
240+
options.event.setPosition(event, slick);
241+
});
226242
});
227243
});
228244
}
229245
if (typeof options.event.swipe !== 'undefined') {
230246
slickness.on('swipe', function (event, slick, direction) {
231-
scope.$apply(function () {
232-
options.event.swipe(event, slick, direction);
247+
$timeout(function () {
248+
scope.$apply(function () {
249+
options.event.swipe(event, slick, direction);
250+
});
233251
});
234252
});
235253
}

0 commit comments

Comments
 (0)