foundation-rails 5.2.3.0 → 5.3.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bower.json +2 -2
- data/lib/foundation/rails/version.rb +1 -1
- data/test/dummy/.ruby-version +1 -0
- data/vendor/assets/_settings.scss +1298 -0
- data/vendor/assets/javascripts/foundation/foundation.abide.js +4 -4
- data/vendor/assets/javascripts/foundation/foundation.accordion.js +7 -1
- data/vendor/assets/javascripts/foundation/foundation.alert.js +3 -3
- data/vendor/assets/javascripts/foundation/foundation.clearing.js +17 -9
- data/vendor/assets/javascripts/foundation/foundation.dropdown.js +7 -5
- data/vendor/assets/javascripts/foundation/foundation.equalizer.js +2 -2
- data/vendor/assets/javascripts/foundation/foundation.interchange.js +24 -11
- data/vendor/assets/javascripts/foundation/foundation.joyride.js +14 -11
- data/vendor/assets/javascripts/foundation/foundation.js +6 -4
- data/vendor/assets/javascripts/foundation/foundation.magellan.js +5 -3
- data/vendor/assets/javascripts/foundation/foundation.offcanvas.js +2 -2
- data/vendor/assets/javascripts/foundation/foundation.orbit.js +123 -261
- data/vendor/assets/javascripts/foundation/foundation.reveal.js +15 -15
- data/vendor/assets/javascripts/foundation/foundation.slider.js +51 -24
- data/vendor/assets/javascripts/foundation/foundation.topbar.js +13 -12
- data/vendor/assets/javascripts/vendor/modernizr.js +3 -3
- data/vendor/assets/stylesheets/foundation.scss +2 -1
- data/vendor/assets/stylesheets/foundation/_settings.scss +19 -10
- data/vendor/assets/stylesheets/foundation/components/_accordion.scss +115 -1
- data/vendor/assets/stylesheets/foundation/components/_block-grid.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_button-groups.scss +9 -1
- data/vendor/assets/stylesheets/foundation/components/_forms.scss +8 -6
- data/vendor/assets/stylesheets/foundation/components/_global.scss +12 -7
- data/vendor/assets/stylesheets/foundation/components/_grid.scss +17 -4
- data/vendor/assets/stylesheets/foundation/components/_icon-bar.scss +229 -0
- data/vendor/assets/stylesheets/foundation/components/_iconbar.scss +67 -0
- data/vendor/assets/stylesheets/foundation/components/_offcanvas.scss +18 -16
- data/vendor/assets/stylesheets/foundation/components/_orbit.scss +84 -139
- data/vendor/assets/stylesheets/foundation/components/_panels.scss +6 -3
- data/vendor/assets/stylesheets/foundation/components/_range-slider.scss +20 -5
- data/vendor/assets/stylesheets/foundation/components/_reveal-new.scss +0 -0
- data/vendor/assets/stylesheets/foundation/components/_side-nav.scss +1 -1
- data/vendor/assets/stylesheets/foundation/components/_switches.scss +215 -0
- data/vendor/assets/stylesheets/foundation/components/_tabs.scss +1 -1
- data/vendor/assets/stylesheets/foundation/components/_toolbar.scss +67 -0
- data/vendor/assets/stylesheets/foundation/components/_tooltips.scss +2 -1
- data/vendor/assets/stylesheets/foundation/components/_top-bar.scss +26 -11
- data/vendor/assets/stylesheets/foundation/components/_type.scss +2 -0
- metadata +10 -3
- data/vendor/assets/stylesheets/foundation/components/_switch.scss +0 -294
@@ -17,16 +17,16 @@
|
|
17
17
|
timer_container,
|
18
18
|
idx = 0,
|
19
19
|
animate,
|
20
|
-
|
21
|
-
|
20
|
+
timer,
|
21
|
+
locked = false,
|
22
|
+
adjust_height_after = false;
|
22
23
|
|
23
|
-
self.cache = {};
|
24
24
|
|
25
25
|
self.slides = function() {
|
26
26
|
return slides_container.children(settings.slide_selector);
|
27
27
|
};
|
28
28
|
|
29
|
-
|
29
|
+
self.slides().first().addClass(settings.active_slide_class);
|
30
30
|
|
31
31
|
self.update_slide_number = function(index) {
|
32
32
|
if (settings.slide_number) {
|
@@ -40,7 +40,7 @@
|
|
40
40
|
};
|
41
41
|
|
42
42
|
self.update_active_link = function(index) {
|
43
|
-
var link = $('[data-orbit-link="'+self.slides().eq(index).attr('data-orbit-slide')+'"]');
|
43
|
+
var link = $('a[data-orbit-link="'+self.slides().eq(index).attr('data-orbit-slide')+'"]');
|
44
44
|
link.siblings().removeClass(settings.bullets_active_class);
|
45
45
|
link.addClass(settings.bullets_active_class);
|
46
46
|
};
|
@@ -49,7 +49,6 @@
|
|
49
49
|
slides_container.wrap('<div class="'+settings.container_class+'"></div>');
|
50
50
|
container = slides_container.parent();
|
51
51
|
slides_container.addClass(settings.slides_container_class);
|
52
|
-
slides_container.addClass(settings.animation);
|
53
52
|
|
54
53
|
if (settings.stack_on_small) {
|
55
54
|
container.addClass(settings.stack_on_small_class);
|
@@ -63,9 +62,7 @@
|
|
63
62
|
if (settings.timer) {
|
64
63
|
timer_container = $('<div>').addClass(settings.timer_container_class);
|
65
64
|
timer_container.append('<span>');
|
66
|
-
|
67
|
-
timer_container.append($('<div>').addClass(settings.timer_progress_class));
|
68
|
-
}
|
65
|
+
timer_container.append($('<div>').addClass(settings.timer_progress_class));
|
69
66
|
timer_container.addClass(settings.timer_paused_class);
|
70
67
|
container.append(timer_container);
|
71
68
|
}
|
@@ -81,27 +78,22 @@
|
|
81
78
|
container.append(bullets_container);
|
82
79
|
bullets_container.wrap('<div class="orbit-bullets-container"></div>');
|
83
80
|
self.slides().each(function(idx, el) {
|
84
|
-
var bullet = $('<li>').attr('data-orbit-slide', idx)
|
85
|
-
.on('click', self.link_bullet);
|
81
|
+
var bullet = $('<li>').attr('data-orbit-slide', idx).on('click', self.link_bullet);;
|
86
82
|
bullets_container.append(bullet);
|
87
83
|
});
|
88
84
|
}
|
89
85
|
|
90
86
|
};
|
91
87
|
|
92
|
-
self.
|
93
|
-
|
94
|
-
if (next_idx
|
95
|
-
|
96
|
-
if (settings.animation === 'slide') {
|
97
|
-
setTimeout(function(){
|
98
|
-
slides_container.removeClass("swipe-prev swipe-next");
|
99
|
-
if (dir === 'next') {slides_container.addClass("swipe-next");}
|
100
|
-
else if (dir === 'prev') {slides_container.addClass("swipe-prev");}
|
101
|
-
},0);
|
102
|
-
}
|
103
|
-
|
88
|
+
self._goto = function(next_idx, start_timer) {
|
89
|
+
// if (locked) {return false;}
|
90
|
+
if (next_idx === idx) {return false;}
|
91
|
+
if (typeof timer === 'object') {timer.restart();}
|
104
92
|
var slides = self.slides();
|
93
|
+
|
94
|
+
var dir = 'next';
|
95
|
+
locked = true;
|
96
|
+
if (next_idx < idx) {dir = 'prev';}
|
105
97
|
if (next_idx >= slides.length) {
|
106
98
|
if (!settings.circular) return false;
|
107
99
|
next_idx = 0;
|
@@ -109,53 +101,29 @@
|
|
109
101
|
if (!settings.circular) return false;
|
110
102
|
next_idx = slides.length - 1;
|
111
103
|
}
|
112
|
-
var current = $(slides.get(idx))
|
113
|
-
, next = $(slides.get(next_idx));
|
114
104
|
|
115
|
-
|
116
|
-
|
105
|
+
var current = $(slides.get(idx));
|
106
|
+
var next = $(slides.get(next_idx));
|
117
107
|
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
if (next_idx === idx) {return false;}
|
122
|
-
if (typeof self.cache.timer === 'object') {self.cache.timer.restart();}
|
123
|
-
|
124
|
-
var slides = self.slides();
|
125
|
-
self.cache.animating = true;
|
126
|
-
var res = self._prepare_direction(next_idx)
|
127
|
-
, dir = res[0]
|
128
|
-
, current = res[1]
|
129
|
-
, next = res[2]
|
130
|
-
, next_idx = res[3];
|
131
|
-
|
132
|
-
// This means that circular is disabled and we most likely reached the last slide.
|
133
|
-
if (res === false) return false;
|
108
|
+
current.css('zIndex', 2);
|
109
|
+
current.removeClass(settings.active_slide_class);
|
110
|
+
next.css('zIndex', 4).addClass(settings.active_slide_class);
|
134
111
|
|
135
112
|
slides_container.trigger('before-slide-change.fndtn.orbit');
|
136
113
|
settings.before_slide_change();
|
137
|
-
|
138
|
-
|
139
|
-
current.css("transitionDuration", settings.animation_speed+"ms");
|
140
|
-
next.css("transitionDuration", settings.animation_speed+"ms");
|
114
|
+
self.update_active_link(next_idx);
|
141
115
|
|
142
116
|
var callback = function() {
|
143
117
|
var unlock = function() {
|
144
|
-
|
118
|
+
idx = next_idx;
|
119
|
+
locked = false;
|
120
|
+
if (start_timer === true) {timer = self.create_timer(); timer.start();}
|
145
121
|
self.update_slide_number(idx);
|
146
|
-
// Remove "animate-in" class as late as possible to avoid "flickering" (especially with variable_height).
|
147
|
-
next.removeClass("animate-in");
|
148
|
-
next.addClass(settings.active_slide_class);
|
149
|
-
self.update_active_link(next_idx);
|
150
122
|
slides_container.trigger('after-slide-change.fndtn.orbit',[{slide_number: idx, total_slides: slides.length}]);
|
151
123
|
settings.after_slide_change(idx, slides.length);
|
152
|
-
setTimeout(function(){
|
153
|
-
self.cache.animating = false;
|
154
|
-
}, 100);
|
155
|
-
|
156
124
|
};
|
157
125
|
if (slides_container.height() != next.height() && settings.variable_height) {
|
158
|
-
slides_container.animate({'
|
126
|
+
slides_container.animate({'height': next.height()}, 250, 'linear', unlock);
|
159
127
|
} else {
|
160
128
|
unlock();
|
161
129
|
}
|
@@ -169,7 +137,7 @@
|
|
169
137
|
};
|
170
138
|
|
171
139
|
if (next.height() > slides_container.height() && settings.variable_height) {
|
172
|
-
slides_container.animate({'
|
140
|
+
slides_container.animate({'height': next.height()}, 250, 'linear', start_animation);
|
173
141
|
} else {
|
174
142
|
start_animation();
|
175
143
|
}
|
@@ -178,19 +146,13 @@
|
|
178
146
|
self.next = function(e) {
|
179
147
|
e.stopImmediatePropagation();
|
180
148
|
e.preventDefault();
|
181
|
-
self.
|
182
|
-
setTimeout(function(){
|
183
|
-
self._goto(idx + 1);
|
184
|
-
}, 100);
|
149
|
+
self._goto(idx + 1);
|
185
150
|
};
|
186
151
|
|
187
152
|
self.prev = function(e) {
|
188
153
|
e.stopImmediatePropagation();
|
189
154
|
e.preventDefault();
|
190
|
-
self.
|
191
|
-
setTimeout(function(){
|
192
|
-
self._goto(idx - 1)
|
193
|
-
}, 100);
|
155
|
+
self._goto(idx - 1);
|
194
156
|
};
|
195
157
|
|
196
158
|
self.link_custom = function(e) {
|
@@ -198,38 +160,24 @@
|
|
198
160
|
var link = $(this).attr('data-orbit-link');
|
199
161
|
if ((typeof link === 'string') && (link = $.trim(link)) != "") {
|
200
162
|
var slide = container.find('[data-orbit-slide='+link+']');
|
201
|
-
if (slide.index() != -1) {
|
202
|
-
setTimeout(function(){
|
203
|
-
self._goto(slide.index());
|
204
|
-
},100);
|
205
|
-
}
|
163
|
+
if (slide.index() != -1) {self._goto(slide.index());}
|
206
164
|
}
|
207
165
|
};
|
208
166
|
|
209
|
-
// Click handler for slides and bullets.
|
210
167
|
self.link_bullet = function(e) {
|
211
168
|
var index = $(this).attr('data-orbit-slide');
|
212
169
|
if ((typeof index === 'string') && (index = $.trim(index)) != "") {
|
213
170
|
if(isNaN(parseInt(index)))
|
214
171
|
{
|
215
172
|
var slide = container.find('[data-orbit-slide='+index+']');
|
216
|
-
if (slide.index() != -1) {
|
217
|
-
index = slide.index() + 1;
|
218
|
-
self._prepare_direction(index);
|
219
|
-
setTimeout(function(){
|
220
|
-
self._goto(index);
|
221
|
-
},100);
|
222
|
-
}
|
173
|
+
if (slide.index() != -1) {self._goto(slide.index() + 1);}
|
223
174
|
}
|
224
175
|
else
|
225
176
|
{
|
226
|
-
|
227
|
-
self._prepare_direction(index);
|
228
|
-
setTimeout(function(){
|
229
|
-
self._goto(index);
|
230
|
-
},100);
|
177
|
+
self._goto(parseInt(index));
|
231
178
|
}
|
232
179
|
}
|
180
|
+
|
233
181
|
}
|
234
182
|
|
235
183
|
self.timer_callback = function() {
|
@@ -244,7 +192,7 @@
|
|
244
192
|
if ($(this).height() > h) { h = $(this).height(); }
|
245
193
|
});
|
246
194
|
}
|
247
|
-
slides_container.
|
195
|
+
slides_container.height(h);
|
248
196
|
};
|
249
197
|
|
250
198
|
self.create_timer = function() {
|
@@ -257,37 +205,29 @@
|
|
257
205
|
};
|
258
206
|
|
259
207
|
self.stop_timer = function() {
|
260
|
-
if (typeof
|
208
|
+
if (typeof timer === 'object') timer.stop();
|
261
209
|
};
|
262
210
|
|
263
211
|
self.toggle_timer = function() {
|
264
212
|
var t = container.find('.'+settings.timer_container_class);
|
265
213
|
if (t.hasClass(settings.timer_paused_class)) {
|
266
|
-
if (typeof
|
267
|
-
|
214
|
+
if (typeof timer === 'undefined') {timer = self.create_timer();}
|
215
|
+
timer.start();
|
268
216
|
}
|
269
217
|
else {
|
270
|
-
if (typeof
|
218
|
+
if (typeof timer === 'object') {timer.stop();}
|
271
219
|
}
|
272
220
|
};
|
273
221
|
|
274
222
|
self.init = function() {
|
275
223
|
self.build_markup();
|
276
224
|
if (settings.timer) {
|
277
|
-
|
278
|
-
Foundation.utils.image_loaded(this.slides().
|
279
|
-
}
|
280
|
-
|
281
|
-
animate = new CSSAnimation(settings, slides_container);
|
282
|
-
|
283
|
-
if (has_init_active) {
|
284
|
-
var $init_target = slides_container.find("." + settings.active_slide_class),
|
285
|
-
animation_speed = settings.animation_speed;
|
286
|
-
settings.animation_speed = 1;
|
287
|
-
$init_target.removeClass('active');
|
288
|
-
self._goto($init_target.index());
|
289
|
-
settings.animation_speed = animation_speed;
|
225
|
+
timer = self.create_timer();
|
226
|
+
Foundation.utils.image_loaded(this.slides().children('img'), timer.start);
|
290
227
|
}
|
228
|
+
animate = new FadeAnimation(settings, slides_container);
|
229
|
+
if (settings.animation === 'slide')
|
230
|
+
animate = new SlideAnimation(settings, slides_container);
|
291
231
|
|
292
232
|
container.on('click', '.'+settings.next_class, self.next);
|
293
233
|
container.on('click', '.'+settings.prev_class, self.prev);
|
@@ -295,76 +235,46 @@
|
|
295
235
|
if (settings.next_on_click) {
|
296
236
|
container.on('click', '.'+settings.slides_container_class+' [data-orbit-slide]', self.link_bullet);
|
297
237
|
}
|
298
|
-
|
238
|
+
|
299
239
|
container.on('click', self.toggle_timer);
|
300
240
|
if (settings.swipe) {
|
301
|
-
|
302
|
-
if (self.cache.animating) {return;}
|
241
|
+
container.on('touchstart.fndtn.orbit', function(e) {
|
303
242
|
if (!e.touches) {e = e.originalEvent;}
|
304
|
-
|
243
|
+
var data = {
|
244
|
+
start_page_x: e.touches[0].pageX,
|
245
|
+
start_page_y: e.touches[0].pageY,
|
246
|
+
start_time: (new Date()).getTime(),
|
247
|
+
delta_x: 0,
|
248
|
+
is_scrolling: undefined
|
249
|
+
};
|
250
|
+
container.data('swipe-transition', data);
|
305
251
|
e.stopPropagation();
|
306
|
-
|
307
|
-
self.cache.start_page_x = e.touches[0].pageX;
|
308
|
-
self.cache.start_page_y = e.touches[0].pageY;
|
309
|
-
self.cache.start_time = (new Date()).getTime();
|
310
|
-
self.cache.delta_x = 0;
|
311
|
-
self.cache.is_scrolling = null;
|
312
|
-
self.cache.direction = null;
|
313
|
-
|
314
|
-
self.stop_timer(); // does not appear to prevent callback from occurring
|
315
252
|
})
|
316
|
-
.on('touchmove.fndtn.orbit',function(e) {
|
317
|
-
if (
|
318
|
-
|
319
|
-
|
253
|
+
.on('touchmove.fndtn.orbit', function(e) {
|
254
|
+
if (!e.touches) { e = e.originalEvent; }
|
255
|
+
// Ignore pinch/zoom events
|
256
|
+
if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
|
257
|
+
|
258
|
+
var data = container.data('swipe-transition');
|
259
|
+
if (typeof data === 'undefined') {data = {};}
|
260
|
+
|
261
|
+
data.delta_x = e.touches[0].pageX - data.start_page_x;
|
262
|
+
|
263
|
+
if ( typeof data.is_scrolling === 'undefined') {
|
264
|
+
data.is_scrolling = !!( data.is_scrolling || Math.abs(data.delta_x) < Math.abs(e.touches[0].pageY - data.start_page_y) );
|
320
265
|
}
|
321
266
|
|
322
|
-
if (
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
self.cache.delta_x = e.touches[0].pageX - self.cache.start_page_x;
|
330
|
-
|
331
|
-
if (self.cache.is_scrolling === null) {
|
332
|
-
self.cache.is_scrolling = !!( self.cache.is_scrolling || Math.abs(self.cache.delta_x) < Math.abs(e.touches[0].pageY - self.cache.start_page_y) );
|
333
|
-
}
|
334
|
-
|
335
|
-
if (self.cache.is_scrolling) {
|
336
|
-
return;
|
337
|
-
}
|
338
|
-
|
339
|
-
var direction = (self.cache.delta_x < 0) ? (idx+1) : (idx-1);
|
340
|
-
if (self.cache.direction !== direction) {
|
341
|
-
var res = self._prepare_direction(direction);
|
342
|
-
self.cache.direction = direction;
|
343
|
-
self.cache.dir = res[0];
|
344
|
-
self.cache.current = res[1];
|
345
|
-
self.cache.next = res[2];
|
346
|
-
}
|
347
|
-
|
348
|
-
if (settings.animation === 'slide') {
|
349
|
-
var offset, next_offset;
|
350
|
-
|
351
|
-
offset = (self.cache.delta_x / container.width()) * 100;
|
352
|
-
if (offset >= 0) {next_offset = -(100 - offset);}
|
353
|
-
else {next_offset = 100 + offset;}
|
354
|
-
|
355
|
-
self.cache.current.css("transform","translate3d("+offset+"%,0,0)");
|
356
|
-
self.cache.next.css("transform","translate3d("+next_offset+"%,0,0)");
|
357
|
-
}
|
358
|
-
});
|
267
|
+
if (!data.is_scrolling && !data.active) {
|
268
|
+
e.preventDefault();
|
269
|
+
var direction = (data.delta_x < 0) ? (idx+1) : (idx-1);
|
270
|
+
data.active = true;
|
271
|
+
self._goto(direction);
|
272
|
+
}
|
359
273
|
})
|
360
274
|
.on('touchend.fndtn.orbit', function(e) {
|
361
|
-
|
362
|
-
e.preventDefault();
|
275
|
+
container.data('swipe-transition', {});
|
363
276
|
e.stopPropagation();
|
364
|
-
|
365
|
-
self._goto(self.cache.direction);
|
366
|
-
}, 50);
|
367
|
-
});
|
277
|
+
})
|
368
278
|
}
|
369
279
|
container.on('mouseenter.fndtn.orbit', function(e) {
|
370
280
|
if (settings.timer && settings.pause_on_hover) {
|
@@ -373,18 +283,17 @@
|
|
373
283
|
})
|
374
284
|
.on('mouseleave.fndtn.orbit', function(e) {
|
375
285
|
if (settings.timer && settings.resume_on_mouseout) {
|
376
|
-
|
286
|
+
timer.start();
|
377
287
|
}
|
378
288
|
});
|
379
289
|
|
380
290
|
$(document).on('click', '[data-orbit-link]', self.link_custom);
|
381
291
|
$(window).on('load resize', self.compute_dimensions);
|
382
|
-
|
383
|
-
Foundation.utils.image_loaded(children,
|
384
|
-
Foundation.utils.image_loaded(children, function() {
|
292
|
+
Foundation.utils.image_loaded(this.slides().children('img'), self.compute_dimensions);
|
293
|
+
Foundation.utils.image_loaded(this.slides().children('img'), function() {
|
385
294
|
container.prev('.'+settings.preloader_class).css('display', 'none');
|
386
|
-
self.update_slide_number(
|
387
|
-
self.update_active_link(
|
295
|
+
self.update_slide_number(0);
|
296
|
+
self.update_active_link(0);
|
388
297
|
slides_container.trigger('ready.fndtn.orbit');
|
389
298
|
});
|
390
299
|
};
|
@@ -396,7 +305,6 @@
|
|
396
305
|
var self = this,
|
397
306
|
duration = settings.timer_speed,
|
398
307
|
progress = el.find('.'+settings.timer_progress_class),
|
399
|
-
do_progress = progress && progress.css('display') != 'none',
|
400
308
|
start,
|
401
309
|
timeout,
|
402
310
|
left = -1;
|
@@ -413,18 +321,15 @@
|
|
413
321
|
clearTimeout(timeout);
|
414
322
|
el.addClass(settings.timer_paused_class);
|
415
323
|
left = -1;
|
416
|
-
|
417
|
-
self.start();
|
324
|
+
self.update_progress(0);
|
418
325
|
};
|
419
326
|
|
420
327
|
this.start = function() {
|
421
328
|
if (!el.hasClass(settings.timer_paused_class)) {return true;}
|
422
329
|
left = (left === -1) ? duration : left;
|
423
330
|
el.removeClass(settings.timer_paused_class);
|
424
|
-
|
425
|
-
|
426
|
-
progress.animate({'width': '100%'}, left, 'linear');
|
427
|
-
}
|
331
|
+
start = new Date().getTime();
|
332
|
+
progress.animate({'width': '100%'}, left, 'linear');
|
428
333
|
timeout = setTimeout(function() {
|
429
334
|
self.restart();
|
430
335
|
callback();
|
@@ -436,99 +341,58 @@
|
|
436
341
|
if (el.hasClass(settings.timer_paused_class)) {return true;}
|
437
342
|
clearTimeout(timeout);
|
438
343
|
el.addClass(settings.timer_paused_class);
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
self.update_progress(w);
|
444
|
-
}
|
344
|
+
var end = new Date().getTime();
|
345
|
+
left = left - (end - start);
|
346
|
+
var w = 100 - ((left / duration) * 100);
|
347
|
+
self.update_progress(w);
|
445
348
|
el.trigger('timer-stopped.fndtn.orbit');
|
446
349
|
};
|
447
350
|
};
|
351
|
+
|
352
|
+
var SlideAnimation = function(settings, container) {
|
353
|
+
var duration = settings.animation_speed;
|
354
|
+
var is_rtl = ($('html[dir=rtl]').length === 1);
|
355
|
+
var margin = is_rtl ? 'marginRight' : 'marginLeft';
|
356
|
+
var animMargin = {};
|
357
|
+
animMargin[margin] = '0%';
|
448
358
|
|
449
|
-
|
450
|
-
|
359
|
+
this.next = function(current, next, callback) {
|
360
|
+
current.animate({marginLeft:'-100%'}, duration);
|
361
|
+
next.animate(animMargin, duration, function() {
|
362
|
+
current.css(margin, '100%');
|
363
|
+
callback();
|
364
|
+
});
|
365
|
+
};
|
366
|
+
|
367
|
+
this.prev = function(current, prev, callback) {
|
368
|
+
current.animate({marginLeft:'100%'}, duration);
|
369
|
+
prev.css(margin, '-100%');
|
370
|
+
prev.animate(animMargin, duration, function() {
|
371
|
+
current.css(margin, '100%');
|
372
|
+
callback();
|
373
|
+
});
|
374
|
+
};
|
375
|
+
};
|
376
|
+
|
377
|
+
var FadeAnimation = function(settings, container) {
|
378
|
+
var duration = settings.animation_speed;
|
379
|
+
var is_rtl = ($('html[dir=rtl]').length === 1);
|
380
|
+
var margin = is_rtl ? 'marginRight' : 'marginLeft';
|
451
381
|
|
452
382
|
this.next = function(current, next, callback) {
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
container.children().css({
|
458
|
-
"transform":"",
|
459
|
-
"-ms-transform":"",
|
460
|
-
"-webkit-transition-duration":"",
|
461
|
-
"-moz-transition-duration": "",
|
462
|
-
"-o-transition-duration": "",
|
463
|
-
"transition-duration":""
|
464
|
-
});
|
465
|
-
callback();
|
466
|
-
});
|
467
|
-
} else {
|
468
|
-
setTimeout(function(){
|
469
|
-
current.removeClass("active animate-out");
|
470
|
-
container.children().css({
|
471
|
-
"transform":"",
|
472
|
-
"-ms-transform":"",
|
473
|
-
"-webkit-transition-duration":"",
|
474
|
-
"-moz-transition-duration": "",
|
475
|
-
"-o-transition-duration": "",
|
476
|
-
"transition-duration":""
|
477
|
-
});
|
478
|
-
callback();
|
479
|
-
}, settings.animation_speed);
|
480
|
-
}
|
481
|
-
container.children().css({
|
482
|
-
"transform":"",
|
483
|
-
"-ms-transform":"",
|
484
|
-
"-webkit-transition-duration":"",
|
485
|
-
"-moz-transition-duration": "",
|
486
|
-
"-o-transition-duration": "",
|
487
|
-
"transition-duration":""
|
383
|
+
next.css({'margin':'0%', 'opacity':'0.01'});
|
384
|
+
next.animate({'opacity':'1'}, duration, 'linear', function() {
|
385
|
+
current.css('margin', '100%');
|
386
|
+
callback();
|
488
387
|
});
|
489
|
-
current.addClass("animate-out");
|
490
|
-
next.addClass("animate-in");
|
491
388
|
};
|
492
389
|
|
493
390
|
this.prev = function(current, prev, callback) {
|
494
|
-
|
495
|
-
|
496
|
-
|
497
|
-
|
498
|
-
container.children().css({
|
499
|
-
"transform":"",
|
500
|
-
"-ms-transform":"",
|
501
|
-
"-webkit-transition-duration":"",
|
502
|
-
"-moz-transition-duration": "",
|
503
|
-
"-o-transition-duration": "",
|
504
|
-
"transition-duration":""
|
505
|
-
});
|
506
|
-
callback();
|
507
|
-
});
|
508
|
-
} else {
|
509
|
-
setTimeout(function(){
|
510
|
-
current.removeClass("active animate-out");
|
511
|
-
container.children().css({
|
512
|
-
"transform":"",
|
513
|
-
"-ms-transform":"",
|
514
|
-
"-webkit-transition-duration":"",
|
515
|
-
"-moz-transition-duration": "",
|
516
|
-
"-o-transition-duration": "",
|
517
|
-
"transition-duration":""
|
518
|
-
});
|
519
|
-
callback();
|
520
|
-
}, settings.animation_speed);
|
521
|
-
}
|
522
|
-
container.children().css({
|
523
|
-
"transform":"",
|
524
|
-
"-ms-transform":"",
|
525
|
-
"-webkit-transition-duration":"",
|
526
|
-
"-moz-transition-duration": "",
|
527
|
-
"-o-transition-duration": "",
|
528
|
-
"transition-duration":""
|
391
|
+
prev.css({'margin':'0%', 'opacity':'0.01'});
|
392
|
+
prev.animate({'opacity':'1'}, duration, 'linear', function() {
|
393
|
+
current.css('margin', '100%');
|
394
|
+
callback();
|
529
395
|
});
|
530
|
-
current.addClass("animate-out");
|
531
|
-
prev.addClass("animate-in");
|
532
396
|
};
|
533
397
|
};
|
534
398
|
|
@@ -538,7 +402,7 @@
|
|
538
402
|
Foundation.libs.orbit = {
|
539
403
|
name: 'orbit',
|
540
404
|
|
541
|
-
version: '5.
|
405
|
+
version: '5.3.0',
|
542
406
|
|
543
407
|
settings: {
|
544
408
|
animation: 'slide',
|
@@ -558,7 +422,6 @@
|
|
558
422
|
timer_container_class: 'orbit-timer',
|
559
423
|
timer_paused_class: 'paused',
|
560
424
|
timer_progress_class: 'orbit-progress',
|
561
|
-
timer_show_progress_bar: true,
|
562
425
|
slides_container_class: 'orbit-slides-container',
|
563
426
|
preloader_class: 'preloader',
|
564
427
|
slide_selector: '*',
|
@@ -583,7 +446,6 @@
|
|
583
446
|
},
|
584
447
|
|
585
448
|
events : function (instance) {
|
586
|
-
var self = this;
|
587
449
|
var orbit_instance = new Orbit(this.S(instance), this.S(instance).data('orbit-init'));
|
588
450
|
this.S(instance).data(self.name + '-instance', orbit_instance);
|
589
451
|
},
|
@@ -607,4 +469,4 @@
|
|
607
469
|
};
|
608
470
|
|
609
471
|
|
610
|
-
}(jQuery, window, window.document));
|
472
|
+
}(jQuery, window, window.document));
|