From 66c774fc6c55960fe917373e7431e0a481d673e2 Mon Sep 17 00:00:00 2001 From: Philipp Hinrichsen Date: Thu, 21 Jan 2016 19:43:41 +0100 Subject: [PATCH 1/5] Add missing semicolons --- src/js/components/AlertDialogComponent.jsx | 2 +- src/js/components/CenteredInlineDialogComponent.jsx | 2 +- src/js/components/ConfirmDialoglComponent.jsx | 2 +- src/js/components/PromptDialogComponent.jsx | 2 +- src/js/components/TaskDetailComponent.jsx | 2 +- src/js/stores/MesosStore.js | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/js/components/AlertDialogComponent.jsx b/src/js/components/AlertDialogComponent.jsx index b659f4a1e..491582a29 100644 --- a/src/js/components/AlertDialogComponent.jsx +++ b/src/js/components/AlertDialogComponent.jsx @@ -23,7 +23,7 @@ var AlertDialogComponent = React.createClass({ return { onAccept: Util.noop, onDismiss: Util.noop - } + }; }, componentDidMount: function () { diff --git a/src/js/components/CenteredInlineDialogComponent.jsx b/src/js/components/CenteredInlineDialogComponent.jsx index d93f12115..c9c2e4a5d 100644 --- a/src/js/components/CenteredInlineDialogComponent.jsx +++ b/src/js/components/CenteredInlineDialogComponent.jsx @@ -2,7 +2,7 @@ import classNames from "classnames"; import React from "react/addons"; import {Link} from "react-router"; -import Util from "../helpers/Util" +import Util from "../helpers/Util"; var CenteredInlineDialogComponent = React.createClass({ displayName: "CenteredInlineDialogComponent", diff --git a/src/js/components/ConfirmDialoglComponent.jsx b/src/js/components/ConfirmDialoglComponent.jsx index 795fbde48..89a7b4486 100644 --- a/src/js/components/ConfirmDialoglComponent.jsx +++ b/src/js/components/ConfirmDialoglComponent.jsx @@ -23,7 +23,7 @@ var ConfirmDialogComponent = React.createClass({ return { onAccept: Util.noop, onDismiss: Util.noop - } + }; }, componentDidMount: function () { diff --git a/src/js/components/PromptDialogComponent.jsx b/src/js/components/PromptDialogComponent.jsx index 90e865839..f1b9f4421 100644 --- a/src/js/components/PromptDialogComponent.jsx +++ b/src/js/components/PromptDialogComponent.jsx @@ -24,7 +24,7 @@ var PromptDialogComponent = React.createClass({ return { onAccept: Util.noop, onDismiss: Util.noop - } + }; }, componentDidMount: function () { diff --git a/src/js/components/TaskDetailComponent.jsx b/src/js/components/TaskDetailComponent.jsx index d36544f89..ab400702b 100644 --- a/src/js/components/TaskDetailComponent.jsx +++ b/src/js/components/TaskDetailComponent.jsx @@ -170,7 +170,7 @@ var TaskDetailComponent = React.createClass({ var ipAddressFields = this.getIpAddresses(); if (ipAddressFields != null && ipAddressFields.length > 0) { - ipAddressFields.unshift(
IP Addresses
) + ipAddressFields.unshift(
IP Addresses
); } return ( diff --git a/src/js/stores/MesosStore.js b/src/js/stores/MesosStore.js index ec6fcd46e..c666cfdac 100644 --- a/src/js/stores/MesosStore.js +++ b/src/js/stores/MesosStore.js @@ -97,7 +97,7 @@ function getNodeURLFromState(nodeId, state) { } if (environment === DCOS_ENVIRONMENT) { - return `/slave/${nodeId}` + return `/slave/${nodeId}`; } let agent = state.slaves.find((slave) => { @@ -126,9 +126,9 @@ function getExecutorDirectoryFromState(frameworkId, taskId, state) { let framework = null; if (state.frameworks != null) { - framework = state.frameworks.find(matchFramework) + framework = state.frameworks.find(matchFramework); } else if (state.completed_frameworks != null) { - framework = state.completed_frameworks.find(matchFramework) + framework = state.completed_frameworks.find(matchFramework); } if (framework == null) { @@ -142,9 +142,9 @@ function getExecutorDirectoryFromState(frameworkId, taskId, state) { let executor = null; if (framework.executors != null) { - executor = framework.executors.find(matchExecutor) + executor = framework.executors.find(matchExecutor); } else if (framework.completed_executors != null) { - executor = framework.completed_executors.find(matchExecutor) + executor = framework.completed_executors.find(matchExecutor); } if (executor == null) { From cf95be9ec465b2f885f818187023e0f62b966a5f Mon Sep 17 00:00:00 2001 From: Philipp Hinrichsen Date: Thu, 21 Jan 2016 19:45:04 +0100 Subject: [PATCH 2/5] Remove dangling underscores --- src/js/components/Marathon.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/components/Marathon.jsx b/src/js/components/Marathon.jsx index fdd500885..08327e4bf 100644 --- a/src/js/components/Marathon.jsx +++ b/src/js/components/Marathon.jsx @@ -159,16 +159,16 @@ var Marathon = React.createClass({ }, startPolling: function () { - if (this._interval == null) { + if (this.interval == null) { this.poll(); - this._interval = setInterval(this.poll, config.updateInterval); + this.interval = setInterval(this.poll, config.updateInterval); } }, stopPolling: function () { - if (this._interval != null) { - clearInterval(this._interval); - this._interval = null; + if (this.interval != null) { + clearInterval(this.interval); + this.interval = null; } }, From 71a7c5ddefde330c3f83f12ad6cfcd88d11a0476 Mon Sep 17 00:00:00 2001 From: Philipp Hinrichsen Date: Thu, 21 Jan 2016 19:40:38 +0100 Subject: [PATCH 3/5] Add `no-unused-vars` and `no-console` --- .eslintrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.eslintrc b/.eslintrc index cf47c1561..c8543c930 100644 --- a/.eslintrc +++ b/.eslintrc @@ -23,6 +23,8 @@ ], "rules": { + "no-unused-vars": [1], + "no-console": [1], "eqeqeq": [2, "smart"], "quotes": [2, "double"], "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": 1}], From 8dc9e4ef61e2ce36a397735e7f7d3fc09adf0211 Mon Sep 17 00:00:00 2001 From: Philipp Hinrichsen Date: Thu, 21 Jan 2016 19:45:57 +0100 Subject: [PATCH 4/5] Remove unused variables --- src/js/components/AppListItemLabelsComponent.jsx | 5 ----- src/js/components/AppPageComponent.jsx | 1 - src/js/components/CenteredInlineDialogComponent.jsx | 1 - src/js/components/DeploymentsListComponent.jsx | 6 ------ src/js/components/PromptDialogComponent.jsx | 1 - src/js/components/TaskFileDownloadComponent.jsx | 1 - src/js/stores/DialogStore.js | 1 - 7 files changed, 16 deletions(-) diff --git a/src/js/components/AppListItemLabelsComponent.jsx b/src/js/components/AppListItemLabelsComponent.jsx index 617db90ce..d5ff812c4 100644 --- a/src/js/components/AppListItemLabelsComponent.jsx +++ b/src/js/components/AppListItemLabelsComponent.jsx @@ -6,11 +6,6 @@ import PopoverComponent from "./PopoverComponent"; import OnClickOutsideMixin from "react-onclickoutside"; import Util from "../helpers/Util"; -// Keep track of post-render initial margin value, on a per-reactid basis -var _initialTopMargins = []; -// Keep track of reversed dropdown state without modifying the DOM -var _reversedDropdowns = []; - var AppListItemLabelsComponent = React.createClass({ displayName: "AppListItemLabelsComponent", diff --git a/src/js/components/AppPageComponent.jsx b/src/js/components/AppPageComponent.jsx index 62ab4632d..306094e1c 100644 --- a/src/js/components/AppPageComponent.jsx +++ b/src/js/components/AppPageComponent.jsx @@ -1,6 +1,5 @@ import React from "react/addons"; -import AppsActions from "../actions/AppsActions"; import AppsEvents from "../events/AppsEvents"; import AppsStore from "../stores/AppsStore"; import BreadcrumbComponent from "../components/BreadcrumbComponent"; diff --git a/src/js/components/CenteredInlineDialogComponent.jsx b/src/js/components/CenteredInlineDialogComponent.jsx index c9c2e4a5d..635d24677 100644 --- a/src/js/components/CenteredInlineDialogComponent.jsx +++ b/src/js/components/CenteredInlineDialogComponent.jsx @@ -1,6 +1,5 @@ import classNames from "classnames"; import React from "react/addons"; -import {Link} from "react-router"; import Util from "../helpers/Util"; diff --git a/src/js/components/DeploymentsListComponent.jsx b/src/js/components/DeploymentsListComponent.jsx index 793ead61b..1e528ab97 100644 --- a/src/js/components/DeploymentsListComponent.jsx +++ b/src/js/components/DeploymentsListComponent.jsx @@ -1,6 +1,5 @@ import classNames from "classnames"; import lazy from "lazy.js"; -import {Link} from "react-router"; import React from "react/addons"; import Messages from "../constants/Messages"; @@ -119,11 +118,6 @@ var DeploymentListComponent = React.createClass({ state.deployments.length === 0 && state.fetchState !== States.STATE_UNAUTHORIZED && state.fetchState !== States.STATE_FORBIDDEN; - var pageHasGenericError = state.fetchState === States.STATE_ERROR; - var pageHasUnauthorizedError = - state.fetchState === States.STATE_UNAUTHORIZED; - var pageHasForbiddenError = state.fetchState === States.STATE_FORBIDDEN; - var pageHasErrorMessage = state.errorMessage !== ""; if (pageIsLoading) { let message = "Please wait while deployments are being retrieved"; diff --git a/src/js/components/PromptDialogComponent.jsx b/src/js/components/PromptDialogComponent.jsx index f1b9f4421..ecfb50114 100644 --- a/src/js/components/PromptDialogComponent.jsx +++ b/src/js/components/PromptDialogComponent.jsx @@ -1,7 +1,6 @@ import React from "react/addons"; import classNames from "classnames"; -import DialogSeverity from "../constants/DialogSeverity"; import Util from "../helpers/Util"; import ModalComponent from "../components/ModalComponent"; diff --git a/src/js/components/TaskFileDownloadComponent.jsx b/src/js/components/TaskFileDownloadComponent.jsx index c02af426e..86bc42ca2 100644 --- a/src/js/components/TaskFileDownloadComponent.jsx +++ b/src/js/components/TaskFileDownloadComponent.jsx @@ -4,7 +4,6 @@ import classNames from "classnames"; import MesosActions from "../actions/MesosActions"; import MesosEvents from "../events/MesosEvents"; import MesosStore from "../stores/MesosStore"; -import PopoverComponent from "../components/PopoverComponent"; import TooltipComponent from "../components/TooltipComponent"; var TaskFileDownloadComponent = React.createClass({ diff --git a/src/js/stores/DialogStore.js b/src/js/stores/DialogStore.js index df3faa37a..f050098fa 100644 --- a/src/js/stores/DialogStore.js +++ b/src/js/stores/DialogStore.js @@ -4,7 +4,6 @@ import Util from "../helpers/Util"; import AppDispatcher from "../AppDispatcher"; import DialogEvents from "../events/DialogEvents"; -import DialogTypes from "../constants/DialogTypes"; var dialogs = []; From 7122e42aee64c081b8d1c5e3ad05c1972d54b528 Mon Sep 17 00:00:00 2001 From: Philipp Hinrichsen Date: Thu, 21 Jan 2016 19:41:47 +0100 Subject: [PATCH 5/5] Change old warnings to errors --- .eslintrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.eslintrc b/.eslintrc index c8543c930..085e49e21 100644 --- a/.eslintrc +++ b/.eslintrc @@ -30,13 +30,13 @@ "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": 1}], "camelcase": [2, {"properties": "always"}], "strict": [2, "never"], // <-- fix - "block-spacing": [1, "always"], + "block-spacing": [2, "always"], "no-mixed-spaces-and-tabs": [2], "no-trailing-spaces": [2, { "skipBlankLines": false }], - "no-underscore-dangle": 1, + "no-underscore-dangle": 2, "no-multiple-empty-lines": [2, {"max": 1}], "no-empty": [2], - "one-var": [1, "never"], + "one-var": [2, "never"], "object-curly-spacing": [2, "never"], "space-after-keywords": [2, "always"], "space-before-blocks": [2, "always"], @@ -44,7 +44,7 @@ "anonymous": "always", "named": "never" }], "spaced-comment": [2, "always", { "exceptions": ["*"]}], - "semi": [1, "always"], + "semi": [2, "always"], "max-len": [2, 80, 4], "valid-jsdoc": [2, { "requireReturn": false,