From a10d68c5db32b63bc05a66e3faa23c1cb2a09e36 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Tue, 26 Dec 2017 16:07:32 -0700 Subject: [PATCH] jshint --- lib/global-admin/addon/accounts/edit/controller.js | 3 ++- lib/global-admin/addon/machines/configure/controller.js | 1 - lib/shared/addon/access/service.js | 4 ++-- .../addon/components/cloud-host-add-or-edit/component.js | 2 +- lib/shared/addon/components/cluster-dashboard/component.js | 1 - .../addon/components/container/form-command/component.js | 1 - lib/shared/addon/components/form-user-labels/component.js | 6 +++--- lib/shared/addon/components/new-edit-project/component.js | 1 - lib/shared/addon/scope/service.js | 7 ------- lib/shared/addon/user-language/service.js | 1 - lib/shared/addon/utils/constants.js | 1 + 11 files changed, 9 insertions(+), 19 deletions(-) diff --git a/lib/global-admin/addon/accounts/edit/controller.js b/lib/global-admin/addon/accounts/edit/controller.js index 2d12d6944..8bf79066c 100644 --- a/lib/global-admin/addon/accounts/edit/controller.js +++ b/lib/global-admin/addon/accounts/edit/controller.js @@ -102,6 +102,8 @@ export default Controller.extend({ validate() { var errors = []; + this.set('errors', errors); + // var neu = this.get('password'); // var neu2 = this.get('confirm'); @@ -120,7 +122,6 @@ export default Controller.extend({ // if ( errors.length ) // { - // this.set('errors', errors); // return false; // } diff --git a/lib/global-admin/addon/machines/configure/controller.js b/lib/global-admin/addon/machines/configure/controller.js index 19ee86c3c..8d64ee66e 100644 --- a/lib/global-admin/addon/machines/configure/controller.js +++ b/lib/global-admin/addon/machines/configure/controller.js @@ -1,5 +1,4 @@ import Controller from '@ember/controller'; -import { get, set } from '@ember/object'; export default Controller.extend({ availableDrivers: null, diff --git a/lib/shared/addon/access/service.js b/lib/shared/addon/access/service.js index b52ff5799..57e8478f9 100644 --- a/lib/shared/addon/access/service.js +++ b/lib/shared/addon/access/service.js @@ -3,7 +3,7 @@ import { observer } from '@ember/object'; import { on } from '@ember/object/evented'; import Service, { inject as service } from '@ember/service'; import C from 'shared/utils/constants'; -import { get, set } from '@ember/object'; +import { set } from '@ember/object'; export default Service.extend({ cookies: service(), @@ -67,7 +67,7 @@ export default Service.extend({ .then((/* xhr */) => { // var me = xhr.body.data.findBy('id', 'admin'); // TODO 2.0 set(this, 'admin', true); // TODO 2.0 always admin for now - return resolve(undefined, `API supports authentication${(true ? '' : ', but is not enabled')}`); + return resolve(undefined, `API supports authentication`); // // If we get a good response back, the API supports authentication // var token = xhr.body.data[0]; diff --git a/lib/shared/addon/components/cloud-host-add-or-edit/component.js b/lib/shared/addon/components/cloud-host-add-or-edit/component.js index 76468dd77..97cbd1e61 100644 --- a/lib/shared/addon/components/cloud-host-add-or-edit/component.js +++ b/lib/shared/addon/components/cloud-host-add-or-edit/component.js @@ -3,7 +3,7 @@ import Component from '@ember/component'; import Driver from 'shared/mixins/host-driver'; import layout from './template'; import { inject as service } from '@ember/service'; -import { get, set } from '@ember/object'; +import { get } from '@ember/object'; export default Component.extend(Driver, { layout, diff --git a/lib/shared/addon/components/cluster-dashboard/component.js b/lib/shared/addon/components/cluster-dashboard/component.js index f09b82bab..62e7d1977 100644 --- a/lib/shared/addon/components/cluster-dashboard/component.js +++ b/lib/shared/addon/components/cluster-dashboard/component.js @@ -4,7 +4,6 @@ import { alias } from '@ember/object/computed'; import { inject as service } from '@ember/service'; import { formatSi, parseSi } from 'shared/utils/parse-unit'; import layout from './template'; -import { get } from '@ember/object'; export default Component.extend({ intl: service(), diff --git a/lib/shared/addon/components/container/form-command/component.js b/lib/shared/addon/components/container/form-command/component.js index f31c6cd45..0e69d34da 100644 --- a/lib/shared/addon/components/container/form-command/component.js +++ b/lib/shared/addon/components/container/form-command/component.js @@ -1,4 +1,3 @@ -import { isEmpty } from '@ember/utils'; import { computed } from '@ember/object'; import { inject as service } from '@ember/service'; import Component from '@ember/component'; diff --git a/lib/shared/addon/components/form-user-labels/component.js b/lib/shared/addon/components/form-user-labels/component.js index 6bd8b8297..1df4d016f 100644 --- a/lib/shared/addon/components/form-user-labels/component.js +++ b/lib/shared/addon/components/form-user-labels/component.js @@ -1,5 +1,5 @@ import { next } from '@ember/runloop'; -import { get, set } from '@ember/object'; +import { set } from '@ember/object'; import { inject as service } from '@ember/service'; import Component from '@ember/component'; import ManageLabels from 'shared/mixins/manage-labels'; @@ -61,8 +61,8 @@ export default Component.extend(ManageLabels, { validate() { let errors = []; - (this.get('labelArray')||[]).forEach((obj) => { - }); +// (this.get('labelArray')||[]).forEach((obj) => { +// }); set(this, 'errors', errors); }, diff --git a/lib/shared/addon/components/new-edit-project/component.js b/lib/shared/addon/components/new-edit-project/component.js index d7deb7746..2a363a185 100644 --- a/lib/shared/addon/components/new-edit-project/component.js +++ b/lib/shared/addon/components/new-edit-project/component.js @@ -1,5 +1,4 @@ import { alias } from '@ember/object/computed'; -import { get } from '@ember/object'; import { inject as service } from '@ember/service'; import { reject, all as PromiseAll } from 'rsvp'; import Component from '@ember/component'; diff --git a/lib/shared/addon/scope/service.js b/lib/shared/addon/scope/service.js index 6e3298118..51c504177 100644 --- a/lib/shared/addon/scope/service.js +++ b/lib/shared/addon/scope/service.js @@ -236,13 +236,6 @@ export default Service.extend({ return self.setCurrent(null); } } - - - function fail() { - // Then cry - select(null); - return reject(); - } }, setCurrentCluster: function(cluster) { diff --git a/lib/shared/addon/user-language/service.js b/lib/shared/addon/user-language/service.js index a3d47e795..17be213b9 100644 --- a/lib/shared/addon/user-language/service.js +++ b/lib/shared/addon/user-language/service.js @@ -18,7 +18,6 @@ export default Service.extend({ userTheme : service('user-theme'), app: service(), loadedLocales : null, - app: service(), bootstrap: function() { this.set('loadedLocales', []); diff --git a/lib/shared/addon/utils/constants.js b/lib/shared/addon/utils/constants.js index 321ca8ba4..37a053377 100644 --- a/lib/shared/addon/utils/constants.js +++ b/lib/shared/addon/utils/constants.js @@ -481,6 +481,7 @@ C.SUPPORTED_SCHEMA_INPUTS= [ 'string', 'masked', 'secret', + 'base64', ]; export default C;