0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-16 01:34:12 +00:00

Base layout: Changed main app script to be module loaded

Prevents polluting global scope with variables since we're using the
module format bundler in esbuild.
Also cleaned up unused yields.
Fixed bad reference in our tinymce fixes.

For 
This commit is contained in:
Dan Brown 2024-10-01 10:37:31 +01:00
parent e65655594f
commit 34ade50181
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
3 changed files with 9 additions and 15 deletions
resources
js/wysiwyg-tinymce
views

View file

@ -144,11 +144,13 @@ export function handleTableCellRangeEvents(editor) {
cell.removeAttribute('align');
cleanChildAlignment(cell);
},
JustifyRight: this.JustifyLeft,
JustifyCenter: this.JustifyLeft,
JustifyFull: this.JustifyLeft,
};
// Copy justify left action to other alignment actions
actionByCommand.JustifyRight = actionByCommand.JustifyLeft;
actionByCommand.JustifyCenter = actionByCommand.JustifyLeft;
actionByCommand.JustifyFull = actionByCommand.JustifyLeft;
editor.on('ExecCommand', event => {
const action = actionByCommand[event.command];
if (action) {

View file

@ -36,11 +36,9 @@
@endif
@if(userCan('comment-create-all') || $commentTree->canUpdateAny())
@push('post-app-scripts')
<script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
@push('body-end')
<script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>
@include('form.editor-translations')
@endpush
@push('post-app-html')
@include('entities.selector-popup')
@endpush
@endif

View file

@ -35,8 +35,6 @@
<!-- OpenSearch -->
<link rel="search" type="application/opensearchdescription+xml" title="{{ setting('app-name') }}" href="{{ url('/opensearch.xml') }}">
@yield('head')
<!-- Custom Styles & Head Content -->
@include('layouts.parts.custom-styles')
@include('layouts.parts.custom-head')
@ -70,14 +68,10 @@
</div>
</div>
@yield('bottom')
@stack('post-app-html')
@if($cspNonce ?? false)
<script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
<script src="{{ versioned_asset('dist/app.js') }}" type="module" nonce="{{ $cspNonce }}"></script>
@endif
@yield('scripts')
@stack('post-app-scripts')
@stack('body-end')
@include('layouts.parts.base-body-end')
</body>