j1-template 2023.0.17 → 2023.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/_includes/themes/j1/layouts/content_generator_collection.html +2 -3
- data/_includes/themes/j1/layouts/content_generator_news_panel_posts.html +2 -2
- data/_includes/themes/j1/modules/attics/generator.html +3 -1
- data/_includes/themes/j1/modules/navigator/generator.html +2 -2
- data/_includes/themes/j1/procedures/collections/create_collection_article_preview.proc +1 -1
- data/_layouts/{paginator/autopage_category.html → autopage_category.html} +1 -1
- data/_layouts/{paginator/autopage_collection.html → autopage_collection.html} +1 -6
- data/_layouts/{paginator/autopage_collections_tags.html → autopage_collections_tags.html} +1 -1
- data/_layouts/category.html +67 -0
- data/_layouts/readme +2 -0
- data/assets/data/banner.html +8 -6
- data/assets/data/masonry.html +397 -0
- data/assets/data/panel.html +1 -1
- data/assets/data/quicklinks.html +12 -12
- data/assets/data/slick.html +288 -0
- data/assets/error_pages/HTTP204.html +1 -1
- data/assets/error_pages/HTTP400.html +1 -1
- data/assets/error_pages/HTTP401.html +1 -1
- data/assets/error_pages/HTTP403.html +1 -1
- data/assets/error_pages/HTTP404.html +1 -1
- data/assets/error_pages/HTTP444.html +1 -1
- data/assets/error_pages/HTTP445.html +1 -1
- data/assets/error_pages/HTTP446.html +1 -1
- data/assets/error_pages/HTTP447.html +1 -1
- data/assets/error_pages/HTTP448.html +1 -1
- data/assets/error_pages/HTTP500.html +1 -1
- data/assets/error_pages/HTTP501.html +1 -1
- data/assets/error_pages/HTTP502.html +1 -1
- data/assets/error_pages/HTTP503.html +1 -1
- data/assets/themes/j1/adapter/js/attic.js +31 -16
- data/assets/themes/j1/adapter/js/j1.js +55 -21
- data/assets/themes/j1/adapter/js/masonry.js +119 -49
- data/assets/themes/j1/adapter/js/mmenu.js +4 -3
- data/assets/themes/j1/adapter/js/navigator.js +69 -19
- data/assets/themes/j1/adapter/js/slick.js +293 -44
- data/assets/themes/j1/adapter/js/toccer.js +27 -14
- data/assets/themes/j1/adapter/js/waves.js +3 -1
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.css +294 -364
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.min.css +2 -2
- data/assets/themes/j1/core/js/template.js +56 -60
- data/assets/themes/j1/core/js/template.min.js +6 -6
- data/assets/themes/j1/core/js/template.min.js.map +1 -1
- data/assets/themes/j1/modules/masonry/css/theme/uno.css +35 -0
- data/assets/themes/j1/modules/masonry/css/theme/uno.min.css +15 -0
- data/assets/themes/j1/modules/mmenuLight/css/theme/uno/mmenu.css +3 -3
- data/assets/themes/j1/modules/mmenuLight/css/theme/uno/mmenu.min.css +1 -1
- data/assets/themes/j1/modules/slick/lightbox/LICENSE +20 -0
- data/assets/themes/j1/modules/slick/lightbox/README.md +138 -0
- data/assets/themes/j1/modules/slick/lightbox/css/slick-lightbox.css +128 -0
- data/assets/themes/j1/modules/slick/lightbox/css/slick-lightbox.min.css +1 -0
- data/assets/themes/j1/modules/slick/lightbox/css/theme/uno.css +36 -0
- data/assets/themes/j1/modules/slick/lightbox/css/theme/uno.min.css +15 -0
- data/assets/themes/j1/modules/slick/lightbox/js/slick-lightbox.js +353 -0
- data/assets/themes/j1/modules/slick/lightbox/js/slick-lightbox.min.js +2 -0
- data/assets/themes/j1/modules/slick/lightbox/js/slick-lightbox.min.js.map +1 -0
- data/assets/themes/j1/modules/slick/{README.md → slider/README.md} +13 -14
- data/assets/themes/j1/modules/slick/{css → slider/css}/slick.css +16 -10
- data/assets/themes/j1/modules/slick/slider/css/slick.min.css +15 -0
- data/assets/themes/j1/modules/slick/slider/css/theme/uno.css +292 -0
- data/assets/themes/j1/modules/slick/slider/css/theme/uno.min.css +15 -0
- data/assets/themes/j1/modules/slick/{fonts → slider/fonts}/slick.svg +14 -14
- data/assets/themes/j1/modules/slick/slider/js/slick.js +3037 -0
- data/assets/themes/j1/modules/translator/css/translator.css +3 -19
- data/assets/themes/j1/modules/translator/css/translator.min.css +1 -1
- data/lib/j1/patches/rubygems/eventmachine-1.2.7-x64-mingw32/lib/3.2/fastfilereaderext.so +0 -0
- data/lib/j1/patches/rubygems/eventmachine-1.2.7-x64-mingw32/lib/3.2/rubyeventmachine.so +0 -0
- data/lib/j1/version.rb +1 -1
- data/lib/j1_app/log4r/yamlconfigurator.rb +41 -41
- data/lib/starter_web/Gemfile +4 -4
- data/lib/starter_web/README.md +142 -143
- data/lib/starter_web/_config.yml +55 -25
- data/lib/starter_web/_data/blocks/banner.yml +45 -46
- data/lib/starter_web/_data/blocks/defaults/banner.yml +4 -4
- data/lib/starter_web/_data/blocks/defaults/panel.yml +11 -11
- data/lib/starter_web/_data/blocks/footer.yml +2 -2
- data/lib/starter_web/_data/blocks/panel.yml +9 -9
- data/lib/starter_web/_data/layouts/collection.yml +9 -0
- data/lib/starter_web/_data/layouts/home.yml +51 -21
- data/lib/starter_web/_data/layouts/page.yml +36 -3
- data/lib/starter_web/_data/layouts/post.yml +36 -3
- data/lib/starter_web/_data/layouts/raw.yml +35 -3
- data/lib/starter_web/_data/modules/advertising.yml +1 -2
- data/lib/starter_web/_data/modules/analytics.yml +1 -2
- data/lib/starter_web/_data/modules/attics.yml +2 -2
- data/lib/starter_web/_data/modules/blog_navigator.yml +1 -2
- data/lib/starter_web/_data/modules/carousel.yml +1 -2
- data/lib/starter_web/_data/modules/comments.yml +1 -2
- data/lib/starter_web/_data/modules/cookieconsent.yml +1 -2
- data/lib/starter_web/_data/modules/cookies.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/advertising.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/analytics.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/attics.yml +2 -2
- data/lib/starter_web/_data/modules/defaults/authentication.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/blog_navigator.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/carousel.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/comments.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/cookieconsent.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/cookies.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/dropdowns.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/fab.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/framer.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/justifiedGallery.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/lightGallery.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/lightbox.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/log4javascript.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/log4r.yml +7 -9
- data/lib/starter_web/_data/modules/defaults/lunr.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/masonry.yml +52 -23
- data/lib/starter_web/_data/modules/defaults/navigator.yml +13 -12
- data/lib/starter_web/_data/modules/defaults/nbinteract.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/particles.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/rangeSlider.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/rtable.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/{scoller.yml → scroller.yml} +8 -2
- data/lib/starter_web/_data/modules/defaults/slick.yml +493 -0
- data/lib/starter_web/_data/modules/defaults/themer.yml +1 -2
- data/lib/starter_web/_data/modules/defaults/toccer.yml +2 -3
- data/lib/starter_web/_data/modules/defaults/translator.yml +2 -3
- data/lib/starter_web/_data/modules/defaults/waves.yml +1 -2
- data/lib/starter_web/_data/modules/dropdowns.yml +1 -2
- data/lib/starter_web/_data/modules/fab.yml +1 -2
- data/lib/starter_web/_data/modules/framer.yml +1 -2
- data/lib/starter_web/_data/modules/justifiedGallery.yml +1 -2
- data/lib/starter_web/_data/modules/lightGallery.yml +1 -2
- data/lib/starter_web/_data/modules/lightbox.yml +1 -2
- data/lib/starter_web/_data/modules/log4r.yml +140 -7
- data/lib/starter_web/_data/modules/lunr.yml +1 -2
- data/lib/starter_web/_data/modules/masonry.yml +293 -24
- data/lib/starter_web/_data/modules/masterslider.yml +2 -1
- data/lib/starter_web/_data/modules/navigator.yml +13 -25
- data/lib/starter_web/_data/modules/navigator_menu.yml +632 -560
- data/lib/starter_web/_data/modules/particles.yml +1 -2
- data/lib/starter_web/_data/modules/rangeSlider.yml +1 -2
- data/lib/starter_web/_data/modules/rtable.yml +1 -2
- data/lib/starter_web/_data/modules/scroller.yml +9 -3
- data/lib/starter_web/_data/modules/slick.yml +501 -0
- data/lib/starter_web/_data/modules/themer.yml +1 -2
- data/lib/starter_web/_data/modules/toccer.yml +1 -2
- data/lib/starter_web/_data/modules/translator.yml +1 -2
- data/lib/starter_web/_data/modules/waves.yml +1 -2
- data/lib/starter_web/_data/plugins/defaults/paginator.yml +23 -4
- data/lib/starter_web/_data/plugins/paginator.yml +10 -13
- data/lib/starter_web/_data/puma/config.rb +10 -0
- data/lib/starter_web/_data/resources.yml +36 -29
- data/lib/starter_web/_data/templates/feed.xml +1 -1
- data/lib/starter_web/_data/utilities/defaults/util_srv.yml +2 -2
- data/lib/starter_web/_data/utilities/util_srv.yml +2 -3
- data/lib/starter_web/_includes/attributes.asciidoc +24 -0
- data/lib/starter_web/_includes/custom/static/readme +1 -1
- data/lib/starter_web/_includes/custom/templates/collection_panel.html +131 -0
- data/lib/starter_web/_includes/custom/templates/custom_header.html +98 -0
- data/lib/starter_web/_includes/custom/templates/people_panel.html +144 -0
- data/lib/starter_web/_includes/custom/templates/readme +1 -1
- data/lib/starter_web/_plugins/asciidoctor/carousel-block.rb +1 -1
- data/lib/starter_web/_plugins/asciidoctor/gallery-block.rb +1 -1
- data/lib/starter_web/_plugins/asciidoctor/gist-block.rb +1 -1
- data/lib/starter_web/_plugins/asciidoctor/lightbox-block.rb +1 -1
- data/lib/starter_web/_plugins/asciidoctor/masonry-block.rb +50 -0
- data/lib/starter_web/_plugins/asciidoctor/masterslider-block.rb +7 -6
- data/lib/starter_web/_plugins/asciidoctor/mdil-icon-inline.rb +10 -0
- data/lib/starter_web/_plugins/asciidoctor/placeholder-inline.rb +44 -0
- data/lib/starter_web/_plugins/asciidoctor/slick-block.rb +49 -0
- data/lib/starter_web/_plugins/index/lunr.rb +1 -1
- data/lib/starter_web/assets/images/collections/people/diana-petersen.jpg +0 -0
- data/lib/starter_web/assets/images/collections/people/larry-parker.jpg +0 -0
- data/lib/starter_web/assets/images/collections/people/parveen-anand.jpg +0 -0
- data/lib/starter_web/assets/images/collections/portfolio/1.jpg +0 -0
- data/lib/starter_web/assets/images/collections/portfolio/2.jpg +0 -0
- data/lib/starter_web/assets/images/collections/portfolio/3.jpg +0 -0
- data/lib/starter_web/assets/images/collections/portfolio/4.jpg +0 -0
- data/lib/starter_web/assets/images/collections/portfolio/5.jpg +0 -0
- data/lib/starter_web/assets/images/collections/portfolio/6.jpg +0 -0
- data/lib/starter_web/assets/images/custom/header/avatar.svg +248 -0
- data/lib/starter_web/assets/images/custom/header/family.svg +2209 -0
- data/lib/starter_web/assets/images/icons/controls/close-icon.svg +1 -0
- data/lib/starter_web/assets/images/icons/controls/up.svg +1 -0
- data/lib/starter_web/assets/images/modules/attics/1920x1280/kelly-sikkemal.jpg +0 -0
- data/lib/starter_web/assets/images/modules/attics/1920x1280/kira-auf-der-heide.jpg +0 -0
- data/lib/starter_web/assets/images/modules/gallery/old_times/image_02.jpg +0 -0
- data/lib/starter_web/assets/images/posts/featured/post-1.jpg +0 -0
- data/lib/starter_web/assets/images/posts/featured/post-2.jpg +0 -0
- data/lib/starter_web/assets/images/posts/featured/post-3.jpg +0 -0
- data/lib/starter_web/assets/images/posts/featured/post-4.jpg +0 -0
- data/lib/starter_web/assets/images/posts/featured/post-5.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-1.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-10.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-11.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-12.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-13.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-2.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-3.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-4.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-5.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-6.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-7.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-8.jpg +0 -0
- data/lib/starter_web/assets/images/posts/natural_food/post-9.jpg +0 -0
- data/lib/starter_web/assets/images/posts/post-img.jpg +0 -0
- data/lib/starter_web/assets/images/posts/post-single.jpg +0 -0
- data/lib/starter_web/collections/_biography/a-life-in-questions.adoc +12 -8
- data/lib/starter_web/collections/_biography/becoming.adoc +11 -8
- data/lib/starter_web/collections/_biography/born-to-run.adoc +11 -8
- data/lib/starter_web/collections/_biography/forty-autumns.adoc +11 -7
- data/lib/starter_web/collections/_biography/not-dead-yet.adoc +11 -9
- data/lib/starter_web/collections/_biography/princess-diarist-the.adoc +11 -7
- data/lib/starter_web/collections/_biography/when-breath-becomes-air.adoc +12 -10
- data/lib/starter_web/collections/_fantasy/harry-potter-deathly-hallows.adoc +92 -0
- data/lib/starter_web/collections/_fantasy/harry-potter-philosophers-stone.adoc +92 -0
- data/lib/starter_web/collections/_fantasy/mistborn-trilogy.adoc +88 -0
- data/lib/starter_web/collections/_fantasy/ready-player-one.adoc +94 -0
- data/lib/starter_web/collections/_fantasy/sword-of-destiny.adoc +88 -0
- data/lib/starter_web/collections/_fantasy/terry-pratchet-diary-2017.adoc +86 -0
- data/lib/starter_web/collections/_people/diana-petersen.adoc +167 -0
- data/lib/starter_web/collections/_people/larry-parker.adoc +167 -0
- data/lib/starter_web/collections/_people/parveen-anand.adoc +167 -0
- data/lib/starter_web/collections/_portfolio/branding.adoc +97 -0
- data/lib/starter_web/collections/_portfolio/graphic_design.adoc +97 -0
- data/lib/starter_web/collections/_portfolio/identity.adoc +99 -0
- data/lib/starter_web/collections/_portfolio/illustration.adoc +101 -0
- data/lib/starter_web/collections/_portfolio/photography.adoc +100 -0
- data/lib/starter_web/collections/_portfolio/web_design.adoc +109 -0
- data/lib/starter_web/collections/_romance/breath-of-snow-and-ashes-a.adoc +95 -0
- data/lib/starter_web/collections/_romance/dressmaker-the.adoc +86 -0
- data/lib/starter_web/collections/_romance/fiery-cross-the.adoc +97 -0
- data/lib/starter_web/collections/_romance/it-ends-with-us.adoc +92 -0
- data/lib/starter_web/collections/_romance/outlander-novel.adoc +105 -0
- data/lib/starter_web/collections/_romance/virgins-outlander-short-story.adoc +92 -0
- data/lib/starter_web/collections/posts/public/featured/_posts/0000-00-00-welcome-to-j1.adoc.erb +49 -6
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-01-01-about-cookies.adoc +0 -13
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-02-01-static-site-generators.adoc +2 -2
- data/lib/starter_web/collections/posts/public/featured/_posts/_includes/attributes.asciidoc +2 -2
- data/lib/starter_web/collections/posts/public/series/_posts/2022-08-01-organize-your-life.adoc +118 -0
- data/lib/starter_web/collections/posts/public/series/_posts/2022-08-02-organize-your-life.adoc +118 -0
- data/lib/starter_web/collections/posts/public/series/_posts/2022-08-03-organize-your-life.adoc +118 -0
- data/lib/starter_web/collections/posts/public/series/_posts/2022-09-01-organize-your-life.adoc +117 -0
- data/lib/starter_web/collections/posts/public/series/_posts/2022-09-02-organize-your-life.adoc +117 -0
- data/lib/starter_web/dot.bundle/config +2 -0
- data/lib/starter_web/index.html +19 -4
- data/lib/starter_web/package.json +9 -9
- data/lib/starter_web/pages/public/about/site.adoc +2 -2
- data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/documentation.adoc +1 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/allview.html +1 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +1 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +1 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +1 -1
- data/lib/starter_web/pages/public/features/template.adoc +1 -1
- data/lib/starter_web/pages/public/learn/bookshelf/article_previewer/viewer_all_books.adoc +107 -0
- data/lib/starter_web/pages/public/learn/bookshelf/article_previewer/viewer_biography.adoc +98 -0
- data/lib/starter_web/pages/public/learn/bookshelf/article_previewer/viewer_fantasy.adoc +86 -0
- data/lib/starter_web/pages/public/learn/bookshelf/article_previewer/viewer_romance.adoc +87 -0
- data/lib/starter_web/pages/public/{bookshelf/whats_up.adoc → learn/bookshelf/jekyll_collections.adoc} +31 -23
- data/lib/starter_web/pages/public/learn/roundtrip/_includes/attributes.asciidoc +2 -2
- data/lib/starter_web/pages/public/learn/roundtrip/asciidoc_extensions.adoc +8 -4
- data/lib/starter_web/pages/public/learn/roundtrip/bootstrap_themes.adoc +21 -13
- data/lib/starter_web/pages/public/learn/roundtrip/icon_fonts.adoc +10 -1
- data/lib/starter_web/pages/public/learn/roundtrip/lunr_search.adoc +22 -5
- data/lib/starter_web/pages/public/learn/roundtrip/modal_extentions.adoc +14 -8
- data/lib/starter_web/pages/public/learn/roundtrip/present_images.adoc +61 -5
- data/lib/starter_web/pages/public/learn/roundtrip/present_videos.adoc +15 -3
- data/lib/starter_web/pages/public/learn/roundtrip/responsive_tables.adoc +13 -1
- data/lib/starter_web/pages/public/learn/roundtrip/typography.adoc +10 -3
- data/lib/starter_web/pages/public/panels/intro_panel/panel.adoc +4 -4
- data/lib/starter_web/pages/public/plans/plans.adoc +25 -12
- data/lib/starter_web/pages/public/previewer/preview_bootstrap_theme.adoc +117 -116
- data/lib/starter_web/utilsrv/_defaults/package.json +2 -2
- data/lib/starter_web/utilsrv/package.json +2 -2
- metadata +120 -38
- data/_layouts/paginator/readme +0 -2
- data/assets/themes/j1/modules/slick/css/slick.min.css +0 -15
- data/assets/themes/j1/modules/slick/js/slick.js +0 -2295
- data/lib/starter_web/assets/images/collections/blog/wikipedia/columbia-river.1200x400.jpg +0 -0
- data/lib/starter_web/assets/images/collections/blog/wikipedia/minneapolis.1200x400.jpg +0 -0
- data/lib/starter_web/assets/images/collections/blog/wikipedia/narcise-snake-pits.1200x400.jpg +0 -0
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-01-post-wiki-series.adoc +0 -144
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-02-post-wiki-series.adoc +0 -103
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-03-post-wiki-series.adoc +0 -117
- data/lib/starter_web/collections/posts/public/series/_posts/_includes/attributes.asciidoc +0 -44
- data/lib/starter_web/collections/posts/public/series/_posts/_includes/documents/readme +0 -0
- data/lib/starter_web/collections/posts/public/series/_posts/_includes/tables/readme +0 -0
- data/lib/starter_web/pages/public/bookshelf/viewer_biography.adoc +0 -58
- /data/_layouts/{paginator/autopage_tags.html → autopage_tags.html} +0 -0
- /data/assets/themes/j1/modules/slick/{LICENSE → slider/LICENSE} +0 -0
- /data/assets/themes/j1/modules/slick/{fonts → slider/fonts}/slick.eot +0 -0
- /data/assets/themes/j1/modules/slick/{fonts → slider/fonts}/slick.ttf +0 -0
- /data/assets/themes/j1/modules/slick/{fonts → slider/fonts}/slick.woff +0 -0
- /data/assets/themes/j1/modules/slick/{ajax-loader.gif → slider/images/ajax-loader.gif} +0 -0
- /data/assets/themes/j1/modules/slick/{js → slider/js}/slick.min.js +0 -0
- /data/lib/starter_web/assets/images/{collections/blog → posts}/featured/dynamic-web-access.png +0 -0
- /data/lib/starter_web/assets/images/{collections/blog → posts}/featured/jamstack-generators.png +0 -0
- /data/lib/starter_web/assets/images/{collections/blog → posts}/featured/jekyll.1200x400.png +0 -0
- /data/lib/starter_web/assets/images/{collections/blog → posts}/featured/jekyll.png +0 -0
- /data/lib/starter_web/assets/images/{collections/blog → posts}/featured/static-web-access.png +0 -0
@@ -21,6 +21,8 @@ regenerate: true
|
|
21
21
|
# {{ liquid_var | debug }}
|
22
22
|
# cookie_options: {{ cookie_options | debug }}
|
23
23
|
# -----------------------------------------------------------------------------
|
24
|
+
# See: https://github.com/kenwheeler/slick
|
25
|
+
# -----------------------------------------------------------------------------
|
24
26
|
{% endcomment %}
|
25
27
|
|
26
28
|
{% comment %} Liquid var initialization
|
@@ -28,22 +30,24 @@ regenerate: true
|
|
28
30
|
|
29
31
|
{% comment %} Set config files
|
30
32
|
-------------------------------------------------------------------------------- {% endcomment %}
|
31
|
-
{% assign environment
|
32
|
-
{% assign blocks
|
33
|
-
{% assign modules
|
34
|
-
{% assign template_config
|
33
|
+
{% assign environment = site.environment %}
|
34
|
+
{% assign blocks = site.data.blocks %}
|
35
|
+
{% assign modules = site.data.modules %}
|
36
|
+
{% assign template_config = site.data.j1_config %}
|
35
37
|
|
36
38
|
{% comment %} Set config data
|
37
39
|
-------------------------------------------------------------------------------- {% endcomment %}
|
40
|
+
{% assign slick_defaults = modules.defaults.slick.defaults %}
|
41
|
+
{% assign slick_settings = modules.slick.settings %}
|
42
|
+
{% assign slick_lightbox_defaults = modules.defaults.slick.defaults.lightbox %}
|
43
|
+
{% assign slick_lightbox_settings = modules.slick.settings.lightbox %}
|
38
44
|
|
39
45
|
{% comment %} Set config options
|
40
46
|
-------------------------------------------------------------------------------- {% endcomment %}
|
41
47
|
|
42
|
-
|
43
48
|
{% comment %} Set variables
|
44
49
|
-------------------------------------------------------------------------------- {% endcomment %}
|
45
50
|
|
46
|
-
|
47
51
|
{% comment %} Detect prod mode
|
48
52
|
-------------------------------------------------------------------------------- {% endcomment %}
|
49
53
|
{% assign production = false %}
|
@@ -76,10 +80,20 @@ regenerate: true
|
|
76
80
|
// -----------------------------------------------------------------------------
|
77
81
|
'use strict';
|
78
82
|
j1.adapter.slick = (function (j1, window) {
|
79
|
-
var environment
|
83
|
+
var environment = '{{environment}}';
|
84
|
+
var responsiveSettings = [];
|
85
|
+
var carouselResponsiveSettings = [];
|
80
86
|
var _this;
|
81
87
|
var logger;
|
82
88
|
var logText;
|
89
|
+
var slickDefaults;
|
90
|
+
var slickSettings;
|
91
|
+
var slickLightboxDefaults;
|
92
|
+
var slickLightboxSettings;
|
93
|
+
var slickLightboxOptions;
|
94
|
+
var slickOptions;
|
95
|
+
var carouselOptions;
|
96
|
+
var carouselSettings;
|
83
97
|
|
84
98
|
// ---------------------------------------------------------------------------
|
85
99
|
// Helper functions
|
@@ -94,25 +108,51 @@ j1.adapter.slick = (function (j1, window) {
|
|
94
108
|
// Initializer
|
95
109
|
// -------------------------------------------------------------------------
|
96
110
|
init: function (options) {
|
111
|
+
var xhrLoadState = 'pending'; // (initial) load state for the HTML portion of the carousel
|
112
|
+
var load_dependencies = {}; // dynamic variable
|
113
|
+
var carouselResponsiveSettingsOBJ = {}; // initial object for responsive settings
|
114
|
+
var reload_on_resize = false;
|
115
|
+
var dependency;
|
116
|
+
var carouselResponsiveSettingsYAML;
|
117
|
+
var carouselResponsiveSettingsSTRING;
|
118
|
+
var slick_lightbox_enabled;
|
97
119
|
|
98
120
|
// -----------------------------------------------------------------------
|
99
121
|
// Default module settings
|
100
122
|
// -----------------------------------------------------------------------
|
101
|
-
var settings
|
123
|
+
var settings = $.extend({
|
102
124
|
module_name: 'j1.adapter.cookieConsent',
|
103
125
|
generated: '{{site.time}}'
|
104
126
|
}, options);
|
105
127
|
|
128
|
+
// Load module DEFAULTS|CONFIG
|
129
|
+
slickDefaults = $.extend({}, {{slick_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
130
|
+
slickSettings = $.extend({}, {{slick_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
|
131
|
+
slickLightboxDefaults = $.extend({}, {{slick_lightbox_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
132
|
+
slickLightboxSettings = $.extend({}, {{slick_lightbox_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
|
133
|
+
slickLightboxOptions = $.extend(true, {}, slickLightboxDefaults, slickLightboxSettings);
|
134
|
+
slickOptions = $.extend(true, {}, slickDefaults, slickSettings);
|
135
|
+
|
106
136
|
// -----------------------------------------------------------------------
|
107
137
|
// Global variable settings
|
108
138
|
// -----------------------------------------------------------------------
|
109
139
|
_this = j1.adapter.slick;
|
110
140
|
logger = log4javascript.getLogger('j1.adapter.slick');
|
111
141
|
|
142
|
+
_this.setState('started');
|
143
|
+
logger.debug('\n' + 'state: ' + _this.getState());
|
144
|
+
logger.info('\n' + 'module is being initialized');
|
112
145
|
|
113
|
-
|
114
|
-
|
146
|
+
// load HTML portion for all carousels
|
147
|
+
console.debug('loading HTML portion for all carousels configured');
|
148
|
+
_this.loadCarouselHTML(slickOptions, slickOptions.carousels);
|
115
149
|
|
150
|
+
// Re-Init all carousels in a page if window is resized (if enabled)
|
151
|
+
if (reload_on_resize) {
|
152
|
+
window.onresize = function() {
|
153
|
+
location.reload();
|
154
|
+
}
|
155
|
+
}
|
116
156
|
|
117
157
|
// -----------------------------------------------------------------------
|
118
158
|
// initializer
|
@@ -120,56 +160,261 @@ j1.adapter.slick = (function (j1, window) {
|
|
120
160
|
var dependencies_met_page_ready = setInterval (function (options) {
|
121
161
|
var pageState = $('#no_flicker').css("display");
|
122
162
|
var pageVisible = (pageState == 'block') ? true: false;
|
163
|
+
|
123
164
|
if ( j1.getState() === 'finished' && pageVisible ) {
|
124
165
|
|
125
|
-
|
126
|
-
logger.
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
166
|
+
{% for carousel in slick_settings.carousels %} {% if carousel.enabled %}
|
167
|
+
logger.info('\n' + 'carousel is being initialized on id: ' + '{{carousel.id}}');
|
168
|
+
|
169
|
+
{% if carousel.options.responsive %}
|
170
|
+
logger.info('\n' + 'collect responsive settings for carousel on id: ' + '{{carousel.id}}');
|
171
|
+
// collect breakpoint settings from carousel config
|
172
|
+
responsiveSettings = $.extend({}, {{carousel.responsive | replace: 'nil', 'null' | replace: '=>', ':' }});
|
173
|
+
// generate carousel breakpoint settings as YAML data structure
|
174
|
+
carouselResponsiveSettings = '[' ;
|
175
|
+
for (const [obj_key, obj_value] of Object.entries(responsiveSettings)) {
|
176
|
+
var length = Object.keys(obj_value.settings).length;
|
177
|
+
var count = 0;
|
178
|
+
for (const [key, value] of Object.entries(obj_value.settings)) {
|
179
|
+
count++;
|
180
|
+
if (key == 'breakOn' && count == 1) {
|
181
|
+
carouselResponsiveSettings += ' {' ;
|
182
|
+
carouselResponsiveSettings += ' breakpoint: ' + value + ',' ;
|
183
|
+
carouselResponsiveSettings += ' settings: {' ;
|
184
|
+
} else {
|
185
|
+
carouselResponsiveSettings += ' ' + key + ': ' + value + ',' ;
|
186
|
+
}
|
187
|
+
// close current breakpoint element
|
188
|
+
if (count == length) {
|
189
|
+
carouselResponsiveSettings += ' }' ;
|
190
|
+
carouselResponsiveSettings += ' },' ;
|
191
|
+
}
|
192
|
+
}
|
193
|
+
} // End generate breakpoint YAML elements
|
194
|
+
|
195
|
+
// close breakpoint YAML data
|
196
|
+
carouselResponsiveSettings += ']';
|
197
|
+
{% endif %}
|
198
|
+
|
199
|
+
// create dynamic loader variable|s
|
200
|
+
dependency = 'dependencies_met_html_loaded_{{carousel.id}}';
|
201
|
+
load_dependencies[dependency] = '';
|
202
|
+
|
203
|
+
// initialize carousel if HTML portion successfully loaded
|
204
|
+
load_dependencies['dependencies_met_html_loaded_{{carousel.id}}'] = setInterval (function (options) {
|
205
|
+
// check if HTML portion of the carousel is loaded successfully (loadcarouselHTML)
|
206
|
+
xhrLoadState = j1.xhrDOMState['#{{carousel.id}}_parent'];
|
207
|
+
if ( xhrLoadState === 'success' ) {
|
208
|
+
|
209
|
+
// collect general carousel settings
|
210
|
+
carouselOptions = $.extend({}, {{carousel.options | replace: 'nil', 'null' | replace: '=>', ':' }});
|
211
|
+
carouselSettings = $.extend(true, {}, slickDefaults, carouselOptions );
|
212
|
+
|
213
|
+
// convert carousel responsive settings to object (carouselResponsiveSettingsOBJ)
|
214
|
+
carouselResponsiveSettingsYAML = yaml.loadAll(carouselResponsiveSettings, 'utf8');
|
215
|
+
carouselResponsiveSettingsOBJ = carouselResponsiveSettingsYAML[0];
|
216
|
+
carouselResponsiveSettingsSTRING = JSON.stringify(carouselResponsiveSettingsOBJ, null, 4);
|
217
|
+
logger.debug('\n' + 'responsive settings on carousel id #{{carousel.id}}: ' + '\n' + carouselResponsiveSettingsSTRING);
|
218
|
+
|
219
|
+
$('.{{carousel.id | replace: '_','-' }}').on('init', function(event, slick) {
|
220
|
+
logger.info('\n' + 'carousel initialized on id: {{carousel.id}}');
|
221
|
+
|
222
|
+
slick_lightbox_enabled = '{{carousel.lightbox.enabled}}';
|
223
|
+
|
224
|
+
// check if a lightbox is used|enabled
|
225
|
+
if ( slick_lightbox_enabled !== '' && slick_lightbox_enabled == 'true' ) {
|
226
|
+
slick_lightbox_enabled = true;
|
227
|
+
} else {
|
228
|
+
slick_lightbox_enabled = false;
|
146
229
|
}
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
230
|
+
|
231
|
+
if (slick_lightbox_enabled) {
|
232
|
+
logger.info('\n' + 'initialize lightbox on id: {{carousel.id}}');
|
233
|
+
|
234
|
+
// See: http://mreq.github.io/slick-lightbox/demo/
|
235
|
+
$('#{{carousel.id}}').slickLightbox({
|
236
|
+
caption: slickLightboxOptions.caption,
|
237
|
+
useHistoryApi: slickLightboxOptions.useHistoryApi,
|
238
|
+
background: slickLightboxOptions.background,
|
239
|
+
closeOnEscape: slickLightboxOptions.closeOnEscape,
|
240
|
+
closeOnBackdropClick: slickLightboxOptions.closeOnBackdropClick,
|
241
|
+
navigateByKeyboard: slickLightboxOptions.navigateByKeyboard,
|
242
|
+
destroyTimeout: slickLightboxOptions.destroyTimeout,
|
243
|
+
imageMaxHeight: slickLightboxOptions.imageMaxHeight,
|
244
|
+
lazy: slickLightboxOptions.lazy,
|
245
|
+
});
|
246
|
+
} // END carousel lightbox enabled
|
247
|
+
|
248
|
+
logger.info('\n' + 'adjust positions of arrows on id: {{carousel.id}}');
|
249
|
+
var buttons = $("#{{carousel.id}} > button");
|
250
|
+
|
251
|
+
// recalculate right arrow position based on gutter settings
|
252
|
+
//
|
253
|
+
var percentage_right = 3 + carouselSettings.gutters;
|
254
|
+
$.each($(buttons), function(index, button) {
|
255
|
+
if (button.textContent.includes("Next")) {
|
256
|
+
$(button).attr('style','right: ' + percentage_right + '%');
|
257
|
+
}
|
258
|
+
});
|
259
|
+
|
260
|
+
// add CSS style for individual top position for all carousels
|
261
|
+
//
|
262
|
+
if ($('#{{carousel.id}}_caption')) {
|
263
|
+
logger.info('\n' + 'adjust top position of arrows on id: {{carousel.id}}');
|
264
|
+
var buttons = $("#{{carousel.id}} > button");
|
265
|
+
$.each($(buttons), function(index, button) {
|
266
|
+
$(button).addClass('slick-arrow-{{carousel.id}}');
|
267
|
+
});
|
152
268
|
}
|
269
|
+
|
270
|
+
}); // END on carousel init
|
271
|
+
|
272
|
+
function debounce(callback, timeout = 300) {
|
273
|
+
let timer;
|
274
|
+
var buttons = $("#{{carousel.id}} > button");
|
275
|
+
|
276
|
+
$.each($(buttons), function(index, button) {
|
277
|
+
$(button).addClass('slick-arrow-{{carousel.id}}');
|
278
|
+
});
|
279
|
+
|
280
|
+
return (...args) => {
|
281
|
+
clearTimeout(timer);
|
282
|
+
timer = setTimeout(() => { callback.apply(this, args); }, timeout);
|
283
|
+
};
|
153
284
|
}
|
154
|
-
]
|
155
|
-
});
|
156
285
|
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
286
|
+
// calculate individual arrow positions for all carousels
|
287
|
+
//
|
288
|
+
function positionSlickArrows (e) {
|
289
|
+
var dependencies_met_page_ready = setInterval (function (options) {
|
290
|
+
var pageState = $('#no_flicker').css('display');
|
291
|
+
var pageVisible = (pageState == 'block') ? true: false;
|
292
|
+
var slideImageHeight;
|
293
|
+
if ( j1.getState() === 'finished' && pageVisible ) {
|
294
|
+
const carousel_type = '{{carousel.type}}';
|
295
|
+
const $slick = $('.{{carousel.id | replace: '_','-' }}');
|
296
|
+
const $slides = $slick.find('.slick-slide');
|
297
|
+
const $currentSlide = $slides.filter((index, slide) => $(slide).hasClass('slick-current'));
|
298
|
+
|
299
|
+
if (carousel_type == 'example') {
|
300
|
+
slideImageHeight = ($currentSlide.find('{{carousel.style}}').height() / 2) - 25;
|
301
|
+
} else {
|
302
|
+
slideImageHeight = ($currentSlide.find('img').height() / 2) - 20;
|
303
|
+
}
|
304
|
+
|
305
|
+
logger.info('\n' + 'adjust top arrow position (centered) by ' + slideImageHeight + ' on id: {{carousel.id}}');
|
306
|
+
$('.slick-arrow-{{carousel.id}}').css('top', slideImageHeight + 'px');
|
307
|
+
clearInterval(dependencies_met_page_ready);
|
308
|
+
}
|
309
|
+
}, 25);
|
310
|
+
}
|
311
|
+
|
312
|
+
// set individual arrow positions for a carousel
|
313
|
+
//
|
314
|
+
$('.{{carousel.id | replace: '_','-' }}').on('init afterChange', positionSlickArrows);
|
315
|
+
|
316
|
+
// setup the carousel
|
317
|
+
logger.info('\n' + 'carousel is being setup on id: ' + '{{carousel.id}}');
|
318
|
+
$('.{{carousel.id | replace: '_','-' }}').slick({
|
319
|
+
accessibility: carouselSettings.accessibility,
|
320
|
+
adaptiveHeight: carouselSettings.adaptiveHeight,
|
321
|
+
arrows: carouselSettings.arrows,
|
322
|
+
autoplay: carouselSettings.autoplay,
|
323
|
+
autoplaySpeed: carouselSettings.autoplaySpeed,
|
324
|
+
centerMode: carouselSettings.centerMode,
|
325
|
+
centerPadding: carouselSettings.centerPadding,
|
326
|
+
cssEase: carouselSettings.cssEase,
|
327
|
+
dots: carouselSettings.dots,
|
328
|
+
dotsClass: carouselSettings.dotsClass,
|
329
|
+
draggable: carouselSettings.draggable,
|
330
|
+
easing: carouselSettings.easing,
|
331
|
+
edgeFriction: carouselSettings.edgeFriction,
|
332
|
+
fade: carouselSettings.fade,
|
333
|
+
focusOnSelect: carouselSettings.focusOnSelect,
|
334
|
+
focusOnChange: carouselSettings.focusOnChange,
|
335
|
+
infinite: carouselSettings.infinite,
|
336
|
+
initialSlide: carouselSettings.initialSlide,
|
337
|
+
lazyLoad: carouselSettings.lazyLoad,
|
338
|
+
mobileFirst: carouselSettings.mobileFirst,
|
339
|
+
pauseOnDotsHover: carouselSettings.pauseOnDotsHover,
|
340
|
+
pauseOnFocus: carouselSettings.pauseOnFocus,
|
341
|
+
pauseOnHover: carouselSettings.pauseOnHover,
|
342
|
+
respondTo: carouselSettings.respondTo,
|
343
|
+
rows: carouselSettings.rows,
|
344
|
+
rtl: carouselSettings.rtl,
|
345
|
+
slide: carouselSettings.slide,
|
346
|
+
slidesPerRow: carouselSettings.slidesPerRow,
|
347
|
+
slidesToScroll: carouselSettings.slidesToScroll,
|
348
|
+
slidesToShow: carouselSettings.slidesToShow,
|
349
|
+
speed: carouselSettings.speed,
|
350
|
+
swipe: carouselSettings.swipe,
|
351
|
+
swipeToSlide: carouselSettings.swipeToSlide,
|
352
|
+
touchMove: carouselSettings.touchMove,
|
353
|
+
touchThreshold: carouselSettings.touchThreshold,
|
354
|
+
useCSS: carouselSettings.useCSS,
|
355
|
+
useTransform: carouselSettings.useTransform,
|
356
|
+
variableWidth: carouselSettings.variableWidth,
|
357
|
+
vertical: carouselSettings.vertical,
|
358
|
+
verticalSwiping: carouselSettings.verticalSwiping,
|
359
|
+
waitForAnimate: carouselSettings.waitForAnimate,
|
360
|
+
zIndex: carouselSettings.zIndex,
|
361
|
+
responsive: carouselResponsiveSettingsOBJ
|
362
|
+
});
|
363
|
+
|
364
|
+
// NOT issued correctly (disabled for now)
|
365
|
+
// $(window).resize(debounce(positionSlickArrows, 100));
|
366
|
+
|
367
|
+
clearInterval(load_dependencies['dependencies_met_html_loaded_{{carousel.id}}']);
|
368
|
+
}
|
369
|
+
}, 25); // END
|
370
|
+
{% endif %} {% endfor %} // ENDFOR (all) carousels
|
161
371
|
|
162
372
|
_this.setState('finished');
|
163
373
|
logger.debug('\n' + 'state: ' + _this.getState());
|
164
374
|
logger.info('\n' + 'module initialization finished');
|
165
375
|
|
166
376
|
clearInterval(dependencies_met_page_ready);
|
167
|
-
|
168
377
|
}
|
169
378
|
}, 25);
|
170
379
|
|
171
380
|
}, // END init
|
172
381
|
|
382
|
+
// -------------------------------------------------------------------------
|
383
|
+
// loadcarouselHTML()
|
384
|
+
// load all Slick carousels (HTML portion) dynanically configured
|
385
|
+
// and enabled (AJAX) from YAMLdata file
|
386
|
+
// NOTE: Make sure the placeholder is available in the content page
|
387
|
+
// eg. using the asciidoc extension mastercarousel::
|
388
|
+
// -------------------------------------------------------------------------
|
389
|
+
loadCarouselHTML: function (options, carousel) {
|
390
|
+
var numcarousels = Object.keys(carousel).length;
|
391
|
+
var active_carousels = numcarousels;
|
392
|
+
var xhr_data_path = options.xhr_data_path + '/index.html';
|
393
|
+
var xhr_container_id;
|
394
|
+
|
395
|
+
// console.debug('load HTML portion of all carousels configured found in page');
|
396
|
+
console.debug('number of carousels found: ' + numcarousels);
|
397
|
+
|
398
|
+
_this.setState('load_data');
|
399
|
+
Object.keys(carousel).forEach(function(key) {
|
400
|
+
if (carousel[key].enabled) {
|
401
|
+
xhr_container_id = carousel[key].id + '_parent';
|
402
|
+
|
403
|
+
console.debug('load HTML data on carousel id: ' + carousel[key].id);
|
404
|
+
j1.loadHTML({
|
405
|
+
xhr_container_id: xhr_container_id,
|
406
|
+
xhr_data_path: xhr_data_path,
|
407
|
+
xhr_data_element: carousel[key].id
|
408
|
+
});
|
409
|
+
} else {
|
410
|
+
console.debug('carousel found disabled on id: ' + carousel[key].id);
|
411
|
+
active_carousels--;
|
412
|
+
}
|
413
|
+
});
|
414
|
+
console.debug('carousels loaded in page enabled|all: ' + active_carousels + '|' + numcarousels);
|
415
|
+
_this.setState('data_loaded');
|
416
|
+
}, // END loadcarouselHTML
|
417
|
+
|
173
418
|
// -------------------------------------------------------------------------
|
174
419
|
// messageHandler: MessageHandler for J1 CookieConsent module
|
175
420
|
// Manage messages send from other J1 modules
|
@@ -217,5 +462,9 @@ j1.adapter.slick = (function (j1, window) {
|
|
217
462
|
})(j1, window);
|
218
463
|
|
219
464
|
{% endcapture %}
|
220
|
-
{
|
465
|
+
{% if production %}
|
466
|
+
{{ cache | minifyJS }}
|
467
|
+
{% else %}
|
468
|
+
{{ cache | strip_empty_lines }}
|
469
|
+
{% endif %}
|
221
470
|
{% assign cache = nil %}
|
@@ -52,6 +52,10 @@ regenerate: true
|
|
52
52
|
|
53
53
|
{% assign toccer_defaults = modules.defaults.toccer.defaults %}
|
54
54
|
{% assign toccer_settings = modules.toccer.settings %}
|
55
|
+
|
56
|
+
{% assign scroller_defaults = modules.defaults.scroller.defaults %}
|
57
|
+
{% assign scroller_settings = modules.scroller.settings %}
|
58
|
+
|
55
59
|
{% assign footer_config = modules.j1_footer %}
|
56
60
|
{% assign footer_id = modules.j1_footer.global.id %}
|
57
61
|
|
@@ -65,8 +69,6 @@ regenerate: true
|
|
65
69
|
{% if environment == 'prod' or environment == 'production' %}
|
66
70
|
{% assign production = true %}
|
67
71
|
{% endif %}
|
68
|
-
|
69
|
-
|
70
72
|
/*
|
71
73
|
# -----------------------------------------------------------------------------
|
72
74
|
# ~/assets/themes/j1/adapter/js/toccer.js
|
@@ -98,10 +100,13 @@ j1.adapter.toccer = (function () {
|
|
98
100
|
{% comment %} Set global variables
|
99
101
|
------------------------------------------------------------------------------ {% endcomment %}
|
100
102
|
var environment = '{{environment}}';
|
101
|
-
var
|
102
|
-
var
|
103
|
-
var
|
104
|
-
var
|
103
|
+
var scrollerSettings = {};
|
104
|
+
var scrollerOptions = {};
|
105
|
+
var scrollerDefaults = {};
|
106
|
+
var toccerDefaults = {};
|
107
|
+
var toccerSettings = {};
|
108
|
+
var toccerOptions = {};
|
109
|
+
var frontmatterOptions = {};
|
105
110
|
var _this;
|
106
111
|
var logger;
|
107
112
|
var logText;
|
@@ -131,16 +136,21 @@ j1.adapter.toccer = (function () {
|
|
131
136
|
// -----------------------------------------------------------------------
|
132
137
|
// Global variable settings
|
133
138
|
// -----------------------------------------------------------------------
|
134
|
-
_this
|
135
|
-
logger
|
139
|
+
_this = j1.adapter.toccer;
|
140
|
+
logger = log4javascript.getLogger('j1.adapter.toccer');
|
136
141
|
|
137
142
|
// create settings object from frontmatter
|
138
143
|
frontmatterOptions = options != null ? $.extend({}, options) : {};
|
139
144
|
|
140
|
-
// Load
|
141
|
-
toccerDefaults
|
142
|
-
toccerSettings
|
143
|
-
toccerOptions
|
145
|
+
// Load module DEFAULTS|CONFIG
|
146
|
+
toccerDefaults = $.extend({}, {{toccer_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
147
|
+
toccerSettings = $.extend({}, {{toccer_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
|
148
|
+
toccerOptions = $.extend(true, {}, toccerDefaults, toccerSettings, frontmatterOptions);
|
149
|
+
|
150
|
+
// Load scroller module DEFAULTS|CONFIG
|
151
|
+
scrollerDefaults = $.extend({}, {{scroller_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
152
|
+
scrollerSettings = $.extend({}, {{scroller_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
|
153
|
+
scrollerOptions = $.extend(true, {}, scrollerDefaults, scrollerSettings);
|
144
154
|
|
145
155
|
// initialize state flag
|
146
156
|
_this.setState('started');
|
@@ -152,7 +162,9 @@ j1.adapter.toccer = (function () {
|
|
152
162
|
|
153
163
|
if (j1.stringToBoolean(toccerOptions.toc)) {
|
154
164
|
var dependencies_met_navigator = setInterval(function() {
|
155
|
-
|
165
|
+
var pageState = $('#no_flicker').css("display");
|
166
|
+
var pageVisible = (pageState == 'block') ? true: false;
|
167
|
+
if ( j1.getState() == 'finished' && pageVisible ) {
|
156
168
|
_this.initToccerCore(toccerOptions);
|
157
169
|
_this.setState('finished');
|
158
170
|
|
@@ -169,7 +181,8 @@ j1.adapter.toccer = (function () {
|
|
169
181
|
// Initialize the toccer on page
|
170
182
|
// -------------------------------------------------------------------------
|
171
183
|
initToccerCore: function (options) {
|
172
|
-
var
|
184
|
+
var scrollOffsetCorrection = scrollerOptions.smoothscroll.offsetCorrection;
|
185
|
+
var scrollOffset = j1.getScrollOffset(scrollOffsetCorrection);
|
173
186
|
|
174
187
|
_this.setState('running');
|
175
188
|
logger.debug('\n' + 'state: ' + _this.getState());
|
@@ -72,6 +72,8 @@ regenerate: true
|
|
72
72
|
# J1 Theme is licensed under the MIT License.
|
73
73
|
# For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
|
74
74
|
# -----------------------------------------------------------------------------
|
75
|
+
# NOTE: Wave styles defind in /assets/data/panel.html, key 'wave'
|
76
|
+
# -----------------------------------------------------------------------------
|
75
77
|
# Adapter generated: {{site.time}}
|
76
78
|
# -----------------------------------------------------------------------------
|
77
79
|
*/
|
@@ -133,7 +135,7 @@ var logText;
|
|
133
135
|
// create settings object from module options
|
134
136
|
waveDefaults = $.extend({}, {{wave_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
135
137
|
waveSettings = $.extend({}, {{wave_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
|
136
|
-
waveOptions
|
138
|
+
waveOptions = $.extend(true, {}, waveDefaults, waveSettings, frontmatterOptions);
|
137
139
|
|
138
140
|
_this = j1.adapter.waves;
|
139
141
|
theme = user_state.theme_name;
|