Browse Source

⬆️ upgrade dependencies to remove IE8 versions

pull/1127/head
David DeSandro 9 years ago
parent
commit
adf436b09e
  1. 2
      Gruntfile.js
  2. 21
      bower.json
  3. 6
      js/isotope.js
  4. 2
      package.json
  5. 10
      sandbox/basic.html
  6. 12
      sandbox/bottom-up.html
  7. 9
      sandbox/cells-by-row.html
  8. 9
      sandbox/combination-filters-inclusive.html
  9. 14
      sandbox/combination-filters.html
  10. 20
      sandbox/filter-sort.html
  11. 11
      sandbox/fitrows.html
  12. 12
      sandbox/fluid.html
  13. 9
      sandbox/horizontal-layout-modes.html
  14. 30
      sandbox/insert.html
  15. 11
      sandbox/jquery.html
  16. 4
      sandbox/js/require-js.js
  17. 9
      sandbox/masonry-horizontal.html
  18. 23
      sandbox/masonry.html
  19. 12
      sandbox/right-to-left.html
  20. 27
      sandbox/sorting.html
  21. 22
      sandbox/stamps.html
  22. 19
      sandbox/transition-bug.html
  23. 2
      test/filtering.js
  24. 11
      test/helpers.js
  25. 9
      test/index.html
  26. 8
      test/sorting.js

2
Gruntfile.js

