Merge pull request react-bootstrap#914 from AlexKVal/fixWarnings

Address eslint warnings
tomlelouch · Jun 29, 2015 · 3131bc3 · 3131bc3
2 parents 97ef415 + 9c682b6
commit 3131bc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Modal.js b/src/Modal.js
@@ -49,8 +49,9 @@ function onFocus(context, handler) {
   let useFocusin = !doc.addEventListener;
   let remove;
 
-  if ( currentFocusListener )
+  if ( currentFocusListener ) {
     currentFocusListener.remove();
+  }
 
   if (useFocusin) {
     document.attachEvent('onfocusin', handler);
@@ -60,7 +61,7 @@ function onFocus(context, handler) {
     remove = () => document.removeEventListener('focus', handler, true);
   }
 
-  currentFocusListener = { remove }
+  currentFocusListener = { remove };
 
   return currentFocusListener;
 }
@@ -298,7 +299,7 @@ const Modal = React.createClass({
       try {
         this.lastFocus = document.activeElement;
       }
-      catch (e) {}
+      catch (e) {} // eslint-disable-line no-empty
     }
   },
 

diff --git a/test/ModalSpec.js b/test/ModalSpec.js
@@ -207,11 +207,11 @@ describe('Modal', function () {
         }
       });
 
-      var instance = React.render(<Container />, focusableContainer);
+      let instance = React.render(<Container />, focusableContainer);
 
       setTimeout(function () {
         let input = React.findDOMNode(
-          ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'input'))
+          ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'input'));
 
         document.activeElement.should.equal(input);
         done();