Skip to content

Commit

Permalink
merge upstream changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
drewpc committed Aug 30, 2015
2 parents e4d2023 + 2a21311 commit 388f584
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ See [packery.metafizzy.co](http://packery.metafizzy.co) for complete docs and de
Link directly to [Packery files on cdnjs](https://cdnjs.com/libraries/packery).

``` html
<script src="https://cdnjs.cloudflare.com/ajax/libs/packery/1.4.2/packery.pkgd.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/packery/1.4.3/packery.pkgd.js"></script>
<!-- or -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/packery/1.4.2/packery.pkgd.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/packery/1.4.3/packery.pkgd.min.js"></script>
```

### Package managers
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "packery",
"version": "1.4.2",
"version": "1.4.3",
"author": "Metafizzy",
"description": "bin-packing layout library",
"main": "js/packery.js",
Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### v1.4.3

Updated Outlayer to v1.4.2 for percent position bug fixes. Fixed [#284](https://github.com/metafizzy/packery/issues/284).

### v1.4.2

+ Updated Outlayer to v1.4.1.
Expand Down
4 changes: 2 additions & 2 deletions dist/packery.pkgd.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Packery PACKAGED v1.4.2
* Packery PACKAGED v1.4.3
* bin-packing layout library
*
* Licensed GPLv3 for open source use
Expand Down Expand Up @@ -3580,7 +3580,7 @@ return Item;
}));

/*!
* Packery v1.4.2
* Packery v1.4.3
* bin-packing layout library
*
* Licensed GPLv3 for open source use
Expand Down
2 changes: 1 addition & 1 deletion dist/packery.pkgd.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/packery.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Packery v1.4.2
* Packery v1.4.3
* bin-packing layout library
*
* Licensed GPLv3 for open source use
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "packery",
"version": "1.4.2",
"version": "1.4.3",
"description": "bin-packing layout library",
"main": "js/packery.js",
"dependencies": {
Expand Down
110 changes: 110 additions & 0 deletions sandbox/fluid.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />

<title>fluid</title>

<style>
* {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

body {
font-family: sans-serif;
}

.grid {
margin-bottom: 20px;
background: #EEE;
/*padding: 20px 5%;*/
}

.grid-item {
float: left;
width: 25%;
height: 80px;
border: 1px solid;
background: #ACE;
}

.grid-item.w2 { width: 50%; }
.grid-item.w3 { width: 75%; }

.grid-item.h2 { height: 160px; }
.grid-item.h3 { height: 240px; }
</style>

</head>
<body>

<h1>fluid</h1>

<div class="grid js-packery" data-packery-options='{ "percentPosition": true }'>
<div class="grid-item w2"></div>
<div class="grid-item h2"></div>
<div class="grid-item"></div>
<div class="grid-item w3"></div>
<div class="grid-item"></div>
<div class="grid-item h3"></div>
<div class="grid-item w2 h2"></div>
<div class="grid-item"></div>
<div class="grid-item"></div>
</div>

<h2>Draggable</h2>

<div class="grid grid--draggable">
<div class="grid-item w2"></div>
<div class="grid-item h2"></div>
<div class="grid-item"></div>
<div class="grid-item w3"></div>
<div class="grid-item"></div>
<div class="grid-item h3"></div>
<div class="grid-item w2 h2"></div>
<div class="grid-item"></div>
<div class="grid-item"></div>
</div>

<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/matches-selector/matches-selector.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/classie/classie.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>

<script src="../bower_components/unipointer/unipointer.js"></script>
<script src="../bower_components/unidragger/unidragger.js"></script>
<script src="../bower_components/draggabilly/draggabilly.js"></script>

<script src="../js/rect.js"></script>
<script src="../js/packer.js"></script>
<script src="../js/item.js"></script>
<script src="../js/packery.js"></script>

<script>
docReady( function() {
var pckry = new Packery( '.grid--draggable', {
percentPosition: true
});

var dragElems = document.querySelectorAll('.grid--draggable .grid-item');

for ( var i=0, len = dragElems.length; i < len; i++ ) {
var dragElem = dragElems[i];
var draggie = new Draggabilly( dragElem );
pckry.bindDraggabillyEvents( draggie );
}
});


</script>

</body>
</html>

0 comments on commit 388f584

Please sign in to comment.