Skip to content

Commit

Permalink
Working, working, working
Browse files Browse the repository at this point in the history
  • Loading branch information
bobdenotter committed Aug 23, 2020
1 parent 9f9da48 commit 24f0c49
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
12 changes: 10 additions & 2 deletions src/ArticleConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ private function getDefaults(): array
'/assets/article/css/bolt-additions.css',
],
],
'toolbar' => [
'stickyTopOffset' => 50,
],
];
}

Expand Down Expand Up @@ -115,7 +118,12 @@ private function getLinks(): array

$records = $this->query->getContentForTwig($contentTypes, $params)->setMaxPerPage($amount);

$links = [];
$links = [
'___' => [
'name' => '(Choose an existing Record)',
'url' => '',
],
];

/** @var Content $record */
foreach ($records as $record) {
Expand All @@ -127,7 +135,7 @@ private function getLinks(): array
];
}

ksort($links);
ksort($links, SORT_STRING | SORT_FLAG_CASE);

return [
'definedlinks' => [
Expand Down
2 changes: 1 addition & 1 deletion src/TwigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function articleSettings(): string
{
$settings = $this->articleConfig->getConfig();

return Json::json_encode($settings, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_PRETTY_PRINT);
return Json::json_encode($settings, JSON_HEX_QUOT | JSON_HEX_APOS);
}

public function articleIncludes(): string
Expand Down
9 changes: 2 additions & 7 deletions templates/injector.html.twig
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{# todo: Use `asset`, but make sure the packages are set on POST, otherwise it'll break
<script src="{{ asset('assets/article/article.js', 'public') }}"></script>
<link rel="stylesheet" href="{{ asset('assets/article/article.css', 'public') }}">
--- #}

<script src="/assets/article/article-editor.min.js"></script>
<link rel="stylesheet" href="/assets/article/css/article-editor.min.css">
<script src="{{ asset('assets/article/article-editor.min.js', 'public') }}"></script>
<link rel="stylesheet" href="{{ asset('assets/article/css/article-editor.min.css', 'public') }}">
{{ article_includes() }}
<script>
ArticleEditor.settings = {
Expand Down

0 comments on commit 24f0c49

Please sign in to comment.