Merge branch 'master' into gh-pages

_posts/demos/2011-01-11-images.html

@@ -34,7 +34,7 @@ photos:
       var $container = $('#container');
     
       $container.imagesLoaded( function(){
-        $(this).isotope({
+        $container.isotope({
           itemSelector : '.photo'
         });
       });

_posts/docs/2011-12-11-help.mdown

@@ -66,13 +66,15 @@ If you’re using a PHP-based CMS, you can use the [getimagesize](http://php.net
 
 ### imagesLoaded plugin
 
-The next best solution is to use the imagesLoaded plugin included with Isotope. It's a fork of [Paul Irish's plugin](https://gist.github.com/268257) that finds all the images in a context, and fires  a callback function once all the images have loaded.
+The next best solution is to use the [imagesLoaded plugin](https://github.com/desandro/imagesloaded) included with Isotope. It's a small plugin that finds all the images in a context, and fires a callback function once all the images have loaded.
 
 {% highlight javascript %}
 
-$('#container').imagesLoaded( function(){
+var $container = $('#container');
-  $(this).isotope({
+
-    itemSelector : '.item',
+$container.imagesLoaded( function(){
+  $container.isotope({
+    // options...
   });
 });
 

jquery.isotope.js

@@ -1,5 +1,5 @@
 /**
- * Isotope v1.4.110823
+ * Isotope v1.4.110825
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -1174,50 +1174,49 @@
   };
   
   
-  // ======================= imagesLoaded Plugin  ===============================
+  // ======================= imagesLoaded Plugin ===============================
-  // https://gist.github.com/964345
+  // https://github.com/desandro/imagesloaded
 
-  // $('img.photo',this).imagesLoaded(myFunction)
+  // $('#my-container').imagesLoaded(myFunction)
   // execute a callback when all images have loaded.
   // needed because .load() doesn't work on cached images
 
-  // modified by yiannis chatzikonstantinou.
+  // callback function gets image collection as argument
+  //  `this` is the container
 
-  // original:
+  // original: mit license. paul irish. 2010.
-  // mit license. paul irish. 2010.
+  // contributors: Oren Solomianik, David DeSandro, Yiannis Chatzikonstantinou
-  // webkit fix from Oren Solomianik. thx!
 
-  // callback function is passed the last image to load
+  $.fn.imagesLoaded = function( callback ) {
-  //   as an argument, and the collection as `this`
+    var $images = this.find('img'),
+        len = $images.length,
+        _this = this,
+        blank = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';
 
-  $.fn.imagesLoaded = function( callback ){
+    function triggerCallback() {
-    var elems = this.find( 'img' ),
+      callback.call( _this, $images );
-        elems_src = [],
+    }
-        self = this,
-        len = elems.length;
 
-    if ( !elems.length ) {
+    function imgLoaded() {
-      callback.call( this );
+      if ( --len <= 0 && this.src !== blank ){
-      return this;
+        setTimeout( triggerCallback );
+        $images.unbind( 'load error', imgLoaded );
+      }
     }
 
-    elems.one('load error', function() {
+    if ( !len ) {
-      if ( --len === 0 ) {
+      triggerCallback();
-        // Rinse and repeat.
+    }
-        len = elems.length;
+
-        elems.one( 'load error', function() {
+    $images.bind( 'load error',  imgLoaded ).each( function() {
-          if ( --len === 0 ) {
+      // cached images don't fire load sometimes, so we reset src.
-            callback.call( self );
+      if (this.complete || this.complete === undefined){
-          }
+        var src = this.src;
-        }).each(function() {
+        // webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
-          this.src = elems_src.shift();
+        // data uri bypasses webkit log warning (thx doug jones)
-        });
+        this.src = blank;
+        this.src = src;
       }
-    }).each(function() {
-      elems_src.push( this.src );
-      // webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
-      // data uri bypasses webkit log warning (thx doug jones)
-      this.src = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";
     });
 
     return this;