Skip to content

Commit

Permalink
Rebuild dist
Browse files Browse the repository at this point in the history
  • Loading branch information
gaearon committed Feb 17, 2015
1 parent 830dd40 commit f5a3b14
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 25 deletions.
47 changes: 29 additions & 18 deletions dist-modules/mixins/DragLayerMixin.js
Expand Up @@ -8,32 +8,43 @@ var DragLayerMixin = {
return this.getStateForDragLayerMixin();
},

getDragLayerState: function getDragLayerState() {
var _state = this.state;
var isDragging = _state.isDragging;
var draggedItemType = _state.draggedItemType;
var draggedItem = _state.draggedItem;
var initialOffset = _state.initialOffset;
var currentOffset = _state.currentOffset;
return { isDragging: isDragging, draggedItemType: draggedItemType, draggedItem: draggedItem, initialOffset: initialOffset, currentOffset: currentOffset };
},

getStateForDragLayerMixin: function getStateForDragLayerMixin() {
var draggedItemType = DragOperationStore.getDraggedItemType(),
draggedItem = DragOperationStore.getDraggedItem(),
var initialOffsetFromClient = DragOffsetStore.getInitialOffsetFromClient(),
currentOffsetFromClient = DragOffsetStore.getCurrentOffsetFromClient(),
initialOffsetFromContainer = DragOffsetStore.getInitialOffsetFromContainer(),
initialOffsetFromClient = DragOffsetStore.getInitialOffsetFromClient(),
currentOffsetFromClient = DragOffsetStore.getCurrentOffsetFromClient();
isDragging = false,
draggedItemType = null,
draggedItem = null,
initialOffset = null,
currentOffset = null;

if (!initialOffsetFromClient || !currentOffsetFromClient) {
return {
isDragging: false
};
}
if (initialOffsetFromClient && currentOffsetFromClient) {
isDragging = true;
draggedItemType = DragOperationStore.getDraggedItemType();
draggedItem = DragOperationStore.getDraggedItem();

return {
isDragging: true,
draggedItemType: draggedItemType,
draggedItem: draggedItem,
initialOffset: {
initialOffset = {
x: initialOffsetFromClient.x - initialOffsetFromContainer.x,
y: initialOffsetFromClient.y - initialOffsetFromContainer.y
},
currentOffset: {
};

currentOffset = {
x: currentOffsetFromClient.x - initialOffsetFromContainer.x,
y: currentOffsetFromClient.y - initialOffsetFromContainer.y
}
};
};
}

return { isDragging: isDragging, draggedItemType: draggedItemType, draggedItem: draggedItem, initialOffset: initialOffset, currentOffset: currentOffset };
},

handleStoreChangeInDragLayerMixin: function handleStoreChangeInDragLayerMixin() {
Expand Down
2 changes: 1 addition & 1 deletion dist/ReactDND.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/bundle.js.map

Large diffs are not rendered by default.

0 comments on commit f5a3b14

Please sign in to comment.