deblan/forms
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Correct fix window title

Browse source 
Signed-off-by: Jonas Rittershofer <jotoeri@users.noreply.github.com>
This commit is contained in:
Jonas Rittershofer 2020-05-10 12:44:56 +02:00
parent a3079b5008
commit 3c973b101d
4 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mixins/WindowTitleMixin.js → src/utils/SetWindowTitle.js
View file

@ -19,14 +19,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
export default {
methods: {
setWindowTitle(formTitle) {
if (formTitle === '') {
window.document.title = t('forms', 'Forms') + ' - ' + OC.theme.title
} else {
window.document.title = formTitle + ' - ' + t('forms', 'Forms') + ' - ' + OC.theme.title
}
},
},
/**
* Set the Window-Title to current FormTitle including suffix.
*
* @param {String} formTitle Title of current form to set on window.
*/
const SetWindowTitle = function(formTitle) {
if (formTitle === '') {
window.document.title = t('forms', 'Forms') + ' - ' + OC.theme.title
} else {
window.document.title = formTitle + ' - ' + t('forms', 'Forms') + ' - ' + OC.theme.title
}
}
export default SetWindowTitle

20
src/views/Create.vue
View file

@ -137,7 +137,7 @@ import QuestionMultiple from '../components/Questions/QuestionMultiple'
import QuestionShort from '../components/Questions/QuestionShort'
import TopBar from '../components/TopBar'
import ViewsMixin from '../mixins/ViewsMixin'
import WindowTitleMixin from '../mixins/WindowTitleMixin'
import SetWindowTitle from '../utils/SetWindowTitle'
window.axios = axios
@ -156,7 +156,7 @@ export default {
TopBar,
},
mixins: [ViewsMixin, WindowTitleMixin],
mixins: [ViewsMixin],
data() {
return {
@ -175,13 +175,17 @@ export default {
},
computed: {
title() {
if (this.form.title === '') {
return t('forms', 'Create new form')
} else {
/**
* Return form title, or placeholder if not set
* @returns {string}
*/
formTitle() {
if (this.form.title) {
return this.form.title
}
return t('forms', 'New form')
},
hasQuestions() {
return this.form.questions && this.form.questions.length === 0
},
@ -206,13 +210,13 @@ export default {
// Update Window-Title on title change
'form.title': function() {
this.setWindowTitle(this.form.title)
SetWindowTitle(this.formTitle)
},
},
beforeMount() {
this.fetchFullForm(this.form.id)
this.setWindowTitle(this.form.title)
SetWindowTitle(this.formTitle)
},
updated() {

6
src/views/Results.vue
View file

@ -96,7 +96,7 @@ import EmptyContent from '../components/EmptyContent'
import Submission from '../components/Results/Submission'
import TopBar from '../components/TopBar'
import ViewsMixin from '../mixins/ViewsMixin'
import WindowTitleMixin from '../mixins/WindowTitleMixin'
import SetWindowTitle from '../utils/SetWindowTitle'
Vue.use(Clipboard)
@ -112,7 +112,7 @@ export default {
TopBar,
},
mixins: [ViewsMixin, WindowTitleMixin],
mixins: [ViewsMixin],
data() {
return {
@ -141,7 +141,7 @@ export default {
beforeMount() {
this.loadFormResults()
this.setWindowTitle(this.form.title)
SetWindowTitle(this.formTitle)
},
methods: {

6
src/views/Submit.vue
View file

@ -85,7 +85,7 @@ import Question from '../components/Questions/Question'
import QuestionLong from '../components/Questions/QuestionLong'
import QuestionShort from '../components/Questions/QuestionShort'
import QuestionMultiple from '../components/Questions/QuestionMultiple'
import WindowTitleMixin from '../mixins/WindowTitleMixin'
import SetWindowTitle from '../utils/SetWindowTitle'
export default {
name: 'Submit',
@ -100,8 +100,6 @@ export default {
QuestionMultiple,
},
mixins: [WindowTitleMixin],
data() {
return {
form: loadState('forms', 'form'),
@ -152,7 +150,7 @@ export default {
},
beforeMount() {
this.setWindowTitle(this.form.title)
SetWindowTitle(this.formTitle)
},
methods: {