Skip to content

Commit

Permalink
fix for Draggabilly v1.2; Fixes #246
Browse files Browse the repository at this point in the history
remove old race condition sandbox example
  • Loading branch information
desandro committed Apr 9, 2015
1 parent 4aa39bf commit 4947ae2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 125 deletions.
5 changes: 3 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

## v1.4.0

+ Changed `bower.json` `main` to just `js/packery.js`
+ Upgraded Outlayer to `v1.4.0`
- enabled `percentPosition` option
- enabled `percentPosition` option. Fixed [#236](https://github.com/metafizzy/packery/issues/236)
- removed `instance` argument from `layoutComplete` and `removeComplete`
+ Fixed bugs with Draggabilly v1.2. Fixed [#246](https://github.com/metafizzy/packery/issues/246)
+ Changed `bower.json` `main` to just `js/packery.js`

### v1.3.2

Expand Down
12 changes: 6 additions & 6 deletions js/packery.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ Packery.prototype._create = function() {
// create drag handlers
var _this = this;
this.handleDraggabilly = {
dragStart: function( draggie ) {
_this.itemDragStart( draggie.element );
dragStart: function() {
_this.itemDragStart( this.element );
},
dragMove: function( draggie ) {
_this.itemDragMove( draggie.element, draggie.position.x, draggie.position.y );
dragMove: function() {
_this.itemDragMove( this.element, this.position.x, this.position.y );
},
dragEnd: function( draggie ) {
_this.itemDragEnd( draggie.element );
dragEnd: function() {
_this.itemDragEnd( this.element );
}
};

Expand Down
109 changes: 0 additions & 109 deletions sandbox/draggabilly-race-condition.html

This file was deleted.

18 changes: 10 additions & 8 deletions sandbox/draggabilly.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ <h1>Draggabilly</h1>
<script src="../bower_components/classie/classie.js"></script>
<script src="../bower_components/eventEmitter/EventEmitter.js"></script>
<script src="../bower_components/doc-ready/doc-ready.js"></script>
<script src="../bower_components/draggabilly/draggabilly.js"></script>
<script src="../bower_components/fizzy-ui-utils/utils.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="../bower_components/outlayer/item.js"></script>
<script src="../bower_components/outlayer/outlayer.js"></script>
<script src="../js/rect.js"></script>
Expand Down Expand Up @@ -145,20 +147,20 @@ <h1>Draggabilly</h1>
var draggies = bindDraggies( packery4 );

// when clicked toggle expanded
function onDragEnd( draggie ) {
var p1 = draggie.position;
var p2 = draggie.startPosition;
function onDragEnd() {
var p1 = this.position;
var p2 = this.startPosition;
// only proceed if stuff has moved
if ( p1.x !== p2.x || p1.y !== p2.y ) {
return;
}
// dragger didn't move
var isExpanded = classie.has( draggie.element, 'expanded' );
classie.toggle( draggie.element, 'expanded' );
var isExpanded = classie.has( this.element, 'expanded' );
classie.toggle( this.element, 'expanded' );
if ( !isExpanded ) {
// HACK unplace first
packery4.unplace( draggie.element );
packery4.fit( draggie.element );
packery4.unplace( this.element );
packery4.fit( this.element );
} else {
packery4.layout();
}
Expand Down

0 comments on commit 4947ae2

Please sign in to comment.