From e45949dc1464498df2bfdadbd96d852575ae3e75 Mon Sep 17 00:00:00 2001
From: Dudley Storey <dudley.storey@gmail.com>
Date: Sat, 10 May 2014 23:00:34 -0600
Subject: [PATCH 1/3] Cleaned up README

Signed-off-by: Dudley Storey <dudley.storey@gmail.com>
---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index c255364..5b223b2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 #CSSslidy
-<<<<<<< HEAD
 An auto-generated, responsive CSS image slider
 
 ### Use:
@@ -72,6 +71,3 @@ Option | Type | Default Value | Description
 Any added manipulation of the caption `font-size` – such as inside `@media` breakpoints added inside your CSS – will require `important` to overwrite the appearence rules generated by the script. For example:
 
 `@media screen and (max-width: 600px) { #slidy-container figcaption { font-size: 1rem !important; } }`
-=======
-An auto-generated, responsive CSS image slider
->>>>>>> 277c1e37e2029d75a514354b11e67bbc2f60ad1c

From 9d0292a220a31fa2fd14f8e725fc6c130c5a038e Mon Sep 17 00:00:00 2001
From: Dudley Storey <dudley.storey@gmail.com>
Date: Mon, 12 May 2014 01:52:17 -0600
Subject: [PATCH 2/3] Bugfix to add customisation

---
 cssslidy.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cssslidy.min.js b/cssslidy.min.js
