diff --git a/resources/assets/js/components/TEditorTask.vue b/resources/assets/js/components/TEditorTask.vue index 7e3584fde..8aba6c869 100755 --- a/resources/assets/js/components/TEditorTask.vue +++ b/resources/assets/js/components/TEditorTask.vue @@ -86,7 +86,7 @@ export default { min_height: 200, max_height: 380, contextmenu: 'checklist | bold italic underline forecolor backcolor | link | uploadImages imagePreview | history screenload', - valid_elements: 'a[href|title|target=_blank],em,strong/b,div[align],span[style],a,br,p,img[src|alt|witdh|height],pre[class],code,ol[class],ul[class],li[class]', + valid_elements: 'a[href|title|target=_blank],em,strong/b,div[align],span[style],a,br,p,img[src|alt|width],pre[class],code,ol[class],ul[class],li[class]', extended_valid_elements: 'a[href|title|target=_blank]', toolbar: false }, @@ -94,7 +94,7 @@ export default { menubar: 'file edit view', removed_menuitems: 'preview,print', contextmenu: 'checklist | bold italic underline forecolor backcolor | link | uploadImages imagePreview | screenload', - valid_elements: 'a[href|title|target=_blank],em,strong/b,div[align],span[style],a,br,p,img[src|alt|witdh|height],pre[class],code,ol[class],ul[class],li[class]', + valid_elements: 'a[href|title|target=_blank],em,strong/b,div[align],span[style],a,br,p,img[src|alt|width],pre[class],code,ol[class],ul[class],li[class]', extended_valid_elements: 'a[href|title|target=_blank]', toolbar: 'uploadImages | checklist | bold italic underline | forecolor backcolor', mobile: { diff --git a/resources/mobile b/resources/mobile index 65c178f6d..722f44028 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 65c178f6d6994922bd0a9e05ef79c9655a3dbb49 +Subproject commit 722f44028ab1afeb32ce33ff1dad9b11e26f863b