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.110720
  * 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;