Merge branch 'master' into gh-pages

_posts/docs/2010-12-03-options.mdown

@@ -281,18 +281,16 @@ If you do disable transforms, but still want to use [CSS transitions](animating.
 
 {% endhighlight %}
 
-### Disabling hiddenStyle scale
+### Disabling hidden and visible scale styles
 
-If you are using filtering, it's also a good idea to disable the scale transform with the [`hiddenStyle` option](#hiddenstyle).
+If you are using filtering, it's also a good idea to disable the scale transform with the [`hiddenStyle` option](#hiddenstyle) and [`visibleStyle` option](#visiblestyle).
 
 {% highlight javascript %}
 
 $('#container').isotope({
   transformsEnabled: false,
-  hiddenStyle : {
+  visibleStyle: { opacity: 1 },
-    opacity: 0,
+  hiddenStyle: { opacity: 0 }
-    scale : 1
-  }
 });
 
 {% endhighlight %}

_posts/tests/2011-03-27-flash01.html

@@ -115,10 +115,8 @@ category: tests
       $container.imagesLoaded(function(){
         $container.isotope({
           transformsEnabled: false,
-          hiddenStyle : {
+          visibleStyle: { opacity: 1 },
-            opacity: 0,
+          hiddenStyle: { opacity: 0 }
-            scale : 1
-          }
         });
       });
       

jquery.isotope.js

@@ -1,5 +1,5 @@
 /**
- * Isotope v1.4.110630
+ * Isotope v1.4.110721
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -334,7 +334,7 @@
     // sets up widget
     _create : function( options ) {
       
-      this.options = $.extend( true, {}, $.Isotope.settings, options );
+      this.options = $.extend( {}, $.Isotope.settings, options );
       
       this.styleQueue = [];
       this.elemCount = 0;
@@ -1169,34 +1169,50 @@
   
   
   // ======================= imagesLoaded Plugin  ===============================
-  // A fork of http://gist.github.com/268257 by Paul Irish
+  // https://gist.github.com/964345
 
+  // $('img.photo',this).imagesLoaded(myFunction)
+  // execute a callback when all images have loaded.
+  // needed because .load() doesn't work on cached images
+
+  // modified by yiannis chatzikonstantinou.
+
+  // original:
   // mit license. paul irish. 2010.
   // webkit fix from Oren Solomianik. thx!
 
-  $.fn.imagesLoaded = function(callback){
+  // callback function is passed the last image to load
-    var elems = this.find('img'),
+  //   as an argument, and the collection as `this`
-        len   = elems.length,
+
-        _this = this;
+  $.fn.imagesLoaded = function( callback ){
+    var elems = this.find( 'img' ),
+        elems_src = [],
+        self = this,
+        len = elems.length;
 
     if ( !elems.length ) {
       callback.call( this );
+      return this;
     }
 
-    elems.bind('load',function(){
+    elems.one('load error', function() {
-      if (--len <= 0){ 
+      if ( --len === 0 ) {
-        callback.call( _this ); 
+        // Rinse and repeat.
+        len = elems.length;
+        elems.one( 'load error', function() {
+          if ( --len === 0 ) {
+            callback.call( self );
+          }
+        }).each(function() {
+          this.src = elems_src.shift();
+        });
       }
-    }).each(function(){
+    }).each(function() {
-      // cached images don't fire load sometimes, so we reset src.
+      elems_src.push( this.src );
-      if (this.complete || this.complete === undefined){
+      // webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
-        var src = this.src;
+      // data uri bypasses webkit log warning (thx doug jones)
-        // webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
+      this.src = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";
-        // data uri bypasses webkit log warning (thx doug jones)
+    });
-        this.src = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";
-        this.src = src;
-      }  
-    }); 
 
     return this;
   };