Skip to content

Commit 82750a1

Browse files
committed
⬆️ build v2.0.0
📦 refresh .jsons 📝 "Gapless draggable grid layouts" description
1 parent 3027fee commit 82750a1

File tree

5 files changed

+69
-56
lines changed

5 files changed

+69
-56
lines changed

bower.json

+24-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,43 @@
11
{
22
"name": "packery",
33
"author": "David DeSandro",
4-
"description": "Gapless, draggable layout library",
4+
"description": "Gapless, draggable grid layouts",
55
"main": "js/packery.js",
66
"dependencies": {
77
"get-size": "~2.0.2",
88
"outlayer": "~2.0.0"
99
},
1010
"devDependencies": {
11-
"draggabilly": ">=2.1.0 <3",
11+
"draggabilly": "^2.1.0",
1212
"jquery": ">=2 <4",
1313
"jquery-ui-draggable": "https://gist.github.com/4985610.git",
1414
"jquery-bridget": "~2.0.0",
1515
"qunit": "^1.15"
1616
},
1717
"ignore": [
1818
"**/.*",
19-
"test/",
20-
"examples/",
2119
"contributing.md",
2220
"package.json",
23-
"Gruntfile.js",
24-
"sandbox/"
25-
]
21+
"gulpfile.js",
22+
"sandbox/",
23+
"node_modules",
24+
"bower_components",
25+
"test",
26+
"tests"
27+
],
28+
"homepage": "http://packery.metafizzy.co",
29+
"authors": [
30+
"David DeSandro <[email protected]>"
31+
],
32+
"moduleType": [
33+
"amd",
34+
"globals",
35+
"node"
36+
],
37+
"keywords": [
38+
"layout",
39+
"grid",
40+
"draggable"
41+
],
42+
"license": "GPL-3.0"
2643
}

dist/packery.pkgd.js

+32-38
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* Packery PACKAGED v2.0.0-beta1
3-
* bin-packing layout library
2+
* Packery PACKAGED v2.0.0
3+
* Gapless, draggable grid layouts
44
*
55
* Licensed GPLv3 for open source use
66
* or Packery Commercial License for commercial use
@@ -365,7 +365,7 @@ return getSize;
365365
});
366366

367367
/**
368-
* EvEmitter v1.0.1
368+
* EvEmitter v1.0.2
369369
* Lil' event emitter
370370
* MIT License
371371
*/
@@ -419,8 +419,8 @@ proto.once = function( eventName, listener ) {
419419
// set once flag
420420
// set onceEvents hash
421421
var onceEvents = this._onceEvents = this._onceEvents || {};
422-
// set onceListeners array
423-
var onceListeners = onceEvents[ eventName ] = onceEvents[ eventName ] || [];
422+
// set onceListeners object
423+
var onceListeners = onceEvents[ eventName ] = onceEvents[ eventName ] || {};
424424
// set flag
425425
onceListeners[ listener ] = true;
426426

@@ -488,7 +488,7 @@ return EvEmitter;
488488
// universal module definition
489489
if ( typeof define == 'function' && define.amd ) {
490490
// AMD
491-
define( 'matches-selector/matches-selector',factory );
491+
define( 'desandro-matches-selector/matches-selector',factory );
492492
} else if ( typeof module == 'object' && module.exports ) {
493493
// CommonJS
494494
module.exports = factory();
@@ -529,21 +529,20 @@ return EvEmitter;
529529
}));
530530

531531
/**
532-
* Fizzy UI utils v2.0.0
532+
* Fizzy UI utils v2.0.1
533533
* MIT license
534534
*/
535535

536536
/*jshint browser: true, undef: true, unused: true, strict: true */
537537

