Fixing merge conflicts

Author: mzabriskie

lib/draggable.js

@@ -356,8 +356,8 @@ module.exports = React.createClass({
 		// Initiate dragging
 		this.setState({
 			dragging: true,
-			offsetX: dragPoint.clientX,
-			offsetY: dragPoint.clientY,
+			offsetX: parseInt(dragPoint.clientX, 10),
+			offsetY: parseInt(dragPoint.clientY, 10),
 			startX: parseInt(node.style.left, 10) || 0,
 			startY: parseInt(node.style.top, 10) || 0
 		});
@@ -398,12 +398,15 @@ module.exports = React.createClass({
 
 		// Snap to grid if prop has been provided
 		if (Array.isArray(this.props.grid)) {
-			clientX = Math.abs(clientX - this.state.clientX) >= this.props.grid[0]
-					? clientX
+			var directionX = clientX < parseInt(this.state.clientX, 10) ? -1 : 1;
+			var directionY = clientY < parseInt(this.state.clientY, 10) ? -1 : 1;
+
+			clientX = Math.abs(clientX - parseInt(this.state.clientX, 10)) >= this.props.grid[0]
+					? (parseInt(this.state.clientX, 10) + (this.props.grid[0] * directionX)) 
 					: this.state.clientX;
 
-			clientY = Math.abs(clientY - this.state.clientY) >= this.props.grid[1]
-					? clientY
+			clientY = Math.abs(clientY - parseInt(this.state.clientY, 10)) >= this.props.grid[1]
+					? (parseInt(this.state.clientY, 10) + (this.props.grid[1] * directionY))
 					: this.state.clientY;
 		}
 

package.json

@@ -28,14 +28,14 @@
   },
   "homepage": "https://github.com/mzabriskie/react-draggable",
   "devDependencies": {
-    "jsx-loader": "^0.11.0",
+    "jsx-loader": "^0.12.0",
     "karma": "^0.12.19",
     "karma-chrome-launcher": "^0.1.4",
     "karma-cli": "0.0.4",
     "karma-firefox-launcher": "^0.1.3",
     "karma-jasmine": "^0.1.5",
     "karma-webpack": "^1.2.1",
-    "react": "^0.11.1",
+    "react": "^0.12.0",
     "reactify": "^0.17.1",
     "uglify-js": "^2.4.15",
     "webpack": "^1.3.2-beta8",