Merge branch 'coreRefactor'

Author: STRML

.babelrc

@@ -0,0 +1,3 @@
+{
+  "stage": 0
+}

.eslintrc

@@ -1,13 +1,19 @@
 {
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
   "rules": {
     "strict": 0,
-    "quotes": ["single"],
-    "curly": "multi-line",
+    "quotes": [1, "single"],
+    "curly": [1, "multi-line"],
     "camelcase": 0,
-    "no-use-before-define": "nofunc",
+    "comma-dangle": 1,
+    "no-use-before-define": [1, "nofunc"],
     "no-underscore-dangle": 0,
-    "no-unused-vars": 0,
-    "new-cap": 0
+    "no-unused-vars": 1,
+    "new-cap": 0,
+    "semi": 1
   },
   env: {
     "browser": true,

.gitignore

@@ -1,4 +1,3 @@
 .idea
 *.iml
 node_modules/
-dist/

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
+  - "0.12"
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start

CHANGELOG.md

@@ -1,119 +1,128 @@
 # Changelog
 
-### 0.1.0 (Jul 25, 2014)
+### 1.0.0 (Oct 27, 2015)
 
-- Initial release
+- Breaking: Removed `resetState()` instance method
+- Breaking: Removed `moveOnStartChange` prop
+- Breaking: React `0.14` support only.
+- Refactored project.
+- Module now exports a `<DraggableCore>` element upon which `<Draggable>` is based.
+  This module is useful for building libraries and is completely stateless.
 
-### 0.1.1 (Jul 26, 2014)
+### 0.8.5 (Oct 20, 2015)
 
-- Fixing dragging not stopping on mouseup in some cases
+- Bugfix: isElementSVG no longer can be overwritten by getInitialState (#83)
+- Bugfix: Fix for element prefixes in JSDOM
 
-### 0.2.0 (Sep 10, 2014)
+### 0.8.4 (Oct 15, 2015)
 
-- Adding support for snapping to a grid
-- Adding support for specifying start position
-- Ensure event handlers are destroyed on unmount
-- Adding browserify support
-- Adding bower support
+- Bugfix: SVG elements now properly use `transform` attribute instead of `style`. Thanks @martinRoss
 
-### 0.2.1 (Sep 10, 2014)
+### 0.8.3 (Oct 12, 2015)
 
-- Exporting as ReactDraggable
+- Bugfix: Short-circuiting drag throws due to `e.changedTouches` check.
 
-### 0.3.0 (Oct 21, 2014)
+### 0.8.2 (Sep 21, 2015)
 
-- Adding support for touch devices
+- Handle scrolling while dragging. (#60)
+- Add multi-touch support. (#68)
+- IE fixes.
+- Documentation updates. (#77)
 
-### 0.4.0 (Jan 03, 2015)
+### 0.8.1 (June 3, 2015)
 
-- Improving accuracy of snap to grid
-- Updating to React 0.12
-- Adding dragging className
-- Adding reactify support for browserify
-- Fixing issue with server side rendering
+- Add `resetState()` instance method for use by parents. See README ("State Problems?").
 
-### 0.4.1 (Apr 30, 2015)
+### 0.8.0 (May 19, 2015)
 
-- Remove react/addons dependency (now depending on `react` directly).
-- Add MIT License file.
-- Fix an issue where browser may be detected as touch-enabled but touch event isn't thrown.
+- Touch/mouse events rework. Fixes #51, #37, and #43, as well as IE11 support.
+- Moved mousemove/mouseup and touch event handlers to document from window. Fixes IE9/10 support.
+  IE8 is still not supported, as it is not supported by React.
 
-### 0.4.2 (Apr 30, 2015)
+### 0.7.4 (May 18, 2015)
 
-- Add `"browser"` config to package.json for browserify imports (fix #45).
-- Remove unnecessary `emptyFunction` and `React.addons.classSet` imports.
+- Fix a bug where a quick drag out of bounds to `0,0` would cause the element to remain in an inaccurate position,
+  because the translation was removed from the CSS. See #55.
 
-### 0.4.3 (Apr 30, 2015)
+### 0.7.3 (May 13, 2015)
 
-- Fix React.addons error caused by faulty test.
+- Removed a `moveOnStartChange` optimization that was causing problems when attempting to move a `<Draggable>` back
+  to its initial position. See https://github.com/STRML/react-grid-layout/issues/56
 
-### 0.5.0 (May 2, 2015)
+### 0.7.2 (May 8, 2015)
 
-- Remove browserify browser config, reactify, and jsx pragma. Fixes #38
-- Use React.cloneElement instead of addons cloneWithProps (requires React 0.13)
-- Move to CSS transforms. Simplifies implementation and fixes #48, #34, #31.
-- Fixup linting and space/tab errors. Fixes #46.
+- Added `moveOnStartChange` property. See README.
 
-### 0.6.0 (May 2, 2015)
+### 0.7.1 (May 7, 2015)
 
-- Breaking change: Cancel dragging when onDrag or onStart handlers return an explicit `false`.
-- Fix sluggish movement when `grid` option was active.
-- Example updates.
-- Move `user-select:none` hack to document.body for better highlight prevention.
-- Add `bounds` option to restrict dragging within parent or within coordinates.
+- The `start` param is back. Pass `{x: Number, y: Number}` to kickoff the CSS transform. Useful in certain
+  cases for simpler callback math (so you don't have to know its existing relative position and add it to
+  the dragged position). Fixes #52.
 
 ### 0.7.0 (May 7, 2015)
 
 - Breaking change: `bounds` with coordinates was confusing because it was using the item's width/height,
   which was not intuitive. When providing coordinates, `bounds` now simply restricts movement in each
   direction by that many pixels.
 
-### 0.7.1 (May 7, 2015)
+### 0.6.0 (May 2, 2015)
 
-- The `start` param is back. Pass `{x: Number, y: Number}` to kickoff the CSS transform. Useful in certain
-  cases for simpler callback math (so you don't have to know its existing relative position and add it to
-  the dragged position). Fixes #52.
+- Breaking change: Cancel dragging when onDrag or onStart handlers return an explicit `false`.
+- Fix sluggish movement when `grid` option was active.
+- Example updates.
+- Move `user-select:none` hack to document.body for better highlight prevention.
+- Add `bounds` option to restrict dragging within parent or within coordinates.
 
-### 0.7.2 (May 8, 2015)
+### 0.5.0 (May 2, 2015)
 
-- Added `moveOnStartChange` property. See README.
+- Remove browserify browser config, reactify, and jsx pragma. Fixes #38
+- Use React.cloneElement instead of addons cloneWithProps (requires React 0.13)
+- Move to CSS transforms. Simplifies implementation and fixes #48, #34, #31.
+- Fixup linting and space/tab errors. Fixes #46.
 
-### 0.7.3 (May 13, 2015)
+### 0.4.3 (Apr 30, 2015)
 
-- Removed a `moveOnStartChange` optimization that was causing problems when attempting to move a `<Draggable>` back
-  to its initial position. See https://github.com/STRML/react-grid-layout/issues/56
+- Fix React.addons error caused by faulty test.
 
-### 0.7.4 (May 18, 2015)
+### 0.4.2 (Apr 30, 2015)
 
-- Fix a bug where a quick drag out of bounds to `0,0` would cause the element to remain in an inaccurate position,
-  because the translation was removed from the CSS. See #55.
+- Add `"browser"` config to package.json for browserify imports (fix #45).
+- Remove unnecessary `emptyFunction` and `React.addons.classSet` imports.
 
-### 0.8.0 (May 19, 2015)
+### 0.4.1 (Apr 30, 2015)
 
-- Touch/mouse events rework. Fixes #51, #37, and #43, as well as IE11 support.
-- Moved mousemove/mouseup and touch event handlers to document from window. Fixes IE9/10 support.
-  IE8 is still not supported, as it is not supported by React.
+- Remove react/addons dependency (now depending on `react` directly).
+- Add MIT License file.
+- Fix an issue where browser may be detected as touch-enabled but touch event isn't thrown.
 
-### 0.8.1 (June 3, 2015)
+### 0.4.0 (Jan 03, 2015)
 
-- Add `resetState()` instance method for use by parents. See README ("State Problems?").
+- Improving accuracy of snap to grid
+- Updating to React 0.12
+- Adding dragging className
+- Adding reactify support for browserify
+- Fixing issue with server side rendering
 
-### 0.8.2 (Sep 21, 2015)
+### 0.3.0 (Oct 21, 2014)
 
-- Handle scrolling while dragging. (#60)
-- Add multi-touch support. (#68)
-- IE fixes.
-- Documentation updates. (#77)
+- Adding support for touch devices
 
-### 0.8.3 (Oct 12, 2015)
+### 0.2.1 (Sep 10, 2014)
 
-- Bugfix: Short-circuiting drag throws due to `e.changedTouches` check.
+- Exporting as ReactDraggable
 
-### 0.8.4 (Oct 15, 2015)
+### 0.2.0 (Sep 10, 2014)
 
-- Bugfix: SVG elements now properly use `transform` attribute instead of `style`. Thanks @martinRoss
+- Adding support for snapping to a grid
+- Adding support for specifying start position
+- Ensure event handlers are destroyed on unmount
+- Adding browserify support
+- Adding bower support
 
-### 0.8.5 (Oct 20, 2015)
+### 0.1.1 (Jul 26, 2014)
 
-- Bugfix: isElementSVG no longer can be overwritten by getInitialState (#83)
-- Bugfix: Fix for element prefixes in JSDOM
+- Fixing dragging not stopping on mouseup in some cases
+
+### 0.1.0 (Jul 25, 2014)
+
+- Initial release

Makefile

@@ -1,33 +1,35 @@
 # Mostly lifted from https://andreypopp.com/posts/2013-05-16-makefile-recipes-for-node-js.html
 # Thanks @andreypopp
 
-BIN = ./node_modules/.bin
-SRC = $(wildcard lib/*.js)
-LIB = $(SRC:lib/%.js=dist/%.js)
-MIN = $(SRC:lib/%.js=dist/%.min.js)
+BIN := $(shell npm bin)
+DIST = dist
+LIB = $(DIST)/react-draggable.js
+MIN = $(DIST)/react-draggable.min.js
 
-.PHONY: test dev
+.PHONY: test dev build clean
+
+clean:
+	rm -rf dist
 
 build: $(LIB) $(MIN)
 
 # Allows usage of `make install`, `make link`
 install link:
 	@npm $@
 
-# FIXME
-dist/%.min.js: $(BIN)
-	@$(BIN)/uglifyjs dist/react-draggable.js \
-	  --output dist/react-draggable.min.js \
-	  --source-map dist/react-draggable.min.map \
-	  --source-map-url react-draggable.min.map \
-	  --in-source-map dist/react-draggable.map \
+dist/%.min.js: $(LIB) $(BIN)
+	@$(BIN)/uglifyjs $< \
+	  --output $@ \
+	  --source-map $@.map \
+	  --source-map-url $(basename $@.map) \
+	  --in-source-map $<.map \
 	  --compress warnings=false
 
 dist/%.js: $(BIN)
 	@$(BIN)/webpack --devtool source-map
 
 test: $(BIN)
-	@$(BIN)/karma start --browsers Firefox --single-run
+	@$(BIN)/karma start --single-run
 
 dev: $(BIN)
 	script/build-watch
@@ -50,15 +52,15 @@ define release
 	git tag "v$$NEXT_VERSION" -m "release v$$NEXT_VERSION"
 endef
 
-release-patch: test build
+release-patch: test clean build
 	@$(call release,patch)
 
-release-minor: test build
+release-minor: test clean build
 	@$(call release,minor)
 
-release-major: test build
+release-major: test clean build
 	@$(call release,major)
 
-publish:
+publish: clean build
 	git push --tags origin HEAD:master
 	npm publish