fix merge

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "isotope",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Filter and sort magical layouts",
   "main": [
     "js/item.js",
@@ -11,7 +11,7 @@
     "js/layout-modes/masonry.js"
   ],
   "dependencies": {
-    "get-size": ">=1.1.8 <1.3",
+    "get-size": ">=1.2.2 <1.3",
     "matches-selector": ">=1 <2",
     "outlayer": "1.3.x",
     "masonry": "3.2.x"

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### v2.1.1
+
++ Refactored hide/reveal logic with filtering
++ Required [getSize](https://github.com/desandro/getsize) v1.2.2. Fixed [#860](https://github.com/metafizzy/isotope/issues/580)
+
 ## v2.1.0
 
 + Add CommonJS support for npm/Browserify

dist/isotope.pkgd.js

@@ -1,5 +1,5 @@
 /*!
- * Isotope PACKAGED v2.1.0
+ * Isotope PACKAGED v2.1.1
  * Filter & sort magical layouts
  * http://isotope.metafizzy.co
  */
@@ -3401,7 +3401,7 @@ if ( typeof define === 'function' && define.amd ) {
 })( window );
 
 /*!
- * Isotope v2.1.0
+ * Isotope v2.1.1
  * Filter & sort magical layouts
  * http://isotope.metafizzy.co
  */

js/isotope.js

@@ -1,5 +1,5 @@
 /*!
- * Isotope v2.1.0
+ * Isotope v2.1.1
  * Filter & sort magical layouts
  * http://isotope.metafizzy.co
  */

package.json

@@ -1,9 +1,9 @@
 {
   "name": "isotope-layout",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Filter and sort magical layouts",
   "dependencies": {
-    "get-size": ">=1.1.8 <1.3",
+    "get-size": ">=1.2.2 <1.3",
     "desandro-matches-selector": ">=1 <2",
     "outlayer": "1.3.x",
     "masonry-layout": "3.2.x"