summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-15 15:34:01 +0100
committerPhil Hughes <me@iamphill.com>2017-05-15 15:34:01 +0100
commit36df19e71b53a78da9db15b65c405c50089da7b3 (patch)
treec773cf98b7dbfd95bfbd6a1433af96ee7e855a93
parent14387b49a56bf31e7d250611cf2b40b2a8928c08 (diff)
downloadgitlab-ce-issue-edit-inline-title-field.tar.gz
Stop passing through the store objectissue-edit-inline-title-field
[ci skip]
-rw-r--r--app/assets/javascripts/issue_show/components/app.vue5
-rw-r--r--app/assets/javascripts/issue_show/components/fields/title.vue9
-rw-r--r--app/assets/javascripts/issue_show/components/title.vue4
-rw-r--r--spec/javascripts/issue_show/components/fields/title_spec.js2
-rw-r--r--spec/javascripts/issue_show/components/title_spec.js11
5 files changed, 15 insertions, 16 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index ee780afc44d..abddcaa2594 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -59,6 +59,9 @@ export default {
elementType() {
return this.showForm ? 'form' : 'div';
},
+ formState() {
+ return this.store.formState;
+ },
},
components: {
descriptionComponent,
@@ -142,7 +145,7 @@ export default {
<template>
<div :is="elementType">
<title-component
- :store="store"
+ :form-state="formState"
:show-form="showForm"
:issuable-ref="issuableRef"
:title-html="state.titleHtml"
diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue
index 732a4021205..01ae6fd3dd2 100644
--- a/app/assets/javascripts/issue_show/components/fields/title.vue
+++ b/app/assets/javascripts/issue_show/components/fields/title.vue
@@ -1,16 +1,11 @@
<script>
export default {
props: {
- store: {
+ formState: {
type: Object,
required: true,
},
},
- data() {
- return {
- state: this.store.formState,
- };
- },
};
</script>
@@ -27,6 +22,6 @@
type="text"
placeholder="Issue title"
aria-label="Issue title"
- v-model="state.title" />
+ v-model="formState.title" />
</fieldset>
</template>
diff --git a/app/assets/javascripts/issue_show/components/title.vue b/app/assets/javascripts/issue_show/components/title.vue
index a61ce414891..d410c61b655 100644
--- a/app/assets/javascripts/issue_show/components/title.vue
+++ b/app/assets/javascripts/issue_show/components/title.vue
@@ -27,7 +27,7 @@
type: String,
required: true,
},
- store: {
+ formState: {
type: Object,
required: true,
},
@@ -56,7 +56,7 @@
<div>
<title-field
v-if="showForm"
- :store="store" />
+ :form-state="formState" />
<h2
v-else
class="title"
diff --git a/spec/javascripts/issue_show/components/fields/title_spec.js b/spec/javascripts/issue_show/components/fields/title_spec.js
index 69afcd24df9..53ae038a6a2 100644
--- a/spec/javascripts/issue_show/components/fields/title_spec.js
+++ b/spec/javascripts/issue_show/components/fields/title_spec.js
@@ -17,7 +17,7 @@ describe('Title field component', () => {
vm = new Component({
propsData: {
- store,
+ formState: store.formState,
},
}).$mount();
});
diff --git a/spec/javascripts/issue_show/components/title_spec.js b/spec/javascripts/issue_show/components/title_spec.js
index 45ec8718eb6..2f648e4b79b 100644
--- a/spec/javascripts/issue_show/components/title_spec.js
+++ b/spec/javascripts/issue_show/components/title_spec.js
@@ -7,17 +7,18 @@ describe('Title component', () => {
beforeEach(() => {
const Component = Vue.extend(titleComponent);
+ const store = new Store({
+ titleHtml: '',
+ descriptionHtml: '',
+ issuableRef: '',
+ });
vm = new Component({
propsData: {
issuableRef: '#1',
titleHtml: 'Testing <img />',
titleText: 'Testing',
showForm: false,
- store: new Store({
- titleHtml: '',
- descriptionHtml: '',
- issuableRef: '',
- }),
+ formState: store.formState,
},
}).$mount();
});