slick_rails 1.3.1 → 1.3.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2650ee2d992b48589f0e1c02640a5e91dd476b63
4
- data.tar.gz: ff0b0a8df0c8736228a5d6c6e463c2eed27242b5
3
+ metadata.gz: fea7a560b5eaa6dc15b7335bb99697f99876f160
4
+ data.tar.gz: 6a24ac67e2f04271c5acd72e61d3f10a9bfc2cf5
5
5
  SHA512:
6
- metadata.gz: dbef47e78131d69f702ebc4e9134091ce914abd6206ad6f7669e87ee31679d9968ea6685103a923e08b00a739ec905f5561ea0a0f428e8a9581bb9cb097c6b26
7
- data.tar.gz: 4641a43bb4fe3e18dc680f353591948c1462699a10df53faacbba4bde11aa54519018db75600e3380e03824f9693e5dc37ef07f3c8272f3fbf2abc4666356232
6
+ metadata.gz: 349a37b177339c55f5f1dfc99ab518e77314a0108f6fc46ecf9b8864439bfb7421b270ce98e45d0badb13435495b4fe9a112d2922bca7704d3ac67535d178fca
7
+ data.tar.gz: 27f8c76d054e7a8933fa69e272e7fcfe6c131ba221549a433869c7795aa667aa99a8c5dd57833849a81ae07f18f73b8aa868e056adf7d1fcb9fb51d4594b6cb2
@@ -8,7 +8,7 @@
8
8
 
9
9
  Author: Ken Wheeler
10
10
  Website: http://kenwheeler.github.io
11
- Date: 03/23/14
11
+ Date: 04/02/14
12
12
  Docs: http://kenwheeler.github.io/slick
13
13
  Repo: http://github.com/kenwheeler/slick
14
14
  Issues: http://github.com/kenwheeler/slick/issues
@@ -49,6 +49,7 @@
49
49
  onBeforeChange: null,
50
50
  onAfterChange: null,
51
51
  pauseOnHover: true,
52
+ placeholders: true,
52
53
  responsive: null,
53
54
  slide: 'div',
54
55
  slidesToShow: 1,
@@ -482,10 +483,10 @@
482
483
  if (_.options.arrows === true && _.slideCount > _.options.slidesToShow) {
483
484
 
484
485
  _.prevArrow = $(
485
- '<a href="javascript:void(0)" tabIndex="-1">Previous</a>').appendTo(
486
+ '<button type="button" tabIndex="-1">Previous</button>').appendTo(
486
487
  _.slider).addClass('slick-prev');
487
488
  _.nextArrow = $(
488
- '<a href="javascript:void(0)" tabIndex="-1">Next</a>').appendTo(
489
+ '<button type="button" tabIndex="-1">Next</button>').appendTo(
489
490
  _.slider).addClass('slick-next');
490
491
 
491
492
  if (_.options.infinite !== true) {
@@ -508,7 +509,10 @@
508
509
 
509
510
  dotString += '<li><a href="javascript:void(0)" tabIndex="-1">' + i +
510
511
  '</a></li>';
511
-
512
+ if (_.options.placeholders === false && i +
513
+ _.options.slidesToShow - (_.options.slidesToScroll - 1) > _.slideCount) {
514
+ break;
515
+ }
512
516
  }
513
517
 
514
518
  dotString += "</ul>";
@@ -569,6 +573,11 @@
569
573
  _.options.slidesToScroll = 1;
570
574
  }
571
575
 
576
+ if(_.options.placeholders === false) {
577
+ _.options.infinite === false;
578
+ return false;
579
+ }
580
+
572
581
  if ((_.slideCount % _.options.slidesToScroll) !==
573
582
  0 && _.slideCount > _.options.slidesToShow) {
574
583
 
@@ -641,7 +650,9 @@
641
650
 
642
651
  Slick.prototype.setPosition = function () {
643
652
 
644
- var _ = this, targetPosition;
653
+ var _ = this, targetPosition, targetSlide;
654
+
655
+ targetSlide = _.currentSlide;
645
656
 
646
657
  _.setValues();
647
658
  _.setDimensions();
@@ -654,12 +665,17 @@
654
665
  }
655
666
  }
656
667
 
