Fix server rendering

react-dnd · May 18, 2015 · 97526af · 97526af
1 parent 6b44a27
commit 97526af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/examples/00 Chessboard/Tutorial App/Board.js b/examples/00 Chessboard/Tutorial App/Board.js
@@ -44,7 +44,7 @@ export default class Board {
       <div style={{
         width: '100%',
         height: '100%',
-        display: window.safari ? '-webkit-flex' : 'flex', // Don't do that in a real app
+        display: typeof window !== 'undefined' && window.safari ? '-webkit-flex' : 'flex', // Don't do that in a real app
         flexWrap: 'wrap',
         WebkitFlexWrap: 'wrap'
       }}>

diff --git a/src/backends/HTML5.js b/src/backends/HTML5.js
@@ -95,13 +95,13 @@ class HTML5Backend {
   }
 
   setup() {
-    invariant(!this.constructor.isSetUp, 'Cannot have two HTML5 backends at the same time.');
-    this.constructor.isSetUp = true;
-
     if (typeof window === 'undefined') {
       return;
     }
 
+    invariant(!this.constructor.isSetUp, 'Cannot have two HTML5 backends at the same time.');
+    this.constructor.isSetUp = true;
+
     window.addEventListener('dragstart', this.handleTopDragStart);
     window.addEventListener('dragstart', this.handleTopDragStartCapture, true);
     window.addEventListener('dragend', this.handleTopDragEndCapture, true);
@@ -115,12 +115,12 @@ class HTML5Backend {
   }
 
   teardown() {
-    this.constructor.isSetUp = false;
-
     if (typeof window === 'undefined') {
       return;
     }
 
+    this.constructor.isSetUp = false;
+
     window.removeEventListener('dragstart', this.handleTopDragStart);
     window.removeEventListener('dragstart', this.handleTopDragStartCapture, true);
     window.removeEventListener('dragend', this.handleTopDragEndCapture, true);