fix: convert page - task list + UI fixes
This commit is contained in:
parent
26f1c0f372
commit
84b927915e
@ -100,9 +100,7 @@ export default {
|
||||
})
|
||||
if (_.get(resp, 'data.pages.convert.responseResult.succeeded', false)) {
|
||||
this.isShown = false
|
||||
_.delay(() => {
|
||||
window.location.assign(`/e/${this.pageLocale}/${this.pagePath}`)
|
||||
}, 400)
|
||||
window.location.assign(`/e/${this.pageLocale}/${this.pagePath}`)
|
||||
} else {
|
||||
throw new Error(_.get(resp, 'data.pages.convert.responseResult.message', this.$t('common:error.unexpected')))
|
||||
}
|
||||
|
@ -96,7 +96,7 @@
|
||||
img(src='/_assets/svg/editor-icon-ckeditor.svg', alt='Visual Editor', style='width: 36px;')
|
||||
.body-2.mt-2.primary--text Visual Editor
|
||||
.caption.grey--text Rich-text WYSIWYG
|
||||
.caption.blue--text.text--lighten-2 {{$t('editor:select.cannotChange')}}
|
||||
//- .caption.blue--text.text--lighten-2 {{$t('editor:select.cannotChange')}}
|
||||
|
||||
v-card.radius-7.mt-2(color='teal darken-3', dark)
|
||||
v-card-text.text-center.py-4
|
||||
|
@ -488,6 +488,10 @@ module.exports = class Page extends Model {
|
||||
throw new Error('Invalid Page Id')
|
||||
}
|
||||
|
||||
if (ogPage.editorKey === opts.editor) {
|
||||
throw new Error('Page is already using this editor. Nothing to convert.')
|
||||
}
|
||||
|
||||
// -> Check for page access
|
||||
if (!WIKI.auth.checkAccess(opts.user, ['write:pages'], {
|
||||
locale: ogPage.localeCode,
|
||||
@ -561,6 +565,15 @@ module.exports = class Page extends Model {
|
||||
replacement: c => `_${c}_`
|
||||
})
|
||||
|
||||
td.addRule('taskList', {
|
||||
filter: (n, o) => {
|
||||
return n.nodeName === 'INPUT' && n.getAttribute('type') === 'checkbox'
|
||||
},
|
||||
replacement: (c, n) => {
|
||||
return n.getAttribute('checked') ? '[x] ' : '[ ] '
|
||||
}
|
||||
})
|
||||
|
||||
td.addRule('removeTocAnchors', {
|
||||
filter: (n, o) => {
|
||||
return n.nodeName === 'A' && n.classList.contains('toc-anchor')
|
||||
|
Loading…
Reference in New Issue
Block a user