* Fixed multiple jQuery loaded conflicts.

* Now uses standard Wordpress javascript insertion. * Loads locally stored jQuery 1.6.2 if current version is < 1.6 this can only be detected through Wordpress now, hence the fix for multiple versions conflicting (some naughty themes don't use Wordpress's javascript loading.
benbalter · Jul 14, 2011 · 9d48471 · 9d48471
1 parent f1b82ff
commit 9d48471
Show file tree

Hide file tree

Showing 6 changed files with 9,045 additions and 19 deletions.
diff --git a/jquery.infinitescroll.js b/jquery.infinitescroll.js
@@ -3,7 +3,7 @@
 	Infinite Scroll
 	--------------------------------
 	+ https://github.com/paulirish/infinitescroll
-	+ version 2.0b2.110709
+	+ version 2.0b2.110713
 	+ Copyright 2011 Paul Irish & Luke Shumard
 	+ Licensed under the MIT license
 	
@@ -689,7 +689,7 @@
 
             if (scrollTimeout) { clearTimeout(scrollTimeout); }
             scrollTimeout = setTimeout(function () {
-                jQuery.event.handle.apply(context, args);
+                $.event.handle.apply(context, args);
             }, execAsap === "execAsap" ? 0 : 100);
         }
     };

diff --git a/jquery.infinitescroll.min.js b/jquery.infinitescroll.min.js