diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-28 17:22:57 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-28 17:22:57 +0100 |
commit | 0b7824d433ec5029da17114389f425f816b7be74 (patch) | |
tree | 3788195066603dcc496f5ff3ffda375577d61cdf /app/assets | |
parent | fde9732a27065467f4fab0ba0a6bd1cfed9b092b (diff) | |
download | gitlab-ce-0b7824d433ec5029da17114389f425f816b7be74.tar.gz |
Updated some Vue specific JS
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/deploy_keys/components/action_btn.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/deploy_keys/components/app.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/deploy_keys/components/key.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/deploy_keys/components/keys_panel.vue (renamed from app/assets/javascripts/deploy_keys/components/keys.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/deploy_keys/store/index.js | 4 |
5 files changed, 9 insertions, 12 deletions
diff --git a/app/assets/javascripts/deploy_keys/components/action_btn.vue b/app/assets/javascripts/deploy_keys/components/action_btn.vue index 7da2915a45e..3ff3a9d977e 100644 --- a/app/assets/javascripts/deploy_keys/components/action_btn.vue +++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue @@ -47,7 +47,8 @@ <i v-if="isLoading" class="fa fa-spinner fa-spin" - aria-hidden="true"> + aria-hidden="true" + aria-label="Loading"> </i> </button> </template> diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue index e0443e2e0df..ee2f85bde53 100644 --- a/app/assets/javascripts/deploy_keys/components/app.vue +++ b/app/assets/javascripts/deploy_keys/components/app.vue @@ -3,15 +3,13 @@ import eventHub from '../eventhub'; import DeployKeysService from '../service'; import DeployKeysStore from '../store'; - import keysPanel from './keys.vue'; + import keysPanel from './keys_panel.vue'; export default { data() { - const store = new DeployKeysStore(); - return { isLoading: false, - store, + store: new DeployKeysStore(), }; }, props: { @@ -84,7 +82,9 @@ class="text-center" v-if="isLoading && !hasKeys"> <i - class="fa fa-spinner fa-spin fa-2x"> + class="fa fa-spinner fa-spin fa-2x" + aria-hidden="true" + aria-label="Loading deploy keys"> </i> </div> <div v-else-if="hasKeys"> diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue index af842a3bb39..1b47cceba78 100644 --- a/app/assets/javascripts/deploy_keys/components/key.vue +++ b/app/assets/javascripts/deploy_keys/components/key.vue @@ -56,9 +56,9 @@ </div> <div class="deploy-key-content prepend-left-default deploy-key-projects"> <a + v-for="project in deployKey.projects" class="label deploy-project-label" - :href="project.full_path" - v-for="project in deployKey.projects"> + :href="project.full_path"> {{ project.full_name }} </a> </div> diff --git a/app/assets/javascripts/deploy_keys/components/keys.vue b/app/assets/javascripts/deploy_keys/components/keys_panel.vue index 2470831eddf..2470831eddf 100644 --- a/app/assets/javascripts/deploy_keys/components/keys.vue +++ b/app/assets/javascripts/deploy_keys/components/keys_panel.vue diff --git a/app/assets/javascripts/deploy_keys/store/index.js b/app/assets/javascripts/deploy_keys/store/index.js index 7177d9bed7f..6210361af26 100644 --- a/app/assets/javascripts/deploy_keys/store/index.js +++ b/app/assets/javascripts/deploy_keys/store/index.js @@ -6,8 +6,4 @@ export default class DeployKeysStore { findEnabledKey(id) { return this.keys.enabled_keys.find(key => key.id === id); } - - removeKeyForType(deployKey, type) { - this.keys[type] = this.keys[type].filter(key => key.id !== deployKey.id); - } } |