Skip to content

Commit 7d049f4

Browse files
hellobarthellobart
committed
Update
IE fix (deleted missing colon). Added link handler. Added 'Disabled' class to navigation buttons. Changed plugin name.
1 parent 22c1c58 commit 7d049f4

8 files changed

+65
-22
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Load jQuery(1.7+) and include Owl Carousel plugin files
3434
<link rel="stylesheet" href="owl-carousel/owl.theme.css">
3535

3636
<!-- Include js plugin -->
37-
<script src="assets/owl-carousel/owl.carousel.v1.0.js"></script>
37+
<script src="assets/owl-carousel/owl.carousel.js"></script>
3838
```
3939
## 2.Set up your HTML
4040
You don't need any special markup. All you need is to wrap your divs inside the container element <div class="owl-carousel">. Class "owl-carousel" is mandatory to apply proper styles that come from owl.carousel.css file.

‎demos/custom.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="nav-collapse collapse">
3838
<ul class="nav pull-right">
3939
<li><a href="../index.html"><i class="icon-chevron-left"></i> Back to Frontpage</a></li>
40-
<li><a href="../owl.carousel.v1.0.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
40+
<li><a href="../owl.carousel.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
4141
</ul>
4242
<ul class="nav pull-left">
4343

@@ -242,7 +242,7 @@ <h5>Bartosz Wojciechowski 2013 @OwlFonk</h5>
242242

243243

244244
<script src="../assets/js/jquery-1.9.1.min.js"></script>
245-
<script src="../owl-carousel/owl.carousel.v1.0.js"></script>
245+
<script src="../owl-carousel/owl.carousel.js"></script>
246246

247247

248248
<!-- Demo -->

‎demos/full.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<div class="nav-collapse collapse">
3939
<ul class="nav pull-right">
4040
<li><a href="../index.html"><i class="icon-chevron-left"></i> Back to Frontpage</a></li>
41-
<li><a href="../owl.carousel.v1.0.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
41+
<li><a href="../owl.carousel.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
4242
</ul>
4343
<ul class="nav pull-left">
4444

@@ -226,7 +226,7 @@ <h5>Bartosz Wojciechowski 2013 / @OwlFonk / <a href="mailto:[email protected]?s
226226

227227

228228
<script src="../assets/js/jquery-1.9.1.min.js"></script>
229-
<script src="../owl-carousel/owl.carousel.v1.0.js"></script>
229+
<script src="../owl-carousel/owl.carousel.js"></script>
230230

231231
<!-- Demo -->
232232

‎demos/images.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<div class="nav-collapse collapse">
4040
<ul class="nav pull-right">
4141
<li><a href="../index.html"><i class="icon-chevron-left"></i> Back to Frontpage</a></li>
42-
<li><a href="../owl.carousel.v1.0.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
42+
<li><a href="../owl.carousel.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
4343
</ul>
4444
<ul class="nav pull-left">
4545

@@ -230,7 +230,7 @@ <h5>Bartosz Wojciechowski 2013 / @OwlFonk / <a href="mailto:[email protected]?s
230230

231231

232232
<script src="../assets/js/jquery-1.9.1.min.js"></script>
233-
<script src="../owl-carousel/owl.carousel.v1.0.js"></script>
233+
<script src="../owl-carousel/owl.carousel.js"></script>
234234

235235

236236
<!-- Demo -->

‎demos/one.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="nav-collapse collapse">
3838
<ul class="nav pull-right">
3939
<li><a href="../index.html"><i class="icon-chevron-left"></i> Back to Frontpage</a></li>
40-
<li><a href="../owl.carousel.v1.0.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
40+
<li><a href="../owl.carousel.zip" class="download download-on" data-spy="affix" data-offset-top="450">Download</a></li>
4141
</ul>
4242
<ul class="nav pull-left">
4343

@@ -217,7 +217,7 @@ <h5>Bartosz Wojciechowski 2013 / @OwlFonk / <a href="mailto:[email protected]?s
217217

218218

219219
<script src="../assets/js/jquery-1.9.1.min.js"></script>
220-
<script src="../owl-carousel/owl.carousel.v1.0.js"></script>
220+
<script src="../owl-carousel/owl.carousel.js"></script>
221221

222222

223223
<!-- Demo -->

‎index.html

+16-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<li><a href="#more-demos">More Demos</a></li>
4242
<li><a href="#how-to">How To</a></li>
4343
<li><a href="#customizing">Customizing</a></li>
44-
<li><a href="owl.carousel.v1.0.zip" class="download" data-spy="affix" data-offset-top="450">Download</a></li>
44+
<li><a href="owl.carousel.zip" class="download" data-spy="affix" data-offset-top="450">Download</a></li>
4545
</ul>
4646
</div>
4747
</div>
@@ -57,8 +57,8 @@
5757
<div class="span7">
5858
<h1>OWL Carousel </h1>
5959
<h3>Touch enabled jQuery plugin that lets you create beautiful responsive carousel slider.</h3>
60-
<a class="btn btn-success btn-large" href="owl.carousel.v1.0.zip">Download for FREE</a>
61-
<p class="muted"><a class="muted" href="https://github.com/OwlFonk/OwlCarousel">Github</a> / v1.0 </p>
60+
<a class="btn btn-success btn-large" href="owl.carousel.zip">Download for FREE</a>
61+
<p class="muted"><a class="muted" href="https://github.com/OwlFonk/OwlCarousel">Github</a> / v1.1 </p>
6262
</div>
6363
</div>
6464
</div>
@@ -228,7 +228,7 @@ <h2>1. Load jQuery and include Owl Carousel plugin files</h2>
228228
&lt;script src="jquery-1.9.1.min.js"&gt;&lt;/script&gt;
229229

230230
&lt;!-- Include js plugin --&gt;
231-
&lt;script src="assets/owl-carousel/owl.carousel.v1.0.js"&gt;&lt;/script&gt;
231+
&lt;script src="assets/owl-carousel/owl.carousel.js"&gt;&lt;/script&gt;
232232
</pre>
233233
<h2>2. Set up your HTML</h2>
234234
<p>You don't need any special markup. All you need is to wrap your divs inside the container element &lt;div class="owl-carousel"&gt;. Class "owl-carousel" is mandatory to apply proper styles that come from owl.carousel.css file.</p>
@@ -428,7 +428,7 @@ <h5>Bartosz Wojciechowski 2013 / @OwlFonk / <a href="mailto:[email protected]?s
428428

429429

430430
<script src="assets/js/jquery-1.9.1.min.js"></script>
431-
<script src="owl-carousel/owl.carousel.v1.0.js"></script>
431+
<script src="owl-carousel/owl.carousel.js"></script>
432432

433433
<!-- Frontpage Demo -->
434434
<script>
@@ -445,5 +445,16 @@ <h5>Bartosz Wojciechowski 2013 / @OwlFonk / <a href="mailto:[email protected]?s
445445
<script src="assets/js/google-code-prettify/prettify.js"></script>
446446
<script src="assets/js/application.js"></script>
447447

448+
<script>
449+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
450+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
451+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
452+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
453+
454+
ga('create', 'UA-41541058-1', 'owlgraphic.com');
455+
ga('send', 'pageview');
456+
457+
</script>
458+
448459
</body>
449460
</html>

‎owl-carousel/owl.carousel.v1.0.js ‎owl-carousel/owl.carousel.js

+40-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery OwlCarousel v1.0
2+
* jQuery OwlCarousel v1.1
33
*
44
* Copyright (c) 2013 Bartosz Wojciechowski
55
* http://www.owlgraphic.com/owlcarousel
@@ -266,19 +266,19 @@ if ( typeof Object.create !== 'function' ) {
266266
var buttonsWrapper = $("<div class=\"owl-buttons\"/>")
267267
base.owlControlls.append(buttonsWrapper)
268268

269-
var buttonPrev = $("<div/>",{
269+
base.buttonPrev = $("<div/>",{
270270
"class" : "owl-prev",
271271
"text" : base.options.navigationText[0] || ""
272272
});
273273

274-
var buttonNext = $("<div/>",{
274+
base.buttonNext = $("<div/>",{
275275
"class" : "owl-next",
276276
"text" : base.options.navigationText[1] || ""
277277
});
278278

279279
buttonsWrapper
280-
.append(buttonPrev)
281-
.append(buttonNext);
280+
.append(base.buttonPrev)
281+
.append(base.buttonNext);
282282

283283
buttonsWrapper.on( base.getEvent() , "div[class^=\"owl\"]", function(event){
284284
event.preventDefault();
@@ -288,6 +288,9 @@ if ( typeof Object.create !== 'function' ) {
288288
base.prev();
289289
}
290290
})
291+
292+
//Add 'disable' class
293+
base.checkNavigation();
291294
},
292295

293296
getEvent : function(){
@@ -336,7 +339,7 @@ if ( typeof Object.create !== 'function' ) {
336339
});
337340
var paginationButtonInner = $("<span></span>",{
338341
"text": base.options.paginationNumbers === true ? counter : "",
339-
"class": base.options.paginationNumbers === true ? "owl-numbers" : "",
342+
"class": base.options.paginationNumbers === true ? "owl-numbers" : ""
340343
});
341344
paginationButton.append(paginationButtonInner)
342345

@@ -365,12 +368,30 @@ if ( typeof Object.create !== 'function' ) {
365368
});
366369
},
367370

371+
checkNavigation : function(){
372+
var base = this;
373+
374+
if(base.currentSlide === 0){
375+
base.buttonPrev.addClass('disabled');
376+
base.buttonNext.removeClass('disabled');
377+
378+
} else if (base.currentSlide === base.maximumSlide){
379+
base.buttonPrev.removeClass('disabled');
380+
base.buttonNext.addClass('disabled');
381+
382+
} else if(base.currentSlide !== 0 && base.currentSlide !== base.maximumSlide){
383+
base.buttonPrev.removeClass('disabled');
384+
base.buttonNext.removeClass('disabled');
385+
}
386+
},
387+
368388
destroyControlls : function(){
369389
var base = this;
370390
if(base.owlControlls){
371391
base.owlControlls.remove();
372392
}
373393
},
394+
374395
next : function(speed){
375396
var base = this;
376397
base.currentSlide += 1;
@@ -432,6 +453,9 @@ if ( typeof Object.create !== 'function' ) {
432453
if(base.options.pagination === true){
433454
base.checkPagination()
434455
}
456+
if(base.options.navigation === true){
457+
base.checkNavigation()
458+
}
435459
if(base.options.autoPlay !== false){
436460
base.play()
437461
}
@@ -570,6 +594,8 @@ if ( typeof Object.create !== 'function' ) {
570594
maxSwipe,
571595
sliding;
572596

597+
var links = base.$elem.find('a');
598+
573599
base.isCssFinish = true;
574600

575601
var start = function(event){
@@ -661,19 +687,26 @@ if ( typeof Object.create !== 'function' ) {
661687
$(document).off("mouseup.owl");
662688
}
663689

690+
664691
if(base.newX !== 0){
665692
var newPosition = base.getNewPosition();
666693
base.goTo(newPosition)
694+
} else {
695+
if(links.length>0){
696+
links.off('click.owlClick');
697+
}
667698
}
699+
668700
};
669701

670702

671703
if(base.isTouch === true){
672704
base.$elem.on("touchstart.owl", ".owl-wrapper", start);
673705
base.$elem.on("touchend.owl", ".owl-wrapper", end);
674706
}else{
707+
links.on('click.owlClick', function(event){event.preventDefault();})
675708
base.$elem.on("mousedown.owl", ".owl-wrapper", start);
676-
base.$elem.on('dragstart.owl',"img", function(event) { event.preventDefault(); });
709+
base.$elem.on('dragstart.owl',"img", function(event) { event.preventDefault();});
677710
base.$elem.bind('mousedown.disableTextSelect', function() {return false;});
678711
}
679712
},

0 commit comments

Comments
 (0)