From: Hakim El Hattab <hakim.elhattab@gmail.com>
Date: Sun, 11 Nov 2012 00:14:16 +0000 (-0500)
Subject: fix issue with dependency loader callbacks
X-Git-Tag: 2.2.0~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=403cb5a8c46a5a19c2374eceefe5f370155957e6;p=reveal.js.git

fix issue with dependency loader callbacks
---

diff --git a/js/reveal.js b/js/reveal.js
index 0bfeef5..cc7b9e5 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -1,5 +1,5 @@
 /*!
- * reveal.js 2.2 r44
+ * reveal.js 2.2 r45
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
@@ -232,7 +232,7 @@ var Reveal = (function(){
 
 				// Extension may contain callback functions
 				if( typeof s.callback === 'function' ) {
-					head.ready( s.src.match( /([\w\d_\-]*)\.?[^\\\/]*$/i )[0], s.callback );
+					head.ready( s.src.match( /([\w\d_\-]*)\.?js|[^\\\/]*$/i )[0], s.callback );
 				}
 			}
 		}
diff --git a/js/reveal.min.js b/js/reveal.min.js
index cb7b18a..cbdf471 100644
--- a/js/reveal.min.js
+++ b/js/reveal.min.js
@@ -1,5 +1,5 @@
 /*!
- * reveal.js 2.2 r44
+ * reveal.js 2.2 r45
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
@@ -17,7 +17,7 @@ f.controlsRight=I(document.querySelectorAll(".navigate-right"));f.controlsUp=I(d
 f.controlsPrev=I(document.querySelectorAll(".navigate-prev"));f.controlsNext=I(document.querySelectorAll(".navigate-next"));}}function d(){if(navigator.userAgent.match(/(iphone|ipod|android)/i)){document.documentElement.style.overflow="scroll";
 document.body.style.height="120%";window.addEventListener("load",ak,false);window.addEventListener("orientationchange",ak,false);}}function ab(){var av=[],az=[];
 for(var aw=0,au=W.dependencies.length;aw<au;aw++){var ax=W.dependencies[aw];if(!ax.condition||ax.condition()){if(ax.async){az.push(ax.src);}else{av.push(ax.src);
-}if(typeof ax.callback==="function"){head.ready(ax.src.match(/([\w\d_\-]*)\.?[^\\\/]*$/i)[0],ax.callback);}}}function ay(){if(az.length){head.js.apply(null,az);
+}if(typeof ax.callback==="function"){head.ready(ax.src.match(/([\w\d_\-]*)\.?js|[^\\\/]*$/i)[0],ax.callback);}}}function ay(){if(az.length){head.js.apply(null,az);
 }K();}if(av.length){head.ready(ay);head.js.apply(null,av);}else{ay();}}function K(){S();G();N();T();M();R();setTimeout(function(){t("ready",{indexh:n,indexv:e,currentSlide:J});
 },1);}function N(){if(Z===false){W.transition="linear";}if(W.controls&&f.controls){f.controls.style.display="block";}if(W.progress&&f.progress){f.progress.style.display="block";
 }if(W.transition!=="default"){f.wrapper.classList.add(W.transition);}if(W.center){f.wrapper.classList.add("center");}if(W.mouseWheel){document.addEventListener("DOMMouseScroll",q,false);