Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix blessing global

Browse Source
This commit is contained in:
Pig Fang 2020-06-28 22:23:10 +08:00
parent d242c124e9
commit b8dab4b57a
No known key found for this signature in database
GPG Key ID: A8198F548DADA9E2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/View/Composers/HeadComposer.php
View File

@ -141,7 +141,6 @@ class HeadComposer
'base_url' => url('/'), 'base_url' => url('/'),
'site_name' => option_localized('site_name'), 'site_name' => option_localized('site_name'),
'route' => request()->path(), 'route' => request()->path(),
'i18n' => new \stdClass(),
]; ];
$view->with('blessing', $blessing); $view->with('blessing', $blessing);
} }

9
resources/assets/src/scripts/extra.ts
View File

@ -1,12 +1,11 @@
export function getExtraData(): any { export function getExtraData(): Record<string, any> {
const jsonElement = document.querySelector('#blessing-extra') const jsonElement = document.querySelector('#blessing-extra')
/* istanbul ignore next */ /* istanbul ignore next */
if (jsonElement) { if (jsonElement) {
return JSON.parse(jsonElement.textContent ?? '{}') return JSON.parse(jsonElement.textContent ?? '{}')
} else {
return {}
} }
} }
const extraData = getExtraData() blessing.extra = getExtraData()
if (extraData) {
blessing.extra = extraData
}