index 744f4a3..c0b5854 100644
--- a/cssslidy.min.js
+++ b/cssslidy.min.js
@@ -1 +1 @@
-var cssSlidy=function(e){var i=function(){var i={},n={timeOnSlide:3,timeBetweenSlides:1,slidyContainerSelector:"#slidy-container",slidySelector:"#slidy",slidyDirection:"left",fallbackFunction:function(){},cssAnimationName:"slidy",captionSource:"data-caption",captionBackground:"rgba(0,0,0,0.3)",captionColor:"#fff",captionFont:"Avenir, Avenir Next, Droid Sans, DroidSansRegular, Corbel, Tahoma, Geneva, sans-serif",captionPosition:"bottom",captionAppear:"slide",captionSize:"1.6rem",captionPadding:".6rem"};for(var t in n)i[t]=n[t];for(var t in e)i[t]=e[t];return i}(),n=this;n.animationString="animation",n.hasAnimation=!1,n.keyframeprefix="",n.domPrefixes="Webkit Moz O Khtml".split(" "),n.pfx="",n.element=document.getElementById(i.slidySelector.replace("#","")),n.init=function(){if(void 0!==n.element.style.animationName&&(n.hasAnimation=!0),n.hasAnimation===!1)for(var e=0;e<n.domPrefixes.length;e++)if(void 0!==n.slidy.style[n.domPrefixes[e]+"AnimationName"]){n.pfx=domPrefixes[e],n.animationString=pfx+"Animation",n.keyframeprefix="-"+pfx.toLowerCase()+"-",n.hasAnimation=!0;break}if(n.hasAnimation===!0){for(var t,o,a=n.element.getElementsByTagName("img"),r=a.length,l=document.createElement("figure");r;)o=l.cloneNode(!1),t=a[--r],"none"!==i.captionSource&&(caption=t.getAttribute(i.captionSource)),t.parentNode.insertBefore(o,t),null!==caption&&(content=document.createElement("figcaption"),content.innerHTML=caption),o.appendChild(t),null!==caption&&o.appendChild(content);var c=n.element.getElementsByTagName("figure"),s=c[0];figWrap=s.cloneNode(!0),n.element.appendChild(figWrap);var d=a.length,p=(i.timeOnSlide+i.timeBetweenSlides)*(d-1),f=i.timeOnSlide/p*100,m=i.timeBetweenSlides/p*100,g=100/d,y=0,u=document.createElement("style");u.type="text/css",u.id=i.slidySelector.replace("#","")+"-css",u.innerHTML+=i.slidyContainerSelector+" { overflow: hidden; }\n",u.innerHTML+=i.slidySelector+" { margin: 0; font-size: 0; position: relative; width: "+100*d+"%;  }\n",u.innerHTML+=i.slidySelector+" figure { margin: 0; position: relative; display: inline-block; width: "+g+"%; height: auto; }\n",u.innerHTML+=i.slidySelector+" figure img { width: 100%; }\n",u.innerHTML+=i.slidySelector+" figure figcaption { position: absolute; width: 100%; background-color: "+i.captionBackground+"; color: "+i.captionColor+"; font-family: "+i.captionFont+";";var h=document.getElementsByTagName("figcaption"),S=2*h[0].offsetHeight+parseInt(window.getComputedStyle(h[0]).fontSize,10);if("top"==i.captionPosition)switch(i.captions){case"fade":u.innerHTML+=" top: 0; opacity: 0;";break;case"slide":u.innerHTML+=" top: -"+S+"px; ";break;default:u.innerHTML+=" top: 0;"}else switch(i.captionAppear){case"fade":u.innerHTML+=" bottom: 0; opacity: 0;";break;case"slide":u.innerHTML+=" bottom: -"+S+"px; ";break;default:u.innerHTML+=" bottom: 0;"}if(u.innerHTML+=" font-size: "+i.captionSize+"; padding: "+i.captionPadding+"; "+keyframeprefix+"transition: .5s; }\n",u.innerHTML+=i.slidySelector+":hover figure figcaption { opacity: 1; ",u.innerHTML+="top"==i.captionPosition?" top: 0px;":" bottom: 0px;",u.innerHTML+=" }\n",u.innerHTML+="@"+keyframeprefix+"keyframes "+i.cssAnimationName+" {\n","right"==i.slidyDirection)for(e=d-1;e>0;e--)y+=f,u.innerHTML+=y+"% { left: -"+100*e+"%; }\n",y+=m,u.innerHTML+=y+"% { left: -"+100*(e-1)+"%; }\n";else for(e=0;d-1>e;e++)y+=f,u.innerHTML+=y+"% { left: -"+100*e+"%; }\n",y+=m,u.innerHTML+=y+"% { left: -"+100*(e+1)+"%; }\n";u.innerHTML+="}\n",u.innerHTML+=i.slidySelector+" { ",u.innerHTML+="right"==i.slidyDirection?"left: "+100*d+"%":"left: 0%; ",u.innerHTML+=keyframeprefix+"transform: translate3d(0,0,0); "+keyframeprefix+"animation: "+p+"s "+i.cssAnimationName+" infinite; }\n",void 0!==i.cssLocation?i.cssLocation.appendChild(u):document.body.appendChild(u)}else i.fallbackFunction()}()};
\ No newline at end of file
+var cssSlidy=function(e){var i=function(){var i={},n={timeOnSlide:3,timeBetweenSlides:1,slidyContainerSelector:"#slidy-container",slidySelector:"#slidy",slidyDirection:"left",fallbackFunction:function(){},cssAnimationName:"slidy",captionSource:"data-caption",captionBackground:"rgba(0,0,0,0.3)",captionColor:"#fff",captionFont:"Avenir, Avenir Next, Droid Sans, DroidSansRegular, Corbel, Tahoma, Geneva, sans-serif",captionPosition:"bottom",captionAppear:"slide",captionSize:"1.6rem",captionPadding:".6rem"};for(var t in n)i[t]=n[t];for(var t in e)i[t]=e[t];return i}(),n=this;n.animationString="animation",n.hasAnimation=!1,n.keyframeprefix="",n.domPrefixes="Webkit Moz O Khtml".split(" "),n.pfx="",n.element=document.getElementById(i.slidySelector.replace("#","")),n.init=function(){if(void 0!==n.element.style.animationName&&(n.hasAnimation=!0),n.hasAnimation===!1)for(var e=0;e<n.domPrefixes.length;e++)if(void 0!==n.element.style[n.domPrefixes[e]+"AnimationName"]){n.pfx=domPrefixes[e],n.animationString=pfx+"Animation",n.keyframeprefix="-"+pfx.toLowerCase()+"-",n.hasAnimation=!0;break}if(n.hasAnimation===!0){for(var t,o,a=n.element.getElementsByTagName("img"),r=a.length,l=document.createElement("figure");r;)o=l.cloneNode(!1),t=a[--r],"none"!==i.captionSource&&(caption=t.getAttribute(i.captionSource)),t.parentNode.insertBefore(o,t),null!==caption&&(content=document.createElement("figcaption"),content.innerHTML=caption),o.appendChild(t),null!==caption&&o.appendChild(content);var c=n.element.getElementsByTagName("figure"),s=c[0];figWrap=s.cloneNode(!0),n.element.appendChild(figWrap);var d=a.length,p=(i.timeOnSlide+i.timeBetweenSlides)*(d-1),f=i.timeOnSlide/p*100,m=i.timeBetweenSlides/p*100,g=100/d,y=0,u=document.createElement("style");u.type="text/css",u.id=i.slidySelector.replace("#","")+"-css",u.innerHTML+=i.slidyContainerSelector+" { overflow: hidden; }\n",u.innerHTML+=i.slidySelector+" { margin: 0; font-size: 0; position: relative; width: "+100*d+"%;  }\n",u.innerHTML+=i.slidySelector+" figure { margin: 0; position: relative; display: inline-block; width: "+g+"%; height: auto; }\n",u.innerHTML+=i.slidySelector+" figure img { width: 100%; }\n",u.innerHTML+=i.slidySelector+" figure figcaption { position: absolute; width: 100%; background-color: "+i.captionBackground+"; color: "+i.captionColor+"; font-family: "+i.captionFont+";";var h=document.getElementsByTagName("figcaption"),S=2*h[0].offsetHeight+parseInt(window.getComputedStyle(h[0]).fontSize,10);if("top"==i.captionPosition)switch(i.captions){case"fade":u.innerHTML+=" top: 0; opacity: 0;";break;case"slide":u.innerHTML+=" top: -"+S+"px; ";break;default:u.innerHTML+=" top: 0;"}else switch(i.captionAppear){case"fade":u.innerHTML+=" bottom: 0; opacity: 0;";break;case"slide":u.innerHTML+=" bottom: -"+S+"px; ";break;default:u.innerHTML+=" bottom: 0;"}if(u.innerHTML+=" font-size: "+i.captionSize+"; padding: "+i.captionPadding+"; "+keyframeprefix+"transition: .5s; }\n",u.innerHTML+=i.slidySelector+":hover figure figcaption { opacity: 1; ",u.innerHTML+="top"==i.captionPosition?" top: 0px;":" bottom: 0px;",u.innerHTML+=" }\n",u.innerHTML+="@"+keyframeprefix+"keyframes "+i.cssAnimationName+" {\n","right"==i.slidyDirection)for(e=d-1;e>0;e--)y+=f,u.innerHTML+=y+"% { left: -"+100*e+"%; }\n",y+=m,u.innerHTML+=y+"% { left: -"+100*(e-1)+"%; }\n";else for(e=0;d-1>e;e++)y+=f,u.innerHTML+=y+"% { left: -"+100*e+"%; }\n",y+=m,u.innerHTML+=y+"% { left: -"+100*(e+1)+"%; }\n";u.innerHTML+="}\n",u.innerHTML+=i.slidySelector+" { ",u.innerHTML+="right"==i.slidyDirection?"left: "+100*d+"%":"left: 0%; ",u.innerHTML+=keyframeprefix+"transform: translate3d(0,0,0); "+keyframeprefix+"animation: "+p+"s "+i.cssAnimationName+" infinite; }\n",void 0!==i.cssLocation?i.cssLocation.appendChild(u):document.body.appendChild(u)}else i.fallbackFunction()}()};

From e42b68ba2bdc7cccc694aef72890027482593426 Mon Sep 17 00:00:00 2001
From: Dudley Storey <dudley.storey@gmail.com>
Date: Mon, 12 May 2014 01:55:02 -0600
Subject: [PATCH 3/3] Bugfix update for compatibility

---
 cssslidy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cssslidy.js b/cssslidy.js
index 42158ca..37dccc5 100644
--- a/cssslidy.js
+++ b/cssslidy.js
@@ -35,7 +35,7 @@ var cssSlidy = function(newOptions) {
         // browser supports keyframe animation w/ prefixes
         if (CS.hasAnimation === false) {
           for (var i = 0; i < CS.domPrefixes.length; i++) {
-            if (CS.slidy.style[CS.domPrefixes[i] + 'AnimationName'] !== undefined) {
+            if (CS.element.style[CS.domPrefixes[i] + 'AnimationName'] !== undefined) {
               CS.pfx = domPrefixes[i];
               CS.animationString = pfx + 'Animation';
               CS.keyframeprefix = '-' + pfx.toLowerCase() + '-';