668
+ if (_.options.placeholders === false && _.currentSlide +
669
+ _.options.slidesToScroll >= _.slideCount) {
670
+ targetSlide = _.slideCount - _.options.slidesToShow;
671
+ }
672
+
657
673
  if (_.options.fade === false) {
658
674
  if (_.options.vertical === false) {
659
- targetPosition = ((_.currentSlide *
675
+ targetPosition = ((targetSlide *
660
676
  _.slideWidth) * -1) + _.slideOffset;
661
677
  } else {
662
- targetPosition = ((_.currentSlide *
678
+ targetPosition = ((targetSlide *
663
679
  _.listHeight) * -1) - _.listHeight;
664
680
  }
665
681
  _.setCSS(targetPosition);
@@ -828,8 +844,12 @@
828
844
  break;
829
845
 
830
846
  case 'next':
847
+ if ((_.options.placeholders === false && _.currentSlide +
848
+ _.options.slidesToShow >= _.slideCount)) {
849
+ return false;
850
+ }
831
851
  _.slideHandler(_.currentSlide + _.options
832
- .slidesToScroll);
852
+ .slidesToScroll);
833
853
  break;
834
854
 
835
855
  case 'index':
@@ -870,6 +890,10 @@
870
890
  ) - _.options.slidesToScroll) {
871
891
  _.nextArrow.addClass('slick-disabled');
872
892
  _.prevArrow.removeClass('slick-disabled');
893
+ } else if (_.options.placeholders === false && _.currentSlide +
894
+ _.options.slidesToShow >= _.slideCount) {
895
+ _.nextArrow.addClass('slick-disabled');
896
+ _.prevArrow.removeClass('slick-disabled');
873
897
  } else {
874
898
  _.prevArrow.removeClass('slick-disabled');
875
899
  _.nextArrow.removeClass('slick-disabled');
@@ -1030,9 +1054,17 @@
1030
1054
  if(_.options.vertical === false) {
1031
1055
  targetLeft = ((targetSlide * _.slideWidth) * -1) + _.slideOffset;
1032
1056
  slideLeft = ((_.currentSlide * _.slideWidth) * -1) + _.slideOffset;
1057
+ if (_.options.placeholders === false && targetSlide +
1058
+ _.options.slidesToShow >= _.slideCount) {
1059
+ targetLeft = (((_.slideCount - _.options.slidesToShow) * _.slideWidth) * -1) + _.slideOffset;
1060
+ }
1033
1061
  } else {
1034
1062
  targetLeft = ((targetSlide * _.listHeight) * -1) - _.listHeight;
1035
1063
  slideLeft = ((_.currentSlide * _.listHeight) * -1) - _.listHeight;
1064
+ if (_.options.placeholders === false && targetSlide +
1065
+ _.options.slidesToShow >= _.slideCount) {
1066
+ targetLeft = (((_.slideCount - _.options.slidesToShow) * _.listHeight) * -1) - _.listHeight;
1067
+ }
1036
1068
  }
1037
1069
 
1038
1070
  if (_.options.infinite === false && (index < 0 || index > (_.slideCount -1))) {
@@ -1053,6 +1085,9 @@
1053
1085
  animSlide = _.slideCount - _.options.slidesToScroll;
1054
1086
  } else if (targetSlide > (_.slideCount - 1)) {
1055
1087
  animSlide = 0;
1088
+ } else if (_.options.placeholders === false && targetSlide +
1089
+ _.options.slidesToShow >= _.slideCount) {
1090
+ animSlide = _.slideCount - _.options.slidesToShow;
1056
1091
  } else {
1057
1092
  animSlide = targetSlide;
1058
1093
  }
@@ -1130,6 +1165,11 @@
1130
1165
  _.slideOffset : ((_.currentSlide * _.listHeight) * -1) -
1131
1166
  _.listHeight;
1132
1167
 
1168
+ if (_.options.placeholders === false && _.currentSlide +
1169
+ _.options.slidesToShow >= _.slideCount) {
1170
+ curLeft = (((_.slideCount - _.options.slidesToShow) * _.slideWidth) * -1) + _.slideOffset;
1171
+ }
1172
+
1133
1173
  if((!_.list.hasClass('dragging') && event.data.kind === 'drag') ||
1134
1174
  touches && touches.length !== 1){
1135
1175
  return false;
@@ -25,7 +25,7 @@
25
25
  }
26
26
 
27
27
  .slick-loading & {
28
- background: #fff url(./ajax-loader.gif) center center no-repeat;
28
+ background: #fff image-url("ajax-loader.gif") center center no-repeat;
29
29
  }
30
30
 
31
31
  &.dragging {
@@ -75,7 +75,7 @@
75
75
  display: none;
76
76
 
77
77
  &.loading {
78
- background: url(./ajax-loader.gif) center center no-repeat;
78
+ background: image-url("ajax-loader.gif") center center no-repeat;
79
79
  position: relative;
80
80
  }
81
81
 
@@ -101,8 +101,8 @@
101
101
  @charset"UTF-8";
102
102
  @font-face {
103
103
  font-family:"slick";
104
- src:url("./fonts/slick.eot");
105
- src:url("./fonts/slick.eot?#iefix") format("embedded-opentype"), url("./fonts/slick.woff") format("woff"), url("./fonts/slick.ttf") format("truetype"), url("./fonts/slick.svg#slick") format("svg");
104
+ src:font-url("slick.eot");
105
+ src:font-url("slick.eot?#iefix") format("embedded-opentype"), font-url("slick.woff") format("woff"), font-url("slick.ttf") format("truetype"), font-url("slick.svg#slick") format("svg");
106
106
  font-weight: normal;
107
107
  font-style: normal;
108
108
  }
@@ -117,12 +117,15 @@
117
117
  width: 20px;
118
118
  line-height: 0;
119
119
  font-size: 0;
120
+ cursor: pointer;
121
+ background: transparent;
120
122
  color: transparent;
121
123
  top: 50%;
122
124
  margin-top: -10px;
123
125
  padding: 0;
126
+ border: none;
124
127
  &:focus {
125
- outline: none
128
+ outline: none;
126
129
  }
127
130
  &.slick-disabled:before {
128
131
  opacity: 0.25;
@@ -201,4 +204,4 @@
201
204
  opacity: 0.75;
202
205
  }
203
206
  }
204
- }
207
+ }
@@ -1,3 +1,3 @@
1
1
  module SlickRails
2
- VERSION = "1.3.1"
2
+ VERSION = "1.3.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: slick_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Guy Israeli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-02 00:00:00.000000000 Z
11
+ date: 2014-04-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler