j1-template 2022.0.8 → 2022.0.12
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/modules/ads/google_ad_content_home.html +11 -0
- data/_includes/themes/j1/modules/ads/google_ad_top_home.html +11 -0
- data/apps/public/cc/index.adoc +0 -1
- data/assets/data/article_navigator/index.html +0 -1
- data/assets/data/news_panel_posts/index.html +0 -1
- data/assets/error_pages/HTTP445.html +5 -4
- data/assets/error_pages/HTTP446.html +3 -3
- data/assets/error_pages/HTTP447.html +110 -0
- data/assets/error_pages/HTTP448.html +111 -0
- data/assets/themes/j1/adapter/js/advertising.js +413 -0
- data/assets/themes/j1/adapter/js/algolia.js +1 -4
- data/assets/themes/j1/adapter/js/analytics.js +237 -0
- data/assets/themes/j1/adapter/js/asciidoctor.js +1 -4
- data/assets/themes/j1/adapter/js/attic.js +1 -4
- data/assets/themes/j1/adapter/js/bmd.js +1 -4
- data/assets/themes/j1/adapter/js/carousel.js +1 -4
- data/assets/themes/j1/adapter/js/clipboard.js +1 -2
- data/assets/themes/j1/adapter/js/comments.js +386 -0
- data/assets/themes/j1/adapter/js/cookieConsent.js +84 -51
- data/assets/themes/j1/adapter/js/fab.js +1 -1
- data/assets/themes/j1/adapter/js/framer.js +1 -7
- data/assets/themes/j1/adapter/js/j1.js +125 -208
- data/assets/themes/j1/adapter/js/justifiedGallery.js +1 -4
- data/assets/themes/j1/adapter/js/justifiedGalleryCustomizer.js +1 -4
- data/assets/themes/j1/adapter/js/lightbox.js +1 -5
- data/assets/themes/j1/adapter/js/logger.js +1 -2
- data/assets/themes/j1/adapter/js/mmenu.js +2 -3
- data/assets/themes/j1/adapter/js/navigator.js +4 -3
- data/assets/themes/j1/adapter/js/quicksearch.js +1 -4
- data/assets/themes/j1/adapter/js/rouge.js +2 -5
- data/assets/themes/j1/adapter/js/rtable.js +1 -4
- data/assets/themes/j1/adapter/js/rtextResizer.js +1 -4
- data/assets/themes/j1/adapter/js/scroller.js +2 -5
- data/assets/themes/j1/adapter/js/themer.js +1 -1
- data/assets/themes/j1/adapter/js/toccer.js +1 -4
- data/assets/themes/j1/adapter/js/translator.js +79 -124
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.css +6 -0
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.min.css +1 -1
- data/assets/themes/j1/core/js/template.js +13 -5
- data/assets/themes/j1/core/js/template.min.js +1 -1
- data/assets/themes/j1/core/js/template.min.js.map +1 -1
- data/assets/themes/j1/modules/advertising/js/google/adInitializer.js +117 -0
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js +11 -2
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js +1 -1
- data/assets/themes/j1/modules/deeplAPI/js/deeplAPI.2.js +1 -1
- data/assets/themes/j1/modules/deeplAPI/js/deeplAPI.js +1 -1
- data/assets/themes/j1/modules/scroller/js/scroller.js +1 -1
- data/assets/themes/j1/modules/translator/js/translator.js +1 -1
- data/assets/themes/j1/modules/translator/js/translator.min.js +1 -1
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/_config.yml +1 -13
- data/lib/starter_web/_data/apps/carousel.yml +2 -2
- data/lib/starter_web/_data/apps/defaults/carousel.yml +3 -2
- data/lib/starter_web/_data/apps/defaults/justifiedGallery.yml +2 -2
- data/lib/starter_web/_data/apps/defaults/justifiedGalleryCustomizer.yml +2 -2
- data/lib/starter_web/_data/apps/defaults/lightGallery.yml +2 -2
- data/lib/starter_web/_data/apps/defaults/lightbox.yml +2 -2
- data/lib/starter_web/_data/apps/justifiedGallery.yml +2 -2
- data/lib/starter_web/_data/apps/justifiedGalleryCustomizer.yml +2 -2
- data/lib/starter_web/_data/apps/lightGallery.yml +2 -2
- data/lib/starter_web/_data/apps/lightbox.yml +2 -2
- data/lib/starter_web/_data/blocks/banner.yml +3 -2
- data/lib/starter_web/_data/blocks/defaults/banner.yml +9 -0
- data/lib/starter_web/_data/blocks/defaults/footer.yml +9 -0
- data/lib/starter_web/_data/blocks/defaults/panel.yml +9 -0
- data/lib/starter_web/_data/blocks/footer.yml +3 -2
- data/lib/starter_web/_data/blocks/panel.yml +3 -2
- data/lib/starter_web/_data/builder/blog_navigator.yml +3 -2
- data/lib/starter_web/_data/builder/defaults/blog_navigator.yml +8 -8
- data/lib/starter_web/_data/j1_config.yml +0 -116
- data/lib/starter_web/_data/layouts/default.yml +21 -21
- data/lib/starter_web/_data/layouts/home.yml +24 -0
- data/lib/starter_web/_data/layouts/page.yml +7 -18
- data/lib/starter_web/_data/layouts/post.yml +0 -11
- data/lib/starter_web/_data/modules/advertising.yml +140 -12
- data/lib/starter_web/_data/modules/analytics.yml +99 -0
- data/lib/starter_web/_data/modules/attics.yml +3 -2
- data/lib/starter_web/_data/modules/comments.yml +55 -0
- data/lib/starter_web/_data/modules/cookieconsent.yml +2 -1
- data/lib/starter_web/_data/modules/cookies.yml +3 -1
- data/lib/starter_web/_data/modules/defaults/advertising.yml +106 -0
- data/lib/starter_web/_data/modules/defaults/analytics.yml +93 -0
- data/lib/starter_web/_data/modules/defaults/attics.yml +3 -2
- data/lib/starter_web/_data/modules/defaults/authentication.yml +51 -48
- data/lib/starter_web/_data/modules/defaults/comments.yml +114 -0
- data/lib/starter_web/_data/modules/defaults/cookieconsent.yml +3 -3
- data/lib/starter_web/_data/modules/defaults/cookies.yml +39 -19
- data/lib/starter_web/_data/modules/defaults/fab.yml +4 -2
- data/lib/starter_web/_data/modules/defaults/framer.yml +2 -3
- data/lib/starter_web/_data/modules/defaults/log4javascript.yml +3 -2
- data/lib/starter_web/_data/modules/defaults/log4r.yml +2 -2
- data/lib/starter_web/_data/modules/defaults/navigator.yml +4 -2
- data/lib/starter_web/_data/modules/defaults/quicksearch.yml +4 -3
- data/lib/starter_web/_data/modules/defaults/rtable.yml +3 -2
- data/lib/starter_web/_data/modules/defaults/scoller.yml +3 -2
- data/lib/starter_web/_data/modules/defaults/themer.yml +119 -118
- data/lib/starter_web/_data/modules/defaults/toccer.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/translator.yml +1 -1
- data/lib/starter_web/_data/modules/fab.yml +3 -2
- data/lib/starter_web/_data/modules/framer.yml +3 -4
- data/lib/starter_web/_data/modules/log4r.yml +2 -2
- data/lib/starter_web/_data/modules/navigator.yml +4 -2
- data/lib/starter_web/_data/modules/quicksearch.yml +3 -3
- data/lib/starter_web/_data/modules/rtable.yml +3 -3
- data/lib/starter_web/_data/modules/scroller.yml +2 -3
- data/lib/starter_web/_data/modules/themer.yml +2 -3
- data/lib/starter_web/_data/modules/toccer.yml +3 -3
- data/lib/starter_web/_data/modules/translator.yml +1 -1
- data/lib/starter_web/_data/plugins/defaults/paginator.yml +2 -2
- data/lib/starter_web/_data/plugins/paginator.yml +2 -2
- data/lib/starter_web/_data/resources.yml +447 -290
- data/lib/starter_web/_includes/attributes.asciidoc +1 -1
- data/lib/starter_web/_includes/themes/j1/modules/ads/google_ad_content_home.html +11 -0
- data/lib/starter_web/_includes/themes/j1/modules/ads/google_ad_top_home.html +11 -0
- data/lib/starter_web/_plugins/lunr_index.rb +1 -1
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-01-01-about-cookies.ads.asciidoc +196 -0
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-01-01-about-cookies.comments.asciidoc +182 -0
- data/lib/starter_web/index.html +0 -1
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/documentation.adoc +0 -1
- data/lib/starter_web/pages/public/asciidoc_skeletons/multi-document/multi.adoc +0 -1
- data/lib/starter_web/pages/public/asciidoc_skeletons/simple-document/simple.adoc +0 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +0 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +0 -1
- data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +0 -1
- data/lib/starter_web/pages/public/blog/navigator/archive.html +0 -1
- data/lib/starter_web/pages/public/blog/navigator/index.html +0 -1
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.adoc +4 -3
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.ads.asciidoc +265 -0
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.base.asciidoc +237 -0
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.comments.asciidoc +237 -0
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_videos.adoc +62 -0
- data/lib/starter_web/pages/public/learn/roundtrip/_includes/google-ad.js +130 -0
- data/lib/starter_web/pages/public/legal/en/100_copyright.adoc +0 -1
- data/lib/starter_web/pages/public/legal/en/200_impress.adoc +0 -1
- data/lib/starter_web/pages/public/legal/en/400_comment_policy.adoc +0 -1
- data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
- data/lib/starter_web/utilsrv/package.json +1 -1
- metadata +23 -70
- data/_includes/themes/j1/blocks/ads/ad.html +0 -64
- data/_includes/themes/j1/modules/boards/news_pin_board.html +0 -183
- data/_includes/themes/j1/modules/connectors/ad/custom-provider.html +0 -30
- data/_includes/themes/j1/modules/connectors/ad/google-adsense.html +0 -62
- data/_includes/themes/j1/modules/connectors/ads +0 -56
- data/_includes/themes/j1/modules/connectors/analytic/custom-provider.html +0 -32
- data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html +0 -30
- data/_includes/themes/j1/modules/connectors/analytics +0 -60
- data/_includes/themes/j1/modules/connectors/comment/commento.html +0 -31
- data/_includes/themes/j1/modules/connectors/comment/custom-provider.html +0 -30
- data/_includes/themes/j1/modules/connectors/comment/disqus.html +0 -32
- data/_includes/themes/j1/modules/connectors/comment/facebook.html +0 -30
- data/_includes/themes/j1/modules/connectors/comment/hyvor.html +0 -32
- data/_includes/themes/j1/modules/connectors/comment/just-comments.html +0 -31
- data/_includes/themes/j1/modules/connectors/comments +0 -64
- data/_includes/themes/j1/modules/connectors/sharing +0 -29
- data/_includes/themes/j1/modules/connectors/survey/custom-provider.html +0 -30
- data/_includes/themes/j1/modules/connectors/survey/jotform.html +0 -32
- data/_includes/themes/j1/modules/connectors/surveys +0 -58
- data/_includes/themes/j1/modules/connectors/translator +0 -58
- data/_includes/themes/j1/modules/connectors/translators/custom-translator.html +0 -32
- data/_includes/themes/j1/modules/connectors/translators/google-translator.html +0 -53
- data/_includes/themes/j1/modules/search/algolia.html +0 -181
- data/_includes/themes/j1/modules/search/docsearch.html +0 -42
- data/assets/data/disqus.js +0 -81
- data/assets/data/hyvor.js +0 -72
- data/lib/starter_web/pages/_test_pages/100_side-bar-tester.adoc +0 -244
- data/lib/starter_web/pages/_test_pages/_includes/attributes.asciidoc +0 -110
- data/lib/starter_web/pages/_test_pages/_includes/documents/100_gistblock.asciidoc +0 -28
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_bottom_info.asciidoc +0 -14
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_bottom_left_warning.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_bottom_right_danger.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_central_success.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_full_height_left_info.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_full_height_right_success.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_table_bs_modal_examples.asciidoc +0 -47
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_top_info.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_top_left_info.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/410_top_right_success.asciidoc +0 -11
- data/lib/starter_web/pages/_test_pages/_includes/documents/419_advanced_modals_demo.asciidoc +0 -337
- data/lib/starter_web/pages/_test_pages/_includes/documents/tables/bs_modal_examples.asciidoc +0 -47
- data/lib/starter_web/pages/_test_pages/accordion-01-tester.adoc +0 -220
- data/lib/starter_web/pages/_test_pages/accordion-02-tester.adoc +0 -177
- data/lib/starter_web/pages/_test_pages/accordion-03-tester.adoc +0 -148
- data/lib/starter_web/pages/_test_pages/attribute-changes-01-tester.adoc +0 -226
- data/lib/starter_web/pages/_test_pages/backdrop-tester.adoc +0 -109
- data/lib/starter_web/pages/_test_pages/button-tester-1.adoc +0 -127
- data/lib/starter_web/pages/_test_pages/card-tester.adoc +0 -128
- data/lib/starter_web/pages/_test_pages/cookieConsent.adoc +0 -96
- data/lib/starter_web/pages/_test_pages/deepl.0.adoc +0 -258
- data/lib/starter_web/pages/_test_pages/deepl.adoc +0 -204
- data/lib/starter_web/pages/_test_pages/desandro-button.adoc +0 -171
- data/lib/starter_web/pages/_test_pages/desandro.adoc +0 -147
- data/lib/starter_web/pages/_test_pages/flipcard-1-tester.adoc +0 -308
- data/lib/starter_web/pages/_test_pages/formular-01-tester.adoc +0 -167
- data/lib/starter_web/pages/_test_pages/formular-02-tester.adoc +0 -727
- data/lib/starter_web/pages/_test_pages/google-translate-tester.0.adoc +0 -113
- data/lib/starter_web/pages/_test_pages/google-translate-tester.1.adoc +0 -231
- data/lib/starter_web/pages/_test_pages/google-translate-tester.3.adoc +0 -149
- data/lib/starter_web/pages/_test_pages/google-translate-tester.4.adoc +0 -237
- data/lib/starter_web/pages/_test_pages/infinite-scroll-tester-2.adoc +0 -183
- data/lib/starter_web/pages/_test_pages/infinite-scroll-tester-3.adoc +0 -235
- data/lib/starter_web/pages/_test_pages/infinite-scroll-tester-4.adoc +0 -222
- data/lib/starter_web/pages/_test_pages/infinite-scroll-tester-5.adoc +0 -119
- data/lib/starter_web/pages/_test_pages/infinite-scroll-tester.1.adoc +0 -236
- data/lib/starter_web/pages/_test_pages/infinite-scroll-tester.adoc +0 -225
- data/lib/starter_web/pages/_test_pages/list-group-tester.adoc +0 -265
- data/lib/starter_web/pages/_test_pages/tictok.adoc +0 -127
@@ -78,10 +78,7 @@ regenerate: false
|
|
78
78
|
/* eslint indent: "off" */
|
79
79
|
// -----------------------------------------------------------------------------
|
80
80
|
'use strict';
|
81
|
-
|
82
|
-
{% comment %} Main
|
83
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
84
|
-
j1.adapter['framer'] = (function (j1, window) {
|
81
|
+
j1.adapter.framer = (function (j1, window) {
|
85
82
|
|
86
83
|
{% comment %} Set global variables
|
87
84
|
------------------------------------------------------------------------------ {% endcomment %}
|
@@ -164,12 +161,9 @@ j1.adapter['framer'] = (function (j1, window) {
|
|
164
161
|
logger.info('\n' + 'initializing module finished');
|
165
162
|
|
166
163
|
clearInterval(dependencies_met_page_finished);
|
167
|
-
|
168
164
|
return true;
|
169
|
-
|
170
165
|
}
|
171
166
|
}, 25);
|
172
|
-
|
173
167
|
}, // END init
|
174
168
|
|
175
169
|
// -------------------------------------------------------------------------
|
@@ -82,24 +82,10 @@ regenerate: true
|
|
82
82
|
{% assign themer_enabled = modules.themer_options.enabled %}
|
83
83
|
{% assign themer_reloadPageOnChange = modules.themer_options.reloadPageOnChange %}
|
84
84
|
{% assign themer_hideOnReload = modules.themer_options.hideOnReload %}
|
85
|
-
|
85
|
+
|
86
86
|
|
87
87
|
{% comment %} Set variables
|
88
88
|
-------------------------------------------------------------------------------- {% endcomment %}
|
89
|
-
{% if comment_provider == 'disqus' %}
|
90
|
-
{% assign site_id = template_config.comments.disqus.site_id %}
|
91
|
-
{% elsif comment_provider == 'hyvor' %}
|
92
|
-
{% assign site_id = template_config.comments.hyvor.site_id %}
|
93
|
-
{% elsif comment_provider == 'commento' %}
|
94
|
-
{% assign site_id = template_config.comments.commento.site_id %}
|
95
|
-
{% elsif comment_provider == 'just-comments' %}
|
96
|
-
{% assign site_id = template_config.comments.just-comments.site_id %}
|
97
|
-
{% elsif comment_provider == 'facebook' %}
|
98
|
-
{% assign site_id = template_config.comments.facebook.site_id %}
|
99
|
-
{% else %}
|
100
|
-
{% assign site_id = false %}
|
101
|
-
{% endif %}
|
102
|
-
|
103
89
|
{% assign production = false %}
|
104
90
|
{% if environment == 'prod' or environment == 'production' %}
|
105
91
|
{% assign production = true %}
|
@@ -115,14 +101,6 @@ regenerate: true
|
|
115
101
|
{% assign language = "en" %}
|
116
102
|
{% endif %}
|
117
103
|
|
118
|
-
{% if language == "en" %}
|
119
|
-
{% assign comments_headline = template_config.comments.comments_headline.en %}
|
120
|
-
{% endif %}
|
121
|
-
|
122
|
-
{% if language == "de" %}
|
123
|
-
{% assign comments_headline = template_config.comments.comments_headline.de %}
|
124
|
-
{% endif %}
|
125
|
-
|
126
104
|
/*
|
127
105
|
# -----------------------------------------------------------------------------
|
128
106
|
# ~/assets/themes/j1/adapter/js/j1_template.js
|
@@ -151,7 +129,6 @@ regenerate: true
|
|
151
129
|
/* eslint semi: "off" */
|
152
130
|
// -----------------------------------------------------------------------------
|
153
131
|
'use strict';
|
154
|
-
|
155
132
|
var j1 = (function () {
|
156
133
|
|
157
134
|
// ---------------------------------------------------------------------------
|
@@ -174,6 +151,7 @@ var j1 = (function () {
|
|
174
151
|
// Default comment provider information
|
175
152
|
var comment_provider = '{{comment_provider}}';
|
176
153
|
var site_id = '{{site_id}}';
|
154
|
+
var check_cookies = {{cookie_options.check_cookies}};
|
177
155
|
|
178
156
|
var current_user_data;
|
179
157
|
var current_page;
|
@@ -368,13 +346,15 @@ var j1 = (function () {
|
|
368
346
|
expires: 365
|
369
347
|
});
|
370
348
|
|
371
|
-
// jadams, 2021-12-06:
|
349
|
+
// jadams, 2021-12-06: Check if access to cookies for this site failed.
|
372
350
|
// Possibly, a third-party domain or an attacker tries to access it.
|
373
|
-
if (
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
351
|
+
if (check_cookies) {
|
352
|
+
if (!user_state) {
|
353
|
+
logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
|
354
|
+
logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
|
355
|
+
// redirect to error page: blocked content
|
356
|
+
window.location.href = '/446.html';
|
357
|
+
}
|
378
358
|
}
|
379
359
|
|
380
360
|
if (!user_consent.analysis || !user_consent.personalization) {
|
@@ -845,6 +825,7 @@ var j1 = (function () {
|
|
845
825
|
var categoryAllowed;
|
846
826
|
|
847
827
|
// provider APIs require user consent
|
828
|
+
// -----------------------------------------------------------------------
|
848
829
|
var meta_analytics = $('meta[name=analytics]').attr('content');
|
849
830
|
var analytics = (meta_analytics === 'true') ? true: false;
|
850
831
|
var meta_comments = $('meta[name=comments]').attr('content');
|
@@ -861,6 +842,7 @@ var j1 = (function () {
|
|
861
842
|
var personalization = (meta_personalization === 'true') ? true: false;
|
862
843
|
|
863
844
|
// if personalized content detected, page requires user consent
|
845
|
+
// -----------------------------------------------------------------------
|
864
846
|
if (personalization && !user_consent.personalization) {
|
865
847
|
// redirect to error page: blocked content
|
866
848
|
window.location.href = '/444.html';
|
@@ -870,7 +852,9 @@ var j1 = (function () {
|
|
870
852
|
logText= '\n' + 'loading page partials: started';
|
871
853
|
logger.info(logText);
|
872
854
|
|
873
|
-
if (j1.appDetected()) {
|
855
|
+
if (j1.appDetected()) {
|
856
|
+
// app mode
|
857
|
+
// ---------------------------------------------------------------------
|
874
858
|
logger.info('\n' + 'mode detected: app');
|
875
859
|
|
876
860
|
$.when ($.ajax(ep_status))
|
@@ -913,78 +897,22 @@ var j1 = (function () {
|
|
913
897
|
|
914
898
|
// show the page delayed
|
915
899
|
setTimeout (function() {
|
916
|
-
// Manage providers for personalization OptIn/Out (Comments|Ads)
|
917
|
-
if (!user_consent.personalization) {
|
918
|
-
logger.debug('\n' + 'disable comment provider: ' + comment_provider);
|
919
|
-
logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
|
920
|
-
$('#leave-a-comment').remove();
|
921
|
-
if (comment_provider === 'disqus') {
|
922
|
-
$('#dsq-count-scr').remove();
|
923
|
-
$('#disqus-thread').remove();
|
924
|
-
}
|
925
|
-
if (comment_provider === 'hyvor') {
|
926
|
-
$('#hyvor-embed').remove();
|
927
|
-
$('#hyvor-talk-view').remove();
|
928
|
-
}
|
929
|
-
} else {
|
930
|
-
if (comments) {
|
931
|
-
logger.info('\n' + 'enable comment provider: ' + comment_provider);
|
932
|
-
$('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
|
933
|
-
if (comment_provider === 'disqus') {
|
934
|
-
logger.info('\n' + 'load comment provider code: ' + comment_provider);
|
935
|
-
$('#main-content').append('<div id="disqus_thread"></div>');
|
936
|
-
$('body').append('<script async id="dsq-count-scr" src="//' + site_id + '.disqus.com/count.js"></script>');
|
937
|
-
j1.loadJS({
|
938
|
-
xhr_data_path: '/assets/data/' + comment_provider + '.js',
|
939
|
-
xhr_data_element: comment_provider
|
940
|
-
});
|
941
|
-
}
|
942
|
-
if (comment_provider === 'hyvor') {
|
943
|
-
$('body').append('<script> var HYVOR_TALK_WEBSITE = ' + site_id + '; var HYVOR_TALK_CONFIG = { url: false, id: false };');
|
944
|
-
$('#main-content').append('<div id="hyvor-talk-view"></div>');
|
945
|
-
$('body').append('<script async id="hyvor-embed" type="text/javascript" src="//talk.hyvor.com/web-api/embed.js"></script>');
|
946
|
-
}
|
947
|
-
}
|
948
|
-
}
|
949
|
-
|
950
900
|
// display page
|
951
|
-
|
901
|
+
$('#no_flicker').css('display', 'block');
|
952
902
|
|
953
|
-
|
954
|
-
|
903
|
+
// manage Dropcaps if translation is enabled|disabled
|
904
|
+
// -----------------------------------------------------------------
|
905
|
+
if (user_translate.translationEnabled) {
|
955
906
|
logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
|
956
907
|
logger.debug('\n' + 'skipped processing of dropcaps');
|
957
|
-
|
908
|
+
} else {
|
958
909
|
// initialize dropcaps
|
959
910
|
logger.info('\n' + 'post processing: createDropCap');
|
960
911
|
j1.core.createDropCap();
|
961
|
-
}
|
962
|
-
|
963
|
-
// add recommended title to hyvor iframe for SEO optimization (if loadad)
|
964
|
-
if (comment_provider === 'hyvor') {
|
965
|
-
var dependencies_met_load_finished = setInterval (function () {
|
966
|
-
if ($('#hyvor-talk-view').children().length) {
|
967
|
-
$('#hyvor-talk-iframe').prop('title', 'Hyvor talk iframe');
|
968
|
-
clearInterval(dependencies_met_load_finished);
|
969
|
-
}
|
970
|
-
}, 25);
|
971
|
-
}
|
972
|
-
// NOTE: Placed tracking warning/info here because page may reloaded
|
973
|
-
// after cookie consent selection
|
974
|
-
if (user_consent.analysis) {
|
975
|
-
logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analysis);
|
976
|
-
if (tracking_enabled && !tracking_id_valid) {
|
977
|
-
logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
|
978
|
-
} else if (tracking_enabled && tracking_id_valid) {
|
979
|
-
logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
|
980
|
-
} else {
|
981
|
-
logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
|
982
|
-
}
|
983
|
-
} else {
|
984
|
-
logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
|
985
912
|
}
|
986
913
|
|
987
|
-
//
|
914
|
+
// TODO: should MOVED to Cookiebar ???
|
915
|
+
// show|hide cookie icon
|
988
916
|
if (j1.existsCookie(cookie_names.user_consent)) {
|
989
917
|
// Display cookie icon
|
990
918
|
logText = '\n' + 'show cookie icon';
|
@@ -997,6 +925,7 @@ var j1 = (function () {
|
|
997
925
|
$('#quickLinksCookieButton').css('display', 'none');
|
998
926
|
}
|
999
927
|
|
928
|
+
// TODO: should MOVED to ControlCenter Adapter ???
|
1000
929
|
// -----------------------------------------------------------------
|
1001
930
|
// show cc icon (currently NOT supported)
|
1002
931
|
// $('#quickLinksControlCenterButton').css('display', 'block');
|
@@ -1017,6 +946,7 @@ var j1 = (function () {
|
|
1017
946
|
$('#quickLinksSignInOutButton').css('display', 'block');
|
1018
947
|
}
|
1019
948
|
|
949
|
+
// TODO: should MOVED to Themer ???
|
1020
950
|
// jadams, 2021-07-25: hide|show themes menu on cookie consent
|
1021
951
|
// (analysis|personalization) settings. BootSwatch is a 3rd party
|
1022
952
|
// is using e.g GA. Because NO control is possible on 3rd parties,
|
@@ -1030,10 +960,7 @@ var j1 = (function () {
|
|
1030
960
|
$("#themes_menu").show();
|
1031
961
|
}
|
1032
962
|
|
1033
|
-
// if
|
1034
|
-
// do a smooth scroll to
|
1035
|
-
j1.scrollTo();
|
1036
|
-
|
963
|
+
// detect if a loaded page has been chenged
|
1037
964
|
if (user_session.previous_page !== user_session.current_page) {
|
1038
965
|
logText = '\n' + 'page change detected';
|
1039
966
|
logger.info(logText);
|
@@ -1049,56 +976,34 @@ var j1 = (function () {
|
|
1049
976
|
current_user_data = j1.mergeData(user_session, user_state);
|
1050
977
|
j1.core.navigator.updateSidebar(current_user_data);
|
1051
978
|
|
1052
|
-
//
|
979
|
+
// set|log status
|
1053
980
|
state = 'finished';
|
981
|
+
j1.setState(state);
|
1054
982
|
logText = '\n' + 'state: ' + state;
|
1055
983
|
logger.info(logText);
|
1056
984
|
logText = '\n' + 'page finalized successfully';
|
1057
985
|
logger.info(logText);
|
986
|
+
|
987
|
+
// do a (smooth) scroll if all nav elements ready
|
988
|
+
// -----------------------------------------------------------------
|
989
|
+
var dependencies_met_navigator_finished = setInterval(function() {
|
990
|
+
if (j1.adapter.navigator.getState() == 'finished') {
|
991
|
+
// if a page requested contains an anchor element, do a smooth scroll
|
992
|
+
j1.scrollTo();
|
993
|
+
clearInterval(dependencies_met_navigator_finished);
|
994
|
+
}
|
995
|
+
}, 25);
|
1058
996
|
}, flickerTimeout);
|
1059
997
|
});
|
1060
998
|
} else {
|
1061
999
|
// web mode
|
1000
|
+
// ---------------------------------------------------------------------
|
1062
1001
|
setTimeout (function() {
|
1063
|
-
j1.setState('finished');
|
1002
|
+
// j1.setState('finished');
|
1064
1003
|
logger.info('\n' + 'state: finished');
|
1065
1004
|
logger.info('\n' + 'page initialization: finished');
|
1066
1005
|
|
1067
|
-
//
|
1068
|
-
if (!user_consent.personalization) {
|
1069
|
-
logger.debug('\n' + 'disable comment provider: ' + comment_provider);
|
1070
|
-
logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
|
1071
|
-
$('#leave-a-comment').remove();
|
1072
|
-
if (comment_provider === 'disqus') {
|
1073
|
-
$('#dsq-count-scr').remove();
|
1074
|
-
$('#disqus-thread').remove();
|
1075
|
-
}
|
1076
|
-
if (comment_provider === 'hyvor') {
|
1077
|
-
$('#hyvor-embed').remove();
|
1078
|
-
$('#hyvor-talk-view').remove();
|
1079
|
-
}
|
1080
|
-
} else {
|
1081
|
-
if (comments) {
|
1082
|
-
logger.info('\n' + 'enable comment provider: ' + comment_provider);
|
1083
|
-
$('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
|
1084
|
-
if (comment_provider === 'disqus') {
|
1085
|
-
logger.info('\n' + 'load comment provider code: ' + comment_provider);
|
1086
|
-
$('#main-content').append('<div id="disqus_thread"></div>');
|
1087
|
-
$('body').append('<script async id="dsq-count-scr" src="//' + site_id + '.disqus.com/count.js"></script>');
|
1088
|
-
j1.loadJS({
|
1089
|
-
xhr_data_path: '/assets/data/' + comment_provider + '.js',
|
1090
|
-
xhr_data_element: comment_provider
|
1091
|
-
});
|
1092
|
-
}
|
1093
|
-
if (comment_provider === 'hyvor') {
|
1094
|
-
$('body').append('<script> var HYVOR_TALK_WEBSITE = ' + site_id + '; var HYVOR_TALK_CONFIG = { url: false, id: false };');
|
1095
|
-
$('#main-content').append('<div id="hyvor-talk-view"></div>');
|
1096
|
-
$('body').append('<script async id="hyvor-embed" type="text/javascript" src="//talk.hyvor.com/web-api/embed.js"></script>');
|
1097
|
-
}
|
1098
|
-
}
|
1099
|
-
}
|
1100
|
-
|
1101
|
-
// display page
|
1006
|
+
// display the page loaded
|
1102
1007
|
$('#no_flicker').css('display', 'block');
|
1103
1008
|
|
1104
1009
|
// jadams, 2021-11-19: test code for 'tapTarget' of 'materializeCss'
|
@@ -1125,7 +1030,8 @@ var j1 = (function () {
|
|
1125
1030
|
$(this).parents(".card-header").toggleClass("highlight");
|
1126
1031
|
});
|
1127
1032
|
|
1128
|
-
//
|
1033
|
+
// manage Dropcaps if translation is enabled|disabled
|
1034
|
+
// -------------------------------------------------------------------
|
1129
1035
|
if (user_translate.translationEnabled) {
|
1130
1036
|
logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
|
1131
1037
|
logger.debug('\n' + 'skipped processing of dropcaps');
|
@@ -1135,31 +1041,6 @@ var j1 = (function () {
|
|
1135
1041
|
j1.core.createDropCap();
|
1136
1042
|
}
|
1137
1043
|
|
1138
|
-
// add recommended title to hyvor iframe for SEO optimization (if loadad)
|
1139
|
-
if (comment_provider === 'hyvor') {
|
1140
|
-
var dependencies_met_load_finished = setInterval (function () {
|
1141
|
-
if ($('#hyvor-talk-view').children().length) {
|
1142
|
-
$('#hyvor-talk-iframe').prop('title', 'Hyvor talk iframe');
|
1143
|
-
clearInterval(dependencies_met_load_finished);
|
1144
|
-
}
|
1145
|
-
}, 25);
|
1146
|
-
}
|
1147
|
-
|
1148
|
-
// NOTE: Placed tracking warning/info here because page may reloaded
|
1149
|
-
// after cookie consent selection
|
1150
|
-
if (user_consent.analysis) {
|
1151
|
-
logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analysis);
|
1152
|
-
if (tracking_enabled && !tracking_id_valid) {
|
1153
|
-
logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
|
1154
|
-
} else if (tracking_enabled && tracking_id_valid) {
|
1155
|
-
logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
|
1156
|
-
} else {
|
1157
|
-
logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
|
1158
|
-
}
|
1159
|
-
} else {
|
1160
|
-
logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
|
1161
|
-
}
|
1162
|
-
|
1163
1044
|
logger.info('\n' + 'mode detected: web');
|
1164
1045
|
logger.info('\n' + 'hide signin icon');
|
1165
1046
|
$('#quickLinksSignInOutButton').css('display', 'none');
|
@@ -1173,9 +1054,12 @@ var j1 = (function () {
|
|
1173
1054
|
expires: 0
|
1174
1055
|
});
|
1175
1056
|
|
1057
|
+
// TODO: should MOVED to ControlCenter Adapter ???
|
1058
|
+
// -----------------------------------------------------------------
|
1176
1059
|
// show cc icon (currently NOT supported)
|
1177
1060
|
// $('#quickLinksControlCenterButton').css('display', 'block');
|
1178
1061
|
|
1062
|
+
// TODO: should MOVED to Cookiebar ???
|
1179
1063
|
// show|hide cookie icon
|
1180
1064
|
if (j1.existsCookie(cookie_names.user_consent)) {
|
1181
1065
|
// Display cookie icon
|
@@ -1189,6 +1073,7 @@ var j1 = (function () {
|
|
1189
1073
|
$('#quickLinksCookieButton').css('display', 'none');
|
1190
1074
|
}
|
1191
1075
|
|
1076
|
+
// TODO: should MOVED to Themer ???
|
1192
1077
|
// jadams, 2021-07-25: hide|show themes menu on cookie consent
|
1193
1078
|
// (analysis|personalization) settings. BootSwatch is a 3rd party
|
1194
1079
|
// is using e.g GA. Because NO control is possible on 3rd parties,
|
@@ -1202,10 +1087,7 @@ var j1 = (function () {
|
|
1202
1087
|
$("#themes_menu").show();
|
1203
1088
|
}
|
1204
1089
|
|
1205
|
-
//
|
1206
|
-
// do a smooth scroll
|
1207
|
-
j1.scrollTo();
|
1208
|
-
|
1090
|
+
// detect if a loaded page has been chenged
|
1209
1091
|
if (user_session.previous_page !== user_session.current_page) {
|
1210
1092
|
logText = '\n' + 'page change detected';
|
1211
1093
|
logger.info(logText);
|
@@ -1223,10 +1105,21 @@ var j1 = (function () {
|
|
1223
1105
|
|
1224
1106
|
// set|log status
|
1225
1107
|
state = 'finished';
|
1108
|
+
j1.setState(state);
|
1226
1109
|
logText = '\n' + 'state: ' + state;
|
1227
1110
|
logger.info(logText);
|
1228
1111
|
logText = '\n' + 'page finalized successfully';
|
1229
1112
|
logger.info(logText);
|
1113
|
+
|
1114
|
+
// do a (smooth) scroll if all nav elements ready
|
1115
|
+
// -------------------------------------------------------------------
|
1116
|
+
var dependencies_met_navigator_finished = setInterval(function() {
|
1117
|
+
if (j1.adapter.navigator.getState() == 'finished') {
|
1118
|
+
// if a page requested contains an anchor element, do a smooth scroll
|
1119
|
+
j1.scrollTo();
|
1120
|
+
clearInterval(dependencies_met_navigator_finished);
|
1121
|
+
}
|
1122
|
+
}, 25);
|
1230
1123
|
}, flickerTimeout);
|
1231
1124
|
}
|
1232
1125
|
},
|
@@ -1319,9 +1212,9 @@ var j1 = (function () {
|
|
1319
1212
|
var anchor = window.location.href.split('#')[1];
|
1320
1213
|
var anchor_id = typeof anchor !== 'undefined' ? '#' + anchor : false;
|
1321
1214
|
var scrollDuration = {{toccer_options.scrollSmoothDuration}};
|
1215
|
+
var scrollOffset = j1.getScrollOffset();
|
1322
1216
|
var isSlider = false;
|
1323
1217
|
var selector;
|
1324
|
-
var scrollOffset;
|
1325
1218
|
|
1326
1219
|
if (typeof anchor === 'undefined') {
|
1327
1220
|
return false;
|
@@ -1329,15 +1222,13 @@ var j1 = (function () {
|
|
1329
1222
|
return false;
|
1330
1223
|
}
|
1331
1224
|
|
1332
|
-
scrollOffset = j1.getScrollOffset();
|
1333
|
-
|
1334
1225
|
// Check if the anchor is an slider/gallery element
|
1335
1226
|
if (typeof anchor !== 'undefined') {
|
1336
|
-
isSlider
|
1227
|
+
isSlider = anchor.includes('slide');
|
1337
1228
|
}
|
1338
1229
|
|
1339
1230
|
if (anchor_id && anchor_id !== '#' && !isSlider) {
|
1340
|
-
// scroll only, if an anchor is given with URL
|
1231
|
+
// scroll only, if an anchor is given with an URL
|
1341
1232
|
selector = $(anchor_id);
|
1342
1233
|
if (selector.length) {
|
1343
1234
|
j1.core.scrollSmooth.scroll(anchor_id, {
|
@@ -1612,31 +1503,37 @@ var j1 = (function () {
|
|
1612
1503
|
// context/HTTPS).
|
1613
1504
|
// -------------------------------------------------------------------------
|
1614
1505
|
writeCookie: function (options /*name, data, [path, expires, domain, samesite, http_only, secure]*/) {
|
1615
|
-
var date
|
1616
|
-
var timestamp_now
|
1617
|
-
var url
|
1618
|
-
var baseUrl
|
1619
|
-
var hostname
|
1620
|
-
var
|
1621
|
-
var
|
1622
|
-
var cookie_data
|
1506
|
+
var date = new Date();
|
1507
|
+
var timestamp_now = date.toISOString();
|
1508
|
+
var url = new liteURL(window.location.href);
|
1509
|
+
var baseUrl = url.origin;;
|
1510
|
+
var hostname = url.hostname;
|
1511
|
+
var auto_domain = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
|
1512
|
+
var stringifiedAttributes = '';
|
1513
|
+
var cookie_data = {};
|
1623
1514
|
var data_json;
|
1624
1515
|
var data_encoded;
|
1625
1516
|
var expires;
|
1626
|
-
var
|
1517
|
+
var domainAttribute;
|
1627
1518
|
|
1628
1519
|
var defaults = {
|
1629
1520
|
data: {},
|
1630
1521
|
name: '',
|
1631
1522
|
path: '{{cookie_options.path}}',
|
1632
1523
|
expires: '{{cookie_options.expires}}',
|
1633
|
-
domain: '
|
1524
|
+
domain: ('{{cookie_options.domain}}' === 'true'), // convert string to boolean
|
1634
1525
|
samesite: '{{cookie_options.same_site}}',
|
1635
1526
|
http_only: '{{cookie_options.http_only}}',
|
1636
1527
|
secure: '{{cookie_options.secure}}'
|
1637
1528
|
};
|
1638
1529
|
var settings = $.extend(defaults, options);
|
1639
1530
|
|
1531
|
+
// Failsafe: if 'None' is given for samesite in non-secure environments
|
1532
|
+
// -----------------------------------------------------------------------
|
1533
|
+
if (settings.samesite == 'None' && !settings.secure) {
|
1534
|
+
settings.samesite = 'Lax';
|
1535
|
+
}
|
1536
|
+
|
1640
1537
|
cookie_data.timestamp = timestamp_now;
|
1641
1538
|
|
1642
1539
|
if (j1.existsCookie(settings.name)) {
|
@@ -1650,27 +1547,28 @@ var j1 = (function () {
|
|
1650
1547
|
data_encoded = window.btoa(data_json);
|
1651
1548
|
}
|
1652
1549
|
|
1653
|
-
stringifiedAttributes += '; ' + '
|
1550
|
+
stringifiedAttributes += '; ' + 'Path=' + settings.path;
|
1654
1551
|
|
1655
1552
|
if (settings.expires > 0) {
|
1656
1553
|
date.setTime(date.getTime() + (settings.expires * 24 * 60 * 60 * 1000));
|
1657
|
-
stringifiedAttributes += '; ' + '
|
1554
|
+
stringifiedAttributes += '; ' + 'Expires=' + date.toUTCString();
|
1658
1555
|
}
|
1659
1556
|
|
1660
1557
|
stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
|
1661
1558
|
|
1662
|
-
//
|
1663
|
-
|
1664
|
-
|
1665
|
-
|
1666
|
-
|
1667
|
-
settings.domain
|
1559
|
+
// set domain used by cookies
|
1560
|
+
if (settings.domain) {
|
1561
|
+
if (settings.domain == 'auto') {
|
1562
|
+
domainAttribute = auto_domain;
|
1563
|
+
stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
|
1564
|
+
} else if (settings.domain) {
|
1565
|
+
domainAttribute = settings.domain;
|
1566
|
+
stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
|
1567
|
+
}
|
1668
1568
|
}
|
1669
1569
|
|
1670
|
-
|
1671
|
-
|
1672
|
-
if (settings.secure) {
|
1673
|
-
stringifiedAttributes += '; ' + 'secure=' + settings.secure;
|
1570
|
+
if (settings.secure == true) {
|
1571
|
+
stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
|
1674
1572
|
}
|
1675
1573
|
|
1676
1574
|
// write the cookie
|
@@ -1705,16 +1603,31 @@ var j1 = (function () {
|
|
1705
1603
|
// removeCookie (Vanilla JS)
|
1706
1604
|
// -------------------------------------------------------------------------
|
1707
1605
|
removeCookie: function (options /*name, [path, domain]*/) {
|
1708
|
-
var
|
1606
|
+
var domainAttribute;
|
1607
|
+
|
1709
1608
|
var defaults = {
|
1710
|
-
|
1711
|
-
|
1609
|
+
path: '{{cookie_options.path}}',
|
1610
|
+
expires: '{{cookie_options.expires}}',
|
1611
|
+
domain: '{{cookie_options.domain}}',
|
1612
|
+
samesite: '{{cookie_options.same_site}}',
|
1613
|
+
http_only: '{{cookie_options.http_only}}',
|
1614
|
+
secure: '{{cookie_options.secure}}'
|
1712
1615
|
};
|
1616
|
+
var cookieExists;
|
1617
|
+
|
1713
1618
|
var settings = $.extend(defaults, options);
|
1714
1619
|
|
1620
|
+
// set domain used by cookies
|
1621
|
+
if (settings.domain == 'auto') {
|
1622
|
+
domainAttribute = domain ;
|
1623
|
+
} else {
|
1624
|
+
// domainAttribute = hostname;
|
1625
|
+
domainAttribute = '';
|
1626
|
+
}
|
1627
|
+
|
1715
1628
|
if (j1.findCookie(settings.name)) {
|
1716
1629
|
// clear cookie CONTENT and set expiry date in the PAST
|
1717
|
-
document.cookie = settings.name + '=;
|
1630
|
+
document.cookie = settings.name + '=; Domain=' + domainAttribute + '; Expires=Thu, 01 Jan 1970 00:00:00 UTC; Path=/;';
|
1718
1631
|
return true;
|
1719
1632
|
} else {
|
1720
1633
|
return false;
|
@@ -1744,20 +1657,24 @@ var j1 = (function () {
|
|
1744
1657
|
var baseUrl = url.origin;;
|
1745
1658
|
var hostname = url.hostname;
|
1746
1659
|
var domain = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
|
1747
|
-
var
|
1660
|
+
var domainAttribute;
|
1748
1661
|
|
1749
1662
|
var defaults = {
|
1750
|
-
|
1751
|
-
|
1752
|
-
|
1663
|
+
path: '{{cookie_options.path}}',
|
1664
|
+
expires: '{{cookie_options.expires}}',
|
1665
|
+
domain: '{{cookie_options.domain}}',
|
1666
|
+
samesite: '{{cookie_options.same_site}}',
|
1667
|
+
http_only: '{{cookie_options.http_only}}',
|
1668
|
+
secure: '{{cookie_options.secure}}'
|
1753
1669
|
};
|
1754
|
-
|
1755
1670
|
var settings = $.extend(defaults, options);
|
1756
1671
|
|
1757
|
-
|
1758
|
-
|
1759
|
-
|
1760
|
-
|
1672
|
+
// set domain used by cookies
|
1673
|
+
if (settings.domain == 'auto') {
|
1674
|
+
domainAttribute = domain ;
|
1675
|
+
} else {
|
1676
|
+
// domainAttribute = hostname;
|
1677
|
+
domainAttribute = '';
|
1761
1678
|
}
|
1762
1679
|
|
1763
1680
|
var dc = document.cookie; // all cookies in page
|
@@ -1787,10 +1704,10 @@ var j1 = (function () {
|
|
1787
1704
|
|
1788
1705
|
// expire cookie to session
|
1789
1706
|
content = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
|
1790
|
-
if (settings.secure) {
|
1791
|
-
document.cookie = settings.name + '=' + content +';
|
1707
|
+
if (settings.secure == 'true') {
|
1708
|
+
document.cookie = settings.name + '=' + content +'; Path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; ' + 'Domain=' + domainAttribute + '; Secure' + '; ';
|
1792
1709
|
} else {
|
1793
|
-
document.cookie = settings.name + '=' + content +';
|
1710
|
+
document.cookie = settings.name + '=' + content +'; Path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; ' + 'Domain=' + domainAttribute + '; ';
|
1794
1711
|
}
|
1795
1712
|
|
1796
1713
|
return true;
|
@@ -76,10 +76,7 @@ regenerate: true
|
|
76
76
|
/* eslint indent: "off" */
|
77
77
|
// -----------------------------------------------------------------------------
|
78
78
|
'use strict';
|
79
|
-
|
80
|
-
{% comment %} Main
|
81
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
82
|
-
j1.adapter['justifiedGallery'] = (function (j1, window) {
|
79
|
+
j1.adapter.justifiedGallery = (function (j1, window) {
|
83
80
|
|
84
81
|
{% comment %} Global variables
|
85
82
|
------------------------------------------------------------------------------ {% endcomment %}
|
@@ -89,10 +89,7 @@ regenerate: true
|
|
89
89
|
/* eslint indent: "off" */
|
90
90
|
// -----------------------------------------------------------------------------
|
91
91
|
'use strict';
|
92
|
-
|
93
|
-
{% comment %} Main
|
94
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
95
|
-
j1.adapter['justifiedGalleryCustomizer'] = (function (j1, window) {
|
92
|
+
j1.adapter.justifiedGalleryCustomizer = (function (j1, window) {
|
96
93
|
|
97
94
|
{% comment %} Set global variables
|
98
95
|
------------------------------------------------------------------------------ {% endcomment %}
|
@@ -80,11 +80,7 @@ regenerate: false
|
|
80
80
|
/* eslint indent: "off" */
|
81
81
|
// -----------------------------------------------------------------------------
|
82
82
|
'use strict';
|
83
|
-
|
84
|
-
{% comment %} Main
|
85
|
-
--------------------------------------------------------------- {% endcomment %}
|
86
|
-
// j1.Lightbox = (function (j1, window) {
|
87
|
-
j1.adapter['lightbox'] = (function (j1, window) {
|
83
|
+
j1.adapter.lightbox = (function (j1, window) {
|
88
84
|
|
89
85
|
{% comment %} Global variables
|
90
86
|
------------------------------------------------------------------------------ {% endcomment %}
|
@@ -80,8 +80,7 @@ regenerate: true
|
|
80
80
|
/* eslint indent: "off" */
|
81
81
|
// -----------------------------------------------------------------------------
|
82
82
|
'use strict';
|
83
|
-
|
84
|
-
j1.adapter['logger'] = (function (j1, window) {
|
83
|
+
j1.adapter.logger = (function (j1, window) {
|
85
84
|
|
86
85
|
// ---------------------------------------------------------------------------
|
87
86
|
// globals
|