⬆️ upgrade dependencies to remove IE8 versions

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',

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": [

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',

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": {

sandbox/basic.html

@@ -36,13 +36,9 @@
     <div class="item"></div>
   </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -53,11 +49,9 @@
 <script src="../js/layout-modes/fit-rows.js"></script>
 
 <script>
-docReady( function() {
-  var container = document.querySelector('#basic');
-  var iso = window.iso = new Isotope( container, {
-    layoutMode: 'fitRows'
-  });
+var container = document.querySelector('#basic');
+var iso = window.iso = new Isotope( container, {
+  layoutMode: 'fitRows'
 });
 </script>
 

sandbox/bottom-up.html

@@ -78,14 +78,9 @@
     <div class="item"></div>
   </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventEmitter/EventEmitter.min.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -98,31 +93,28 @@
 <script src="../js/layout-modes/fit-rows.js"></script>
 
 <script>
-docReady( function() {
-  ( function() {
-    var container = document.querySelector('#basic');
-    var iso = new Isotope( container, {
-      isOriginTop: false,
-      masonry: {
-        columnWidth: 60
-      }
-    });
-  })();
-
-  ( function() {
-    var container = document.querySelector('#stamped');
-    var iso = new Isotope( container, {
-      itemSelector: '.item',
-      isOriginTop: false,
-      masonry: {
-        columnWidth: 60,
-        gutter: 10,
-      },
-      stamp: '.stamp'
-    });
-  })();
+( function() {
+  var container = document.querySelector('#basic');
+  var iso = new Isotope( container, {
+    isOriginTop: false,
+    masonry: {
+      columnWidth: 60
+    }
+  });
+})();
 
-});
+( function() {
+  var container = document.querySelector('#stamped');
+  var iso = new Isotope( container, {
+    itemSelector: '.item',
+    isOriginTop: false,
+    masonry: {
+      columnWidth: 60,
+      gutter: 10,
+    },
+    stamp: '.stamp'
+  });
+})();
 </script>
 
 </body>

sandbox/cells-by-row.html

@@ -144,13 +144,10 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>

sandbox/combination-filters-inclusive.html

@@ -198,13 +198,10 @@
 
 <script src="../bower_components/jquery/dist/jquery.js"></script>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>

sandbox/combination-filters.html

@@ -198,13 +198,10 @@
 
 <script src="../bower_components/jquery/dist/jquery.js"></script>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -233,6 +230,7 @@ $( function() {
     var filterGroup = $buttonGroup.attr('data-filter-group');
     // set filter for group
     filters[ filterGroup ] = $this.attr('data-filter');
+
     // combine filters
     var filterValue = '';
     for ( var prop in filters ) {
@@ -245,9 +243,9 @@ $( function() {
   // change is-checked class on buttons
   $('.button-group').each( function( i, buttonGroup ) {
     var $buttonGroup = $( buttonGroup );
-    $buttonGroup.on( 'click', 'button', function() {
+    $buttonGroup.on( 'click', 'button', function( event ) {
       $buttonGroup.find('.is-checked').removeClass('is-checked');
-      $( this ).addClass('is-checked');
+      $( event.currentTarget ).addClass('is-checked');
     });
   });
   

sandbox/filter-sort.html

@@ -141,13 +141,9 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -161,66 +157,60 @@
 <script src="../bower_components/isotope-cells-by-row/cells-by-row.js"></script>
 
 <script>
-docReady( function() {
-  var container = document.querySelector('#container');
-  var iso = window.iso = new Isotope( container, {
-    layoutMode: 'fitRows',
-    transitionDuration: '0.8s',
-    cellsByRow: {
-      columnWidth: 130,
-      rowHeight: 140,
-    },
-    getSortData: {
-      number: '.number parseInt',
-      symbol: '.symbol',
-      name: '.name',
-      category: '[data-category]',
-      weight: function( itemElem ) {
-        // remove parenthesis
-        return parseFloat( getText( itemElem.querySelector('.weight') ).replace( /[\(\)]/g, '') );
-      }
-    }
-  });
-
-  var options = document.querySelector('#options');
-
-  eventie.bind( options, 'click', function( event ) {
-    if ( !matchesSelector( event.target, 'button' ) ) {
-      return;
-    }
-
-    // var opt = {};
-    var key = event.target.parentNode.getAttribute('data-isotope-key');
-    var value = event.target.getAttribute('data-isotope-value');
 
-    if ( key === 'filter' && value === 'number-greater-than-50' ) {
-      value = function( elem ) {
-        var numberText = getText( elem.querySelector('.number') );
-        return parseInt( numberText, 10 ) > 40;
-      };
+var container = document.querySelector('#container');
+var iso = window.iso = new Isotope( container, {
+  layoutMode: 'fitRows',
+  transitionDuration: '0.8s',
+  cellsByRow: {
+    columnWidth: 130,
+    rowHeight: 140,
+  },
+  getSortData: {
+    number: '.number parseInt',
+    symbol: '.symbol',
+    name: '.name',
+    category: '[data-category]',
+    weight: function( itemElem ) {
+      // remove parenthesis
+      return parseFloat( getText( itemElem.querySelector('.weight') ).replace( /[\(\)]/g, '') );
     }
-    // console.log( key, value );
-    iso.options[ key ] = value;
-    iso.arrange();
-  });
-
-  // iso.on( 'hideComplete', function( items ) {
-  //   console.log( 'hideComplete', items );
-  // })
+  }
+});
 
-  // iso.on( 'revealComplete', function( items ) {
-  //   console.log( 'revealComplete', items );
-  // })
+var options = document.querySelector('#options');
+
+options.addEventListener( 'click', function( event ) {
+  if ( !matchesSelector( event.target, 'button' ) ) {
+    return;
+  }
+
+  // var opt = {};
+  var key = event.target.parentNode.getAttribute('data-isotope-key');
+  var value = event.target.getAttribute('data-isotope-value');
+
+  if ( key === 'filter' && value === 'number-greater-than-50' ) {
+    value = function( elem ) {
+      var numberText = elem.querySelector('.number').textContent;
+      return parseInt( numberText, 10 ) > 40;
+    };
+  }
+  // console.log( key, value );
+  iso.options[ key ] = value;
+  iso.arrange();
+});
 
-  // iso.on( 'arrangeComplete', function( items ) {
-  //   console.log( 'arrangeComplete', items.length );
-  // });
+// iso.on( 'hideComplete', function( items ) {
+//   console.log( 'hideComplete', items );
+// })
 
-});
+// iso.on( 'revealComplete', function( items ) {
+//   console.log( 'revealComplete', items );
+// })
 
-function getText( elem ) {
-  return elem.textContent || elem.innerText;
-}
+// iso.on( 'arrangeComplete', function( items ) {
+//   console.log( 'arrangeComplete', items.length );
+// });
 
 </script>
 

sandbox/fitrows.html

@@ -89,13 +89,9 @@
     <div class="item"></div>
   </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -106,30 +102,29 @@
 <script src="../js/layout-modes/fit-rows.js"></script>
 
 <script>
-docReady( function() {
-  var container = document.querySelector('#basic');
-  var iso = window.iso = new Isotope( container, {
-    layoutMode: 'fitRows'
-  });
-
-  // gutter with explicit value
-  new Isotope( '#gutter1', {
-    layoutMode: 'fitRows',
-    fitRows: {
-      gutter: 20
-    }
-  });
-
-  // gutter with element sizing
-  new Isotope( '#gutter2', {
-    itemSelector: '.item',
-    layoutMode: 'fitRows',
-    fitRows: {
-      gutter: '.gutter-sizer'
-    }
-  });
 
+var container = document.querySelector('#basic');
+var iso = window.iso = new Isotope( container, {
+  layoutMode: 'fitRows'
 });
+
+// gutter with explicit value
+new Isotope( '#gutter1', {
+  layoutMode: 'fitRows',
+  fitRows: {
+    gutter: 20
+  }
+});
+
+// gutter with element sizing
+new Isotope( '#gutter2', {
+  itemSelector: '.item',
+  layoutMode: 'fitRows',
+  fitRows: {
+    gutter: '.gutter-sizer'
+  }
+});
+
 </script>
 
 </body>

sandbox/fluid.html

@@ -54,13 +54,9 @@
     <div class="item"></div>
   </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -73,14 +69,12 @@
 <script src="../js/layout-modes/masonry.js"></script>
 
 <script>
-docReady( function() {
-  var iso = window.iso = new Isotope( '.container', {
-    itemSelector: '.item',
-    percentPosition: true,
-    masonry: {
-      columnWidth: '.grid-sizer'
-    }
-  });
+var iso = new Isotope( '.container', {
+  itemSelector: '.item',
+  percentPosition: true,
+  masonry: {
+    columnWidth: '.grid-sizer'
+  }
 });
 </script>
 

sandbox/horizontal-layout-modes.html

@@ -147,13 +147,10 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>

sandbox/insert.html

@@ -30,13 +30,9 @@
   <div class="item"><b>55</b></div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -50,68 +46,54 @@
 
 <script>
 
-docReady( function() {
-
-  var container = document.querySelector('#container');
-  var iso = new Isotope( container, {
-    layoutMode: 'masonry',
-    transitionDuration: '0.8s',
-    getSortData: {
-      b: 'b parseInt'
-    },
-    sortBy: 'b',
-    // filter b greater than 40
-    filter: function( elem ) {
-      return parseInt( getText( elem.querySelector('b') ), 10 ) > 40
-    }
-  });
-
-  eventie.bind( document.querySelector('#prepend'), 'click', function() {
-    // prepend 3 new items
-    iso.prepended( [ prependItem(), prependItem(), prependItem() ] );
-  });
-
-  eventie.bind( document.querySelector('#insert'), 'click', function() {
-    // insert 3 new items
-    iso.insert( [ getItem(), getItem(), getItem() ] );
-  });
-
-  eventie.bind( document.querySelector('#append'), 'click', function() {
-    // append 3 new items
-    iso.appended( [ appendItem(), appendItem(), appendItem() ] );
-  });
-
-  function getItem() {
-    var item = document.createElement('div');
-    item.className = 'item';
-    var num = Math.floor( Math.random() * 100 );
-    item.innerHTML = '<b>' + num + '</b>';
-    return item;
-  }
-
-  function prependItem() {
-    var item = getItem();
-    container.insertBefore( item, container.firstChild );
-    return item;
+var container = document.querySelector('#container');
+var iso = new Isotope( container, {
+  layoutMode: 'masonry',
+  transitionDuration: '0.8s',
+  getSortData: {
+    b: 'b parseInt'
+  },
+  sortBy: 'b',
+  // filter b greater than 40
+  filter: function( elem ) {
+    return parseInt( elem.querySelector('b').textContent, 10 ) > 40
   }
+});
 
-  function appendItem() {
-    var item = getItem();
-    container.appendChild( item );
-    return item;
-  }
+document.querySelector('#prepend').addEventListener( 'click', function() {
+  // prepend 3 new items
+  iso.prepended( [ prependItem(), prependItem(), prependItem() ] );
+});
 
+document.querySelector('#insert').addEventListener( 'click', function() {
+  // insert 3 new items
+  iso.insert( [ getItem(), getItem(), getItem() ] );
 });
 
-var docElem = document.documentElement;
+document.querySelector('#append').addEventListener( 'click', function() {
+  // append 3 new items
+  iso.appended( [ appendItem(), appendItem(), appendItem() ] );
+});
 
-var getText = docElem.textContent ?
-  function( elem ) {
-    return elem.textContent;
-  } :
-  function( elem ) {
-    return elem.innerText;
-  };
+function getItem() {
+  var item = document.createElement('div');
+  item.className = 'item';
+  var num = Math.floor( Math.random() * 100 );
+  item.innerHTML = '<b>' + num + '</b>';
+  return item;
+}
+
+function prependItem() {
+  var item = getItem();
+  container.insertBefore( item, container.firstChild );
+  return item;
+}
+
+function appendItem() {
+  var item = getItem();
+  container.appendChild( item );
+  return item;
+}
 
 </script>
 

sandbox/jquery.html

@@ -143,15 +143,12 @@
 </div>
 
 <script src="../bower_components/jquery/dist/jquery.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>

sandbox/js/require-js.js

@@ -43,7 +43,7 @@ requirejs.config({
 requirejs( [
     'jquery',
     'isotope/js/isotope',
-    'jquery-bridget/jquery.bridget'
+    'jquery-bridget/jquery-bridget'
   ],
   function( $, Isotope ) {
     $.bridget( 'isotope', Isotope );
@@ -68,7 +68,7 @@ requirejs.config({
 requirejs( [ 'require', 'jquery', '../dist/isotope.pkgd.js' ],
   function( require, $, Isotope ) {
     require( [
-      'jquery-bridget/jquery.bridget'
+      'jquery-bridget/jquery-bridget'
     ],
     function() {
       $.bridget( 'isotope', Isotope );

sandbox/masonry-horizontal.html

@@ -176,13 +176,10 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>

sandbox/masonry.html

@@ -145,13 +145,9 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -164,47 +160,40 @@
 <script src="../js/layout-modes/fit-rows.js"></script>
 
 <script>
-docReady( function() {
-  var container = document.querySelector('#container');
-  var iso = window.iso = new Isotope( container, {
-    // sortBy: 'symbol',
-    // filter: '.metal',
-    layoutMode: 'masonry',
-    masonry: {
-      columnWidth: 90
-    },
-    itemSelector: '.element',
-    stamp: '.stamp',
-    getSortData: {
-
-      number: '.number parseInt',
-      symbol: '.symbol',
-      name: '.name',
-      category: '[data-category]',
-
-      weight: function( itemElem ) {
-        // remove parenthesis
-        return parseFloat( getText( itemElem.querySelector('.weight') ).replace( /[\(\)]/g, '') );
-      }
 
+var container = document.querySelector('#container');
+var iso = window.iso = new Isotope( container, {
+  // sortBy: 'symbol',
+  // filter: '.metal',
+  layoutMode: 'masonry',
+  masonry: {
+    columnWidth: 90
+  },
+  itemSelector: '.element',
+  stamp: '.stamp',
+  getSortData: {
+
+    number: '.number parseInt',
+    symbol: '.symbol',
+    name: '.name',
+    category: '[data-category]',
+
+    weight: function( itemElem ) {
+      // remove parenthesis
+      var weight = itemElem.querySelector('.weight').textContent;
+      return parseFloat( weight.replace( /[\(\)]/g, '') );
     }
-  });
-
-  var options = document.querySelector('#options');
-
-  eventie.bind( options, 'click', function( event ) {
-    if ( !matchesSelector( event.target, 'button' ) ) {
-      return;
-    }
-    var sortBy = event.target.getAttribute('data-sort-by');
-    iso.arrange({ sortBy: sortBy });
-  });
-
+  }
 });
 
-function getText( elem ) {
-  return elem.textContent || elem.innerText;
-}
+var options = document.querySelector('#options');
+options.addEventListener( 'click', function( event ) {
+  if ( !matchesSelector( event.target, 'button' ) ) {
+    return;
+  }
+  var sortBy = event.target.getAttribute('data-sort-by');
+  iso.arrange({ sortBy: sortBy });
+});
 
 </script>
 

sandbox/right-to-left.html

@@ -79,13 +79,9 @@
     <div class="item"></div>
   </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -97,31 +93,29 @@
 <script src="../js/layout-modes/masonry.js"></script>
 
 <script>
-docReady( function() {
-  ( function() {
-    var container = document.querySelector('#basic');
-    var iso = new Isotope( container, {
-      isOriginLeft: false,
-      masonry: {
-        columnWidth: 60
-      }
-    });
-  })();
 
-  ( function() {
-    var container = document.querySelector('#stamped');
-    var msnry = new Isotope( container, {
-      itemSelector: '.item',
-      isOriginLeft: false,
-      gutter: 10,
-      stamp: '.stamp',
-      masonry: {
-        columnWidth: 60,
-      }
-    });
-  })();
+( function() {
+  var container = document.querySelector('#basic');
+  var iso = new Isotope( container, {
+    isOriginLeft: false,
+    masonry: {
+      columnWidth: 60
+    }
+  });
+})();
 
-});
+( function() {
+  var container = document.querySelector('#stamped');
+  var msnry = new Isotope( container, {
+    itemSelector: '.item',
+    isOriginLeft: false,
+    gutter: 10,
+    stamp: '.stamp',
+    masonry: {
+      columnWidth: 60,
+    }
+  });
+})();
 </script>
 
 </body>

sandbox/sorting.html

@@ -132,13 +132,10 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -149,63 +146,53 @@
 <script src="../js/layout-modes/fit-rows.js"></script>
 
 <script>
-docReady( function() {
-  var container = document.querySelector('#container');
-  var iso = window.iso = new Isotope( container, {
-    layoutMode: 'fitRows',
-    getSortData: {
-      // number: function( itemElem ) {
-      //   return parseInt( getText( itemElem.querySelector('.number') ), 10 );
-      // },
-      // symbol: function( itemElem ) {
-      //   return getText( itemElem.querySelector('.symbol') );
-      // },
-      // name: function( itemElem ) {
-      //   return getText( itemElem.querySelector('.name') );
-      // },
-      // category: function( itemElem ) {
-      //   return itemElem.getAttribute('data-category');
-      // },
-
-      number: '.number parseInt',
-      symbol: '.symbol',
-      name: '.name',
-      category: '[data-category]',
-
-      weight: function( itemElem ) {
-        // remove parenthesis
-        return parseFloat( getText( itemElem.querySelector('.weight') ).replace( /[\(\)]/g, '') );
-      }
-
 
+var container = document.querySelector('#container');
+var iso = window.iso = new Isotope( container, {
+  layoutMode: 'fitRows',
+  getSortData: {
+    // number: function( itemElem ) {
+    //   return parseInt( getText( itemElem.querySelector('.number') ), 10 );
+    // },
+    // symbol: function( itemElem ) {
+    //   return getText( itemElem.querySelector('.symbol') );
+    // },
+    // name: function( itemElem ) {
+    //   return getText( itemElem.querySelector('.name') );
+    // },
+    // category: function( itemElem ) {
+    //   return itemElem.getAttribute('data-category');
+    // },
+
+    number: '.number parseInt',
+    symbol: '.symbol',
+    name: '.name',
+    category: '[data-category]',
+
+    weight: function( itemElem ) {
+      // remove parenthesis
+      var weight = itemElem.querySelector('.weight').textContent;
+      return parseFloat( weight.replace( /[\(\)]/g, '') );
     }
-  });
-
-  var options = document.querySelector('#options');
+  }
+});
 
-  eventie.bind( options, 'click', function( event ) {
-    if ( !matchesSelector( event.target, 'a' ) ) {
-      return;
-    }
+var options = document.querySelector('#options');
 
-    // use link's href, remove leading hash
-    var sortBy = event.target.getAttribute('href').slice( 1 );
-    sortBy.slice( 0, 1 );
-    iso.options.sortBy = sortBy;
-    iso.arrange();
-    event.preventDefault();
-  });
+options.addEventListener( 'click', function( event ) {
+  if ( !matchesSelector( event.target, 'a' ) ) {
+    return;
+  }
 
+  // use link's href, remove leading hash
+  var sortBy = event.target.getAttribute('href').slice( 1 );
+  sortBy.slice( 0, 1 );
+  iso.options.sortBy = sortBy;
+  iso.arrange();
+  event.preventDefault();
 });
 
-function getText( elem ) {
-  return elem.textContent || elem.innerText;
-}
-
 </script>
 
 </body>
 </html>
-
-
-

sandbox/stamps.html

@@ -83,12 +83,9 @@
     <div class="item"></div>
   </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -100,33 +97,24 @@
 <script src="../js/layout-modes/masonry.js"></script>
 
 <script>
-docReady( function() {
-  ( function() {
-    var container = document.querySelector('#alpha');
-    var iso = new Isotope( container, {
-      itemSelector: '.item',
-      stamp: '.stamp',
-      masonry: {
-        columnWidth: 60,
-        gutter: 10
-      }
-    });
-
-  })();
-
-  ( function() {
-    var container = document.querySelector('#beta');
-    var iso = new Isotope( container, {
-      stamp: '.stamp',
-      masonry: {
-        columnWidth: 60,
-        gutter: 10
-      }
-    });
-
-  })();
 
+var alphaIso = new Isotope( '#alpha', {
+  itemSelector: '.item',
+  stamp: '.stamp',
+  masonry: {
+    columnWidth: 60,
+    gutter: 10
+  }
 });
+
+var betaIso = new Isotope( '#beta', {
+  stamp: '.stamp',
+  masonry: {
+    columnWidth: 60,
+    gutter: 10
+  }
+});
+
 </script>
 
 </body>

sandbox/transition-bug.html

@@ -35,13 +35,10 @@
   </div>
 </div>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
@@ -53,7 +50,7 @@
 <script src="../js/layout-modes/vertical.js"></script>
 
 <script>
-docReady( function() {
+
   var container = document.querySelector('#container');
   var iso = window.iso = new Isotope( container, {
     layoutMode: 'fitRows',
@@ -63,7 +60,7 @@ docReady( function() {
   var item = iso.items[0];
 
   var bugButton = document.querySelector('#bug-me');
-  eventie.bind( bugButton, 'click', function() {
+  bugButton.addEventListener( 'click', function() {
     item.reveal();
     item.moveTo( 200, 100 );
     setTimeout( function() {
@@ -71,12 +68,6 @@ docReady( function() {
     }, 1500 );
   });
 
-});
-
-function getText( elem ) {
-  return elem.textContent || elem.innerText;
-}
-
 </script>
 
 </body>

test/filtering.js

@@ -47,7 +47,7 @@ test( 'filtering', function() {
 
   iso.arrange({
     filter: function( elem ) {
-      var num = parseInt( getText( elem ), 10 );
+      var num = parseInt( elem.textContent, 10 );
       return num > 5;
     }
   });

test/helpers.js

@@ -5,15 +5,4 @@
 // ----- default layout mode ----- //
 Isotope.defaults.layoutMode = 'fitRows';
 
-// ----- getText ----- //
-var docElem = document.documentElement;
-
-window.getText = docElem.textContent ?
-  function( elem ) {
-    return elem.textContent;
-  } :
-  function( elem ) {
-    return elem.innerText;
-  };
-
 })();

test/index.html

@@ -12,13 +12,10 @@
 
 <script src="../bower_components/jquery/dist/jquery.js"></script>
 
-<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
-<script src="../bower_components/eventie/eventie.js"></script>
-<script src="../bower_components/doc-ready/doc-ready.js"></script>
-<script src="../bower_components/get-style-property/get-style-property.js"></script>
+<script src="../bower_components/ev-emitter/ev-emitter.js"></script>
 <script src="../bower_components/get-size/get-size.js"></script>
-<script src="../bower_components/jquery-bridget/jquery.bridget.js"></script>
-<script src="../bower_components/matches-selector/matches-selector.js"></script>
+<script src="../bower_components/jquery-bridget/jquery-bridget.js"></script>
+<script src="../bower_components/desandro-matches-selector/matches-selector.js"></script>
 <script src="../bower_components/fizzy-ui-utils/utils.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>

test/sorting.js

@@ -3,11 +3,9 @@
 'use strict';
 
 function getItemsText( iso ) {
-  var texts = [];
-  for ( var i=0, len = iso.filteredItems.length; i < len; i++ ) {
-    var item = iso.filteredItems[i];
-    texts.push( getText( item.element ) );
-  }
+  var texts = iso.filteredItems.map( function( item ) {
+    return item.element.textContent;
+  })
   return texts.join(',');
 }