538538
( function( window, factory ) {
539-
/*global define: false, module: false, require: false */
540-
'use strict';
541539
// universal module definition
540+
/*jshint strict: false */ /*globals define, module, require */
542541

543542
if ( typeof define == 'function' && define.amd ) {
544543
// AMD
545544
define( 'fizzy-ui-utils/utils',[
546-
'matches-selector/matches-selector'
545+
'desandro-matches-selector/matches-selector'
547546
], function( matchesSelector ) {
548547
return factory( window, matchesSelector );
549548
});
@@ -778,28 +777,24 @@ return utils;
778777
'ev-emitter/ev-emitter',
779778
'get-size/get-size'
780779
],
781-
function( EvEmitter, getSize ) {
782-
return factory( window, EvEmitter, getSize );
783-
}
780+
factory
784781
);
785782
} else if ( typeof module == 'object' && module.exports ) {
786783
// CommonJS - Browserify, Webpack
787784
module.exports = factory(
788-
window,
789785
require('ev-emitter'),
790786
require('get-size')
791787
);
792788
} else {
793789
// browser global
794790
window.Outlayer = {};
795791
window.Outlayer.Item = factory(
796-
window,
797792
window.EvEmitter,
798793
window.getSize
799794
);
800795
}
801796

802-
}( window, function factory( window, EvEmitter, getSize ) {
797+
}( window, function factory( EvEmitter, getSize ) {
803798
'use strict';
804799

805800
// ----- helpers ----- //
@@ -827,13 +822,13 @@ var transitionEndEvent = {
827822
transition: 'transitionend'
828823
}[ transitionProperty ];
829824

830-
// cache all vendor properties
831-
var vendorProperties = [
832-
transformProperty,
833-
transitionProperty,
834-
transitionProperty + 'Duration',
835-
transitionProperty + 'Property'
836-
];
825+
// cache all vendor properties that could have vendor prefix
826+
var vendorProperties = {
827+
transform: transformProperty,
828+
transition: transitionProperty,
829+
transitionDuration: transitionProperty + 'Duration',
830+
transitionProperty: transitionProperty + 'Property'
831+
};
837832

838833
// -------------------------- Item -------------------------- //
839834

@@ -1047,7 +1042,7 @@ proto._nonTransition = function( args ) {
10471042
* @param {Boolean} isCleaning - removes transition styles after transition
10481043
* @param {Function} onTransitionEnd - callback
10491044
*/
1050-
proto._transition = function( args ) {
1045+
proto.transition = function( args ) {
10511046
// redirect to nonTransition if no transition duration
10521047
if ( !parseFloat( this.layout.options.transitionDuration ) ) {
10531048
this._nonTransition( args );
@@ -1093,8 +1088,7 @@ function toDashedAll( str ) {
10931088
});
10941089
}
10951090

1096-
var transitionProps = 'opacity,' +
1097-
toDashedAll( vendorProperties.transform || 'transform' );
1091+
var transitionProps = 'opacity,' + toDashedAll( transformProperty );
10981092

10991093
proto.enableTransition = function(/* style */) {
11001094
// HACK changing transitionProperty during a transition
@@ -1121,8 +1115,6 @@ proto.enableTransition = function(/* style */) {
11211115
this.element.addEventListener( transitionEndEvent, this, false );
11221116
};
11231117

1124-
proto.transition = Item.prototype[ transitionProperty ? '_transition' : '_nonTransition' ];
1125-
11261118
// ----- events ----- //
11271119

11281120
proto.onwebkitTransitionEnd = function( event ) {
@@ -1314,7 +1306,7 @@ return Item;
13141306
}));
13151307

13161308
/*!
1317-
* Outlayer v2.0.0
1309+
* Outlayer v2.0.1
13181310
* the brains and guts of a layout library
13191311
* MIT license
13201312
*/
@@ -2690,8 +2682,8 @@ return Item;
26902682
}));
26912683

26922684
/*!
2693-
* Packery v2.0.0-beta1
2694-
* bin-packing layout library
2685+
* Packery v2.0.0
2686+
* Gapless, draggable grid layouts
26952687
*
26962688
* Licensed GPLv3 for open source use
26972689
* or Packery Commercial License for commercial use
@@ -3039,8 +3031,8 @@ proto.resize = function() {
30393031
return;
30403032
}
30413033

3042-
if ( this.options.shiftResize ) {
3043-
this.resizeShiftLayout();
3034+
if ( this.options.shiftPercentResize ) {
3035+
this.resizeShiftPercentLayout();
30443036
} else {
30453037
this.layout();
30463038
}
@@ -3056,7 +3048,7 @@ proto.needsResizeLayout = function() {
30563048
return size[ innerSize ] != this.size[ innerSize ];
30573049
};
30583050

3059-
proto.resizeShiftLayout = function() {
3051+
proto.resizeShiftPercentLayout = function() {
30603052
var items = this._getItemsForLayout( this.items );
30613053

30623054
var isHorizontal = this._getOption('horizontal');
@@ -3145,9 +3137,9 @@ proto.updateShiftTargets = function( dropItem ) {
31453137
segment = segment && segment + this.gutter;
31463138

31473139
if ( segment ) {
3148-
var segmentSpan = dropItem.rect[ measure ] / segment;
3140+
var segmentSpan = Math.ceil( dropItem.rect[ measure ] / segment );
31493141
var segs = Math.floor( ( this.shiftPacker[ measure ] + this.gutter ) / segment );
3150-
boundsSize = ( segs - ( segmentSpan - 1 ) ) * segment;
3142+
boundsSize = ( segs - segmentSpan ) * segment;
31513143
// add targets on top
31523144
for ( var i=0; i < segs; i++ ) {
31533145
this._addShiftTarget( i * segment, 0, boundsSize );
@@ -3225,6 +3217,8 @@ function getDistance( a, b ) {
32253217

32263218
// -------------------------- drag move -------------------------- //
32273219

3220+
var DRAG_THROTTLE_TIME = 120;
3221+
32283222
/**
32293223
* handle an item drag move event
32303224
* @param {Element} elem
@@ -3249,9 +3243,9 @@ proto.itemDragMove = function( elem, x, y ) {
32493243

32503244
// throttle
32513245
var now = new Date();
3252-
if ( this._itemDragTime && now - this._itemDragTime < 120 ) {
3246+
if ( this._itemDragTime && now - this._itemDragTime < DRAG_THROTTLE_TIME ) {
32533247
clearTimeout( this.dragTimeout );
3254-
this.dragTimeout = setTimeout( onDrag, 120 );
3248+
this.dragTimeout = setTimeout( onDrag, DRAG_THROTTLE_TIME );
32553249
} else {
32563250
onDrag();
32573251
this._itemDragTime = now;

dist/packery.pkgd.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/packery.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* Packery v2.0.0-beta1
3-
* bin-packing layout library
2+
* Packery v2.0.0
3+
* Gapless, draggable grid layouts
44
*
55
* Licensed GPLv3 for open source use
66
* or Packery Commercial License for commercial use

package.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"name": "packery",
3-
"version": "2.0.0-beta1",
4-
"description": "Gapless, draggable layout library",
3+
"version": "2.0.0",
4+
"description": "Gapless, draggable grid layouts",
55
"main": "js/packery.js",
66
"dependencies": {
77
"get-size": "~2.0.2",
88
"outlayer": "~2.0.0"
99
},
1010
"devDependencies": {
1111
"chalk": "^1.1.1",
12-
"draggabilly": ">=2.1.0 <3",
12+
"draggabilly": "^2.1.0",
1313
"gulp": "^3.9.0",
1414
"gulp-jshint": "^2.0.0",
1515
"gulp-json-lint": "^0.1.0",
1616
"gulp-rename": "^1.2.2",
1717
"gulp-replace": "^0.5.4",
18-
"gulp-requirejs-optimize": "metafizzy/gulp-requirejs-optimize",
18+
"gulp-requirejs-optimize": "github:metafizzy/gulp-requirejs-optimize",
1919
"gulp-uglify": "^1.5.1",
2020
"gulp-util": "^3.0.7",
2121
"jquery": ">=2 <4",
@@ -41,7 +41,9 @@
4141
"bin",
4242
"binpacking",
4343
"packing",
44-
"masonry"
44+
"masonry",
45+
"gapless",
46+
"draggable"
4547
],
4648
"author": "Metafizzy",
4749
"bugs": {

0 commit comments

Comments
 (0)