chore: Update eslint to version 4.19.1 (#1351)

wireapp · Apr 4, 2018 · 0308cbb · 0308cbb
1 parent 24930b3
commit 0308cbb
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 51 deletions.
diff --git a/electron/renderer/src/components/Sidebar.js b/electron/renderer/src/components/Sidebar.js
@@ -92,18 +92,17 @@ const Sidebar = ({
         </div>
       </div>
     ))}
-    {!isAddingAccount &&
-      !hasReachedLimitOfAccounts && (
-        <AddAccountMenuTrigger
-          id="account"
-          onClick={preventFocus(event => {
-            connected.toggleAddAccountMenuVisibility(
-              ...centerOfEventTarget(event)
-            );
-          })}
-          forceVisible={isAddAccountMenuVisible}
-        />
-      )}
+    {!isAddingAccount && !hasReachedLimitOfAccounts && (
+      <AddAccountMenuTrigger
+        id="account"
+        onClick={preventFocus(event => {
+          connected.toggleAddAccountMenuVisibility(
+            ...centerOfEventTarget(event)
+          );
+        })}
+        forceVisible={isAddAccountMenuVisible}
+      />
+    )}
 
     {isAddAccountMenuVisible && <AddAccountMenu />}
     {isEditAccountMenuVisible && <EditAccountMenu />}

diff --git a/electron/renderer/src/components/Webviews.js b/electron/renderer/src/components/Webviews.js
@@ -145,17 +145,16 @@ class Webviews extends Component {
               onIpcMessage={event => this._onIpcMessage(account, event)}
               webpreferences="backgroundThrottling=false"
             />
-            {this.state.canDelete[account.id] &&
-              account.visible && (
-                <div className="Webviews-close" onClick={() => this._onWebviewClose(account)}>
-                  <svg width="16" height="16" viewBox="0 0 16 16">
-                    <path
-                      d="M2.757 14.657L8 9.414l5.243 5.243 1.414-1.414L9.414 8l5.243-5.243-1.414-1.414L8 6.586 2.757 1.343 1.343 2.757 6.586 8l-5.243 5.243"
-                      fillRule="evenodd"
-                    />
-                  </svg>
-                </div>
-              )}
+            {this.state.canDelete[account.id] && account.visible && (
+              <div className="Webviews-close" onClick={() => this._onWebviewClose(account)}>
+                <svg width="16" height="16" viewBox="0 0 16 16">
+                  <path
+                    d="M2.757 14.657L8 9.414l5.243 5.243 1.414-1.414L9.414 8l5.243-5.243-1.414-1.414L8 6.586 2.757 1.343 1.343 2.757 6.586 8l-5.243 5.243"
+                    fillRule="evenodd"
+                  />
+                </svg>
+              </div>
+            )}
           </div>
         ))}
       </ul>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "electron-mocha": "6.0.1",
     "electron-packager": "12.0.0",
     "electron-winstaller": "2.5.2",
-    "eslint": "4.18.2",
+    "eslint": "4.19.1",
     "eslint-plugin-react": "7.7.0",
     "grunt": "1.0.2",
     "grunt-contrib-clean": "1.1.0",