Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"archiver": "^8.0.0",
"fs-extra": "^11.4.0",
"husky": "^9.1.7",
"lint-staged": "^17.4.1"
"lint-staged": "^17.5.1"
},
"lint-staged": {
"themes/**develop**/**/*.{css,js,jsx,ts,tsx,twig}": [
Expand Down
2 changes: 1 addition & 1 deletion themes/develop/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# テーマ「develop」Ver.1.1.6
# テーマ「develop」Ver.1.1.7

## バンドル環境の使い方

Expand Down
9 changes: 8 additions & 1 deletion themes/develop/admin.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
@extends("/_layouts/admin.html")

@section("editor-css")
<!-- 編集画面とエディタ内要素のスタイル(ブロックエディターのプレビューにも読み込む) -->
@vite("src/style/editor.css", {
"linkTagAttributes": {
"data-block-editor-stylesheet": true
}
})
@endsection

@section("admin-js")
@parent

<script>
ACMS.Ready(function() {
ACMS.Config.blockEditorConfig.editorProps.editorProps.attributes.class = 'prose';
// 公開側の本文(include/entry/body.twig)と同じクラスにする
ACMS.Config.blockEditorConfig.editorProps.editorProps.attributes.class = 'prose max-w-none';
});
</script>
<!-- カスタムJSを記述 -->
Expand Down
24 changes: 24 additions & 0 deletions themes/develop/include/head/js.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@
{% set js = module('V2_Js') %}
<script src="{{ JS_LIB_JQUERY_DIR }}jquery-{{ JS_LIB_JQUERY_DIR_VERSION }}.min.js" charset="UTF-8"></script>
<script src="{{ ROOT_DIR }}acms.js{{ js.arguments }}" charset="UTF-8" id="acms-js"></script>
{% else %}
{# htmx でスワップされたコンテンツの組み込みJS(src/js/main.js の window.dispatch)を再初期化する。
acms.js を読み込む場合はコア側が行う。htmx 4 の htmx:after:swap は target がテキストノードになる
ことがあるため、挿入されたノード一覧を持つ htmx:after:settle を使う。htmx 2(CMS 3.2)向けに
afterSwap も残し、htmx 4 で htmx-2-compat 拡張が発火させる afterSwap は無視する。 #}
{# prettier-ignore #}
<script>
(function () {
function dispatch(node) {
if (node instanceof HTMLElement && typeof window.dispatch === 'function') {
window.dispatch(node);
}
}
window.addEventListener('htmx:after:settle', function (event) {
(event.detail && event.detail.newContent ? event.detail.newContent : []).forEach(dispatch);
});
window.addEventListener('htmx:afterSwap', function (event) {
if (window.htmx && parseInt(window.htmx.version, 10) >= 4) {
return;
}
dispatch(event.target);
});
})();
</script>
{% endif %}

<!-- Vite -->
Expand Down
Loading
Loading