diff --git a/Gruntfile.js b/Gruntfile.js index e10e268..b3df8d2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,7 +29,7 @@ module.exports = function( grunt ) { options: { baseUrl: 'bower_components', include: [ - 'jquery-bridget/jquery.bridget', + 'jquery-bridget/jquery-bridget', 'isotope/js/isotope' ], out: 'dist/isotope.pkgd.js', diff --git a/bower.json b/bower.json index f4e9edb..9c78ebb 100644 --- a/bower.json +++ b/bower.json @@ -1,24 +1,17 @@ { "name": "isotope", - "version": "2.2.2", "description": "Filter and sort magical layouts", "main": "js/isotope.js", "dependencies": { - "get-size": "~1.2.2", - "matches-selector": "~1.0.2", - "outlayer": "~1.4.1", - "masonry": "~3.3.0", - "fizzy-ui-utils": "~1.0.1" + "get-size": "~2.0.0", + "desandro-matches-selector": "~2.0.0", + "outlayer": "~2.0.0", + "masonry": "~4.0.0", + "fizzy-ui-utils": "~2.0.0" }, "devDependencies": { - "doc-ready": "1.x", - "isotope-cells-by-column": "1.x", - "isotope-cells-by-row": "1.x", - "isotope-fit-columns": "1.x", - "isotope-horizontal": "1.x", - "isotope-masonry-horizontal": "1.x", - "jquery": ">=1.4.3 <2", - "jquery-bridget": "1.1.x", + "jquery": "2 < 4", + "jquery-bridget": "^2", "qunit": "^1.15" }, "ignore": [ diff --git a/js/isotope.js b/js/isotope.js index c8b9a0b..64b4d65 100644 --- a/js/isotope.js +++ b/js/isotope.js @@ -1,11 +1,11 @@ /*! - * Isotope v2.2.2 + * Isotope v3.0.0-beta1 * * Licensed GPLv3 for open source use * or Isotope Commercial License for commercial use * * http://isotope.metafizzy.co - * Copyright 2015 Metafizzy + * Copyright 2016 Metafizzy */ ( function( window, factory ) { @@ -17,7 +17,7 @@ define( [ 'outlayer/outlayer', 'get-size/get-size', - 'matches-selector/matches-selector', + 'desandro-matches-selector/matches-selector', 'fizzy-ui-utils/utils', './item', './layout-mode', diff --git a/package.json b/package.json index 2c408d5..8520395 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "isotope-layout", - "version": "2.2.2", + "version": "3.0.0-beta1", "description": "Filter and sort magical layouts", "main": "js/isotope.js", "dependencies": { diff --git a/sandbox/basic.html b/sandbox/basic.html index 8c7efbd..34046f6 100644 --- a/sandbox/basic.html +++ b/sandbox/basic.html @@ -36,13 +36,9 @@
- - - - + - - + @@ -53,11 +49,9 @@ diff --git a/sandbox/bottom-up.html b/sandbox/bottom-up.html index b03ce8a..16c7f56 100644 --- a/sandbox/bottom-up.html +++ b/sandbox/bottom-up.html @@ -78,14 +78,9 @@ - - - - - + - - + @@ -98,31 +93,28 @@