Fix warning in React 0.14

rexxars · Nov 14, 2015 · cf978ea · cf978ea
1 parent f7a5ec1
commit cf978ea
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 185 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -35,9 +35,9 @@ <h2>License:</h2>
         <p>MIT-licensed.</p>
     </div>
 
-    <script src="//fb.me/react-0.12.2.js"></script>
-    <script src="js/event-listener.js"></script>
-    <script src="../element-pan.js"></script>
+    <script src="https://fb.me/react-0.14.2.js"></script>
+    <script src="https://fb.me/react-dom-0.14.2.js"></script>
+    <script src="../umd/element-pan.min.js"></script>
     <script src="js/demo.js"></script>
 
 </body>

diff --git a/demo/js/demo.js b/demo/js/demo.js
@@ -1,20 +1,21 @@
 'use strict';
 
+var require = typeof require === 'undefined' ? function() {} : require;
+
 var React = window.React || require('react');
+var ReactDom = window.ReactDOM || require('react-dom') || React;
 var ElementPan = React.createFactory(window.reactElementPan || require('react-element-pan'));
 
-React.initializeTouchEvents(true);
-
 // Simple image demo
-React.render(
+ReactDom.render(
     new ElementPan({
         startX: 771,
         startY: 360
     }, React.DOM.img({ src: 'img/beer.jpg' })
 ), document.getElementById('image-demo'));
 
 // Huge SVG demo
-React.render(
+ReactDom.render(
     new ElementPan({
         startX: 1771,
         startY: 1360
@@ -27,13 +28,13 @@ while (--i) {
     themDivs.push(React.DOM.div({
         key: i,
         style: {
-            width:  i * 30,
+            width: i * 30,
             lineHeight: (i * 10) + 'px'
         }
     }, 'Smaller...'));
 }
 
-React.render(
+ReactDom.render(
     new ElementPan(null, themDivs),
     document.getElementById('html-demo')
 );
diff --git a/demo/js/event-listener.js b/demo/js/event-listener.js
diff --git a/element-pan.js b/element-pan.js
diff --git a/package.json b/package.json
@@ -3,17 +3,17 @@
   "version": "1.0.2",
   "description": "React component for allowing panning of DOM-elements too large for their container, in a Google Maps-like way.",
   "main": "element-pan.js",
+  "browser": "./umd/element-pan.js",
   "scripts": {
     "test": "eslint .",
-    "build": "browserify element-pan.js -o vendor/imboclient-3.1.1.js -s reactElementPan"
+    "build": "npm run build:umd && npm run build:prod",
+    "build:umd": "webpack src/element-pan.js umd/element-pan.js",
+    "build:prod": "NODE_ENV=production webpack -p src/element-pan.js umd/element-pan.min.js"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com:rexxars/react-element-pan.git"
   },
-  "browserify-shim": {
-    "react": "global:React"
-  },
   "keywords": [
     "react",
     "react-component",
@@ -31,7 +31,8 @@
   "homepage": "https://github.com/rexxars/react-element-pan",
   "devDependencies": {
     "eslint": "^1.9.0",
-    "eslint-config-vaffel": "^3.0.0"
+    "eslint-config-vaffel": "^3.0.0",
+    "webpack": "^1.12.6"
   },
   "dependencies": {
     "eventlistener": "0.0.1"