@ -29,7 +29,7 @@ module.exports = function( grunt ) {
options: { options: {
baseUrl: 'bower_components', baseUrl: 'bower_components',
include: [ include: [
'jquery-bridget/jquery.bridget', 'jquery-bridget/jquery-bridget',
'isotope/js/isotope' 'isotope/js/isotope'
], ],
out: 'dist/isotope.pkgd.js', out: 'dist/isotope.pkgd.js',

21
bower.json

@ -1,24 +1,17 @@
{ {
"name": "isotope", "name": "isotope",
"version": "2.2.2",
"description": "Filter and sort magical layouts", "description": "Filter and sort magical layouts",
"main": "js/isotope.js", "main": "js/isotope.js",
"dependencies": { "dependencies": {
"get-size": "~1.2.2", "get-size": "~2.0.0",
"matches-selector": "~1.0.2", "desandro-matches-selector": "~2.0.0",
"outlayer": "~1.4.1", "outlayer": "~2.0.0",
"masonry": "~3.3.0", "masonry": "~4.0.0",
"fizzy-ui-utils": "~1.0.1" "fizzy-ui-utils": "~2.0.0"
}, },
"devDependencies": { "devDependencies": {
"doc-ready": "1.x", "jquery": "2 < 4",
"isotope-cells-by-column": "1.x", "jquery-bridget": "^2",
"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",
"qunit": "^1.15" "qunit": "^1.15"
}, },
"ignore": [ "ignore": [

6
js/isotope.js

@ -1,11 +1,11 @@
/*! /*!
* Isotope v2.2.2 * Isotope v3.0.0-beta1
* *
* Licensed GPLv3 for open source use * Licensed GPLv3 for open source use
* or Isotope Commercial License for commercial use * or Isotope Commercial License for commercial use
* *
* http://isotope.metafizzy.co * http://isotope.metafizzy.co
* Copyright 2015 Metafizzy * Copyright 2016 Metafizzy
*/ */
( function( window, factory ) { ( function( window, factory ) {
@ -17,7 +17,7 @@
define( [ define( [
'outlayer/outlayer', 'outlayer/outlayer',
'get-size/get-size', 'get-size/get-size',
'matches-selector/matches-selector', 'desandro-matches-selector/matches-selector',
'fizzy-ui-utils/utils', 'fizzy-ui-utils/utils',
'./item', './item',
'./layout-mode', './layout-mode',

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "isotope-layout", "name": "isotope-layout",
"version": "2.2.2", "version": "3.0.0-beta1",
"description": "Filter and sort magical layouts", "description": "Filter and sort magical layouts",
"main": "js/isotope.js", "main": "js/isotope.js",
"dependencies": { "dependencies": {

10
sandbox/basic.html

@ -36,13 +36,9 @@
<div class="item"></div> <div class="item"></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -53,12 +49,10 @@
<script src="../js/layout-modes/fit-rows.js"></script> <script src="../js/layout-modes/fit-rows.js"></script>
<script> <script>
docReady( function() {
var container = document.querySelector('#basic'); var container = document.querySelector('#basic');
var iso = window.iso = new Isotope( container, { var iso = window.iso = new Isotope( container, {
layoutMode: 'fitRows' layoutMode: 'fitRows'
}); });
});
</script> </script>
</body> </body>

12
sandbox/bottom-up.html

@ -78,14 +78,9 @@
<div class="item"></div> <div class="item"></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -98,7 +93,6 @@
<script src="../js/layout-modes/fit-rows.js"></script> <script src="../js/layout-modes/fit-rows.js"></script>
<script> <script>
docReady( function() {
( function() { ( function() {
var container = document.querySelector('#basic'); var container = document.querySelector('#basic');
var iso = new Isotope( container, { var iso = new Isotope( container, {
@ -121,8 +115,6 @@ docReady( function() {
stamp: '.stamp' stamp: '.stamp'
}); });
})(); })();
});
</script> </script>
</body> </body>

9
sandbox/cells-by-row.html

@ -144,13 +144,10 @@
</div> </div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>

9
sandbox/combination-filters-inclusive.html

@ -198,13 +198,10 @@
<script src="../bower_components/jquery/dist/jquery.js"></script> <script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>

14
sandbox/combination-filters.html

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

20
sandbox/filter-sort.html

@ -141,13 +141,9 @@
</div> </div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -161,7 +157,7 @@
<script src="../bower_components/isotope-cells-by-row/cells-by-row.js"></script> <script src="../bower_components/isotope-cells-by-row/cells-by-row.js"></script>
<script> <script>
docReady( function() {
var container = document.querySelector('#container'); var container = document.querySelector('#container');
var iso = window.iso = new Isotope( container, { var iso = window.iso = new Isotope( container, {
layoutMode: 'fitRows', layoutMode: 'fitRows',
@ -184,7 +180,7 @@ docReady( function() {
var options = document.querySelector('#options'); var options = document.querySelector('#options');
eventie.bind( options, 'click', function( event ) { options.addEventListener( 'click', function( event ) {
if ( !matchesSelector( event.target, 'button' ) ) { if ( !matchesSelector( event.target, 'button' ) ) {
return; return;
} }
@ -195,7 +191,7 @@ docReady( function() {
if ( key === 'filter' && value === 'number-greater-than-50' ) { if ( key === 'filter' && value === 'number-greater-than-50' ) {
value = function( elem ) { value = function( elem ) {
var numberText = getText( elem.querySelector('.number') ); var numberText = elem.querySelector('.number').textContent;
return parseInt( numberText, 10 ) > 40; return parseInt( numberText, 10 ) > 40;
}; };
} }
@ -216,12 +212,6 @@ docReady( function() {
// console.log( 'arrangeComplete', items.length ); // console.log( 'arrangeComplete', items.length );
// }); // });
});
function getText( elem ) {
return elem.textContent || elem.innerText;
}
</script> </script>
</body> </body>

11
sandbox/fitrows.html

@ -89,13 +89,9 @@
<div class="item"></div> <div class="item"></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -106,7 +102,7 @@
<script src="../js/layout-modes/fit-rows.js"></script> <script src="../js/layout-modes/fit-rows.js"></script>
<script> <script>
docReady( function() {
var container = document.querySelector('#basic'); var container = document.querySelector('#basic');
var iso = window.iso = new Isotope( container, { var iso = window.iso = new Isotope( container, {
layoutMode: 'fitRows' layoutMode: 'fitRows'
@ -129,7 +125,6 @@ docReady( function() {
} }
}); });
});
</script> </script>
</body> </body>

12
sandbox/fluid.html

@ -54,13 +54,9 @@
<div class="item"></div> <div class="item"></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -73,15 +69,13 @@
<script src="../js/layout-modes/masonry.js"></script> <script src="../js/layout-modes/masonry.js"></script>
<script> <script>
docReady( function() { var iso = new Isotope( '.container', {
var iso = window.iso = new Isotope( '.container', {
itemSelector: '.item', itemSelector: '.item',
percentPosition: true, percentPosition: true,
masonry: { masonry: {
columnWidth: '.grid-sizer' columnWidth: '.grid-sizer'
} }
}); });
});
</script> </script>
</body> </body>

9
sandbox/horizontal-layout-modes.html

@ -147,13 +147,10 @@
</div> </div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>

30
sandbox/insert.html

@ -30,13 +30,9 @@
<div class="item"><b>55</b></div> <div class="item"><b>55</b></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -50,8 +46,6 @@
<script> <script>
docReady( function() {
var container = document.querySelector('#container'); var container = document.querySelector('#container');
var iso = new Isotope( container, { var iso = new Isotope( container, {
layoutMode: 'masonry', layoutMode: 'masonry',
@ -62,21 +56,21 @@ docReady( function() {
sortBy: 'b', sortBy: 'b',
// filter b greater than 40 // filter b greater than 40
filter: function( elem ) { filter: function( elem ) {
return parseInt( getText( elem.querySelector('b') ), 10 ) > 40 return parseInt( elem.querySelector('b').textContent, 10 ) > 40
} }
}); });
eventie.bind( document.querySelector('#prepend'), 'click', function() { document.querySelector('#prepend').addEventListener( 'click', function() {
// prepend 3 new items // prepend 3 new items
iso.prepended( [ prependItem(), prependItem(), prependItem() ] ); iso.prepended( [ prependItem(), prependItem(), prependItem() ] );
}); });
eventie.bind( document.querySelector('#insert'), 'click', function() { document.querySelector('#insert').addEventListener( 'click', function() {
// insert 3 new items // insert 3 new items
iso.insert( [ getItem(), getItem(), getItem() ] ); iso.insert( [ getItem(), getItem(), getItem() ] );
}); });
eventie.bind( document.querySelector('#append'), 'click', function() { document.querySelector('#append').addEventListener( 'click', function() {
// append 3 new items // append 3 new items
iso.appended( [ appendItem(), appendItem(), appendItem() ] ); iso.appended( [ appendItem(), appendItem(), appendItem() ] );
}); });
@ -101,18 +95,6 @@ docReady( function() {
return item; return item;
} }
});
var docElem = document.documentElement;
var getText = docElem.textContent ?
function( elem ) {
return elem.textContent;
} :
function( elem ) {
return elem.innerText;
};
</script> </script>
</body> </body>

11
sandbox/jquery.html

@ -143,15 +143,12 @@
</div> </div>
<script src="../bower_components/jquery/dist/jquery.js"></script> <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/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>

4
sandbox/js/require-js.js

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

9
sandbox/masonry-horizontal.html

@ -176,13 +176,10 @@
</div> </div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>

23
sandbox/masonry.html

@ -145,13 +145,9 @@
</div> </div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -164,7 +160,7 @@
<script src="../js/layout-modes/fit-rows.js"></script> <script src="../js/layout-modes/fit-rows.js"></script>
<script> <script>
docReady( function() {
var container = document.querySelector('#container'); var container = document.querySelector('#container');
var iso = window.iso = new Isotope( container, { var iso = window.iso = new Isotope( container, {
// sortBy: 'symbol', // sortBy: 'symbol',
@ -184,15 +180,14 @@ docReady( function() {
weight: function( itemElem ) { weight: function( itemElem ) {
// remove parenthesis // remove parenthesis
return parseFloat( getText( itemElem.querySelector('.weight') ).replace( /[\(\)]/g, '') ); var weight = itemElem.querySelector('.weight').textContent;
return parseFloat( weight.replace( /[\(\)]/g, '') );
} }
} }
}); });
var options = document.querySelector('#options'); var options = document.querySelector('#options');
options.addEventListener( 'click', function( event ) {
eventie.bind( options, 'click', function( event ) {
if ( !matchesSelector( event.target, 'button' ) ) { if ( !matchesSelector( event.target, 'button' ) ) {
return; return;
} }
@ -200,12 +195,6 @@ docReady( function() {
iso.arrange({ sortBy: sortBy }); iso.arrange({ sortBy: sortBy });
}); });
});
function getText( elem ) {
return elem.textContent || elem.innerText;
}
</script> </script>
</body> </body>

12
sandbox/right-to-left.html

@ -79,13 +79,9 @@
<div class="item"></div> <div class="item"></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/desandro-matches-selector/matches-selector.js"></script>
<script src="../bower_components/matches-selector/matches-selector.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -97,7 +93,7 @@
<script src="../js/layout-modes/masonry.js"></script> <script src="../js/layout-modes/masonry.js"></script>
<script> <script>
docReady( function() {
( function() { ( function() {
var container = document.querySelector('#basic'); var container = document.querySelector('#basic');
var iso = new Isotope( container, { var iso = new Isotope( container, {
@ -120,8 +116,6 @@ docReady( function() {
} }
}); });
})(); })();
});
</script> </script>
</body> </body>

27
sandbox/sorting.html

@ -132,13 +132,10 @@
</div> </div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -149,7 +146,7 @@
<script src="../js/layout-modes/fit-rows.js"></script> <script src="../js/layout-modes/fit-rows.js"></script>
<script> <script>
docReady( function() {
var container = document.querySelector('#container'); var container = document.querySelector('#container');
var iso = window.iso = new Isotope( container, { var iso = window.iso = new Isotope( container, {
layoutMode: 'fitRows', layoutMode: 'fitRows',
@ -174,16 +171,15 @@ docReady( function() {
weight: function( itemElem ) { weight: function( itemElem ) {
// remove parenthesis // remove parenthesis
return parseFloat( getText( itemElem.querySelector('.weight') ).replace( /[\(\)]/g, '') ); var weight = itemElem.querySelector('.weight').textContent;
return parseFloat( weight.replace( /[\(\)]/g, '') );
} }
} }
}); });
var options = document.querySelector('#options'); var options = document.querySelector('#options');
eventie.bind( options, 'click', function( event ) { options.addEventListener( 'click', function( event ) {
if ( !matchesSelector( event.target, 'a' ) ) { if ( !matchesSelector( event.target, 'a' ) ) {
return; return;
} }
@ -196,16 +192,7 @@ docReady( function() {
event.preventDefault(); event.preventDefault();
}); });
});
function getText( elem ) {
return elem.textContent || elem.innerText;
}
</script> </script>
</body> </body>
</html> </html>

22
sandbox/stamps.html

@ -83,12 +83,9 @@
<div class="item"></div> <div class="item"></div>
</div> </div>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>
@ -100,10 +97,8 @@
<script src="../js/layout-modes/masonry.js"></script> <script src="../js/layout-modes/masonry.js"></script>
<script> <script>
docReady( function() {
( function() { var alphaIso = new Isotope( '#alpha', {
var container = document.querySelector('#alpha');
var iso = new Isotope( container, {
itemSelector: '.item', itemSelector: '.item',
stamp: '.stamp', stamp: '.stamp',
masonry: { masonry: {
@ -112,11 +107,7 @@ docReady( function() {
} }
}); });
})(); var betaIso = new Isotope( '#beta', {
( function() {
var container = document.querySelector('#beta');
var iso = new Isotope( container, {
stamp: '.stamp', stamp: '.stamp',
masonry: { masonry: {
columnWidth: 60, columnWidth: 60,
@ -124,9 +115,6 @@ docReady( function() {
} }
}); });
})();
});
</script> </script>
</body> </body>

19
sandbox/transition-bug.html

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

2
test/filtering.js

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

11
test/helpers.js

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

9
test/index.html

@ -12,13 +12,10 @@
<script src="../bower_components/jquery/dist/jquery.js"></script> <script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script> <script src="../bower_components/ev-emitter/ev-emitter.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/get-size/get-size.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/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/fizzy-ui-utils/utils.js"></script>
<script src="../bower_components/outlayer/item.js"></script> <script src="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script> <script src="../bower_components/outlayer/outlayer.js"></script>

8
test/sorting.js

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

Loading…
Cancel
Save