j1-template 2023.0.13 → 2023.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. checksums.yaml +4 -4
  2. data/assets/data/banner.html +2 -2
  3. data/assets/themes/j1/adapter/js/advertising.js +21 -8
  4. data/assets/themes/j1/adapter/js/analytics.js +24 -8
  5. data/assets/themes/j1/adapter/js/carousel.js +10 -13
  6. data/assets/themes/j1/adapter/js/clipboard.js +8 -1
  7. data/assets/themes/j1/adapter/js/comments.js +193 -198
  8. data/assets/themes/j1/adapter/js/cookieConsent.js +27 -20
  9. data/assets/themes/j1/adapter/js/dropdowns.js +7 -10
  10. data/assets/themes/j1/adapter/js/fab.js +10 -17
  11. data/assets/themes/j1/adapter/js/framer.js +27 -31
  12. data/assets/themes/j1/adapter/js/j1.js +2 -0
  13. data/assets/themes/j1/adapter/js/justifiedGallery.js +15 -15
  14. data/assets/themes/j1/adapter/js/lightbox.js +25 -16
  15. data/assets/themes/j1/adapter/js/logger.js +13 -7
  16. data/assets/themes/j1/adapter/js/lunr.js +9 -11
  17. data/assets/themes/j1/adapter/js/masonry.js +9 -11
  18. data/assets/themes/j1/adapter/js/masterslider.js +28 -25
  19. data/assets/themes/j1/adapter/js/nbinteract.js +20 -15
  20. data/assets/themes/j1/adapter/js/particles.js +9 -7
  21. data/assets/themes/j1/adapter/js/rangeSlider.js +11 -13
  22. data/assets/themes/j1/adapter/js/rouge.js +1 -0
  23. data/assets/themes/j1/adapter/js/rtable.js +11 -13
  24. data/assets/themes/j1/adapter/js/scroller.js +18 -2
  25. data/assets/themes/j1/adapter/js/themer.js +23 -16
  26. data/assets/themes/j1/adapter/js/toccer.js +16 -20
  27. data/assets/themes/j1/adapter/js/translator.js +28 -30
  28. data/assets/themes/j1/adapter/js/waves.js +9 -7
  29. data/lib/j1/version.rb +1 -1
  30. data/lib/starter_web/Gemfile +1 -1
  31. data/lib/starter_web/README.md +5 -5
  32. data/lib/starter_web/_config.yml +2 -2
  33. data/lib/starter_web/_data/j1_config.yml +432 -432
  34. data/lib/starter_web/_data/modules/analytics.yml +2 -65
  35. data/lib/starter_web/_data/modules/comments.yml +11 -1
  36. data/lib/starter_web/_data/modules/defaults/analytics.yml +3 -3
  37. data/lib/starter_web/_data/modules/defaults/comments.yml +0 -25
  38. data/lib/starter_web/_data/modules/scroller.yml +1 -1
  39. data/lib/starter_web/_data/resources.yml +1 -1
  40. data/lib/starter_web/_data/templates/feed.xml +1 -1
  41. data/lib/starter_web/_plugins/index/lunr.rb +1 -1
  42. data/lib/starter_web/package.json +1 -1
  43. data/lib/starter_web/pages/public/about/site.adoc +76 -76
  44. data/lib/starter_web/pages/public/learn/roundtrip/asciidoc_extensions.adoc +2 -2
  45. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  46. data/lib/starter_web/utilsrv/package.json +1 -1
  47. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0ecc33a0450cd03fb2a36a3627288ca5fa977a0df8cf3ac4b557c0e528bad5e5
4
- data.tar.gz: a9a4db6417dac407e5fbddd8b05af2c25aedce85cbaf3f0471fd0e9e2ffa1c06
3
+ metadata.gz: d0d5cb7aeb15733944dff7b5d830e913c156fdf7cc515f3101153ec65665dbec
4
+ data.tar.gz: f9de89b7fcea2a7360fdd69666b945ccfa5fecd8fb00d1c29c30253c6a9b46bf
5
5
  SHA512:
6
- metadata.gz: 834c99140ff627c372c30c2c4da726e3a03bb560dc39438d23dcb8ff71fc3547b38d007a942582d3273b5d7f91cfb84b6daf3d87f421c211c640556990264862
7
- data.tar.gz: baed3e32d701124db08ade0d26156d2f24dd74c6029a8656b395749a882ff95d9f444427991e9f024f48177604bfd71594f6929941b44305e102a997db4549d7
6
+ metadata.gz: 1979b9be4e118573f4c23cdd2d3cf2133dbcdbb4df75d2cc4fda37456d8ea7f7c41b65d0b3fdf8b44462e088624dd81451cf9d203d077bc9c95df36c2f2da47c
7
+ data.tar.gz: 207b6680b87bd6eb2935796379fa36ca67f0c85bc897e96b5f594c2e8b792c9ebd604b235bab579bc3c691119fbec105cd4649562d1e7d83be5b63a3401a1cad
@@ -259,8 +259,8 @@ exclude_from_search: true
259
259
  <img
260
260
  class="sticker-image"
261
261
  src="/assets/images/sticker/600x600/sticker-new-version.png"
262
- alt="Get new version 2023.0.13"
263
- title="Get new version 2023.0.13"
262
+ alt="Get new version 2023.0.14"
263
+ title="Get new version 2023.0.14"
264
264
  style="width: 140px; height: 120px;"
265
265
  >
266
266
  </a>
@@ -35,9 +35,9 @@ regenerate: true
35
35
 
36
36
  {% comment %} Set config files
37
37
  -------------------------------------------------------------------------------- {% endcomment %}
38
- {% assign template_config = site.data.j1_config %}
39
- {% assign blocks = site.data.blocks %}
40
- {% assign modules = site.data.modules %}
38
+ {% assign template_config = site.data.j1_config %}
39
+ {% assign blocks = site.data.blocks %}
40
+ {% assign modules = site.data.modules %}
41
41
 
42
42
  {% comment %} Set config data (settings only)
43
43
  -------------------------------------------------------------------------------- {% endcomment %}
@@ -95,10 +95,13 @@ var date = new Date();
95
95
  var timestamp_now = date.toISOString();
96
96
  var gadScript = document.createElement('script');
97
97
  var adInitializerScript = document.createElement('script');
98
- var autoHideOnUnfilled = {{advertising_options.google.autoHideOnUnfilled}};
99
- var addBorderOnUnfilled = {{advertising_options.google.addBorderOnUnfilled}};
100
- var checkTrackingProtection = {{advertising_options.google.checkTrackingProtection}};
101
- var showErrorPageOnBlocked = {{advertising_options.google.showErrorPageOnBlocked}};
98
+ var advertisingDefaults;
99
+ var aadvertisingSettings;
100
+ var advertisingOptions;
101
+ var autoHideOnUnfilled;
102
+ var addBorderOnUnfilled;
103
+ var checkTrackingProtection;
104
+ var showErrorPageOnBlocked;
102
105
  var adInitializerScriptText;
103
106
  var tracking_protection;
104
107
  var url;
@@ -128,6 +131,16 @@ var logText;
128
131
  // [INFO ] [j1.adapter.advertising ] [ detected advertising provider (j1_config): {{advertising_provider}}} ]
129
132
  // [INFO ] [j1.adapter.advertising ] [ start processing load region head, layout: {{page.layout}} ]
130
133
 
134
+ // Load module DEFAULTS|CONFIG
135
+ advertisingDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
136
+ aadvertisingSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
137
+ advertisingOptions = $.extend(true, {}, advertisingDefaults, aadvertisingSettings);
138
+
139
+ autoHideOnUnfilled = analyticsOptions.google.autoHideOnUnfilled;
140
+ addBorderOnUnfilled = analyticsOptions.google.addBorderOnUnfilled;
141
+ checkTrackingProtection = analyticsOptions.google.checkTrackingProtection;
142
+ showErrorPageOnBlocked = analyticsOptions.google.showErrorPageOnBlocked;
143
+
131
144
  // -----------------------------------------------------------------------
132
145
  // Default module settings
133
146
  // -----------------------------------------------------------------------
@@ -159,7 +172,7 @@ var logText;
159
172
  var dependencies_met_page_ready = setInterval(function() {
160
173
  if (j1.getState() == 'finished') {
161
174
 
162
- providerID = '{{advertising_options.google.publisherID}}';
175
+ providerID = advertisingOptions.publisherID;
163
176
  advertisingProvider = 'Google Adsense';
164
177
  validProviderID = (providerID.includes('your')) ? false : true;
165
178
  if (!validProviderID) {
@@ -60,6 +60,9 @@ regenerate: true
60
60
  {% assign production = true %}
61
61
  {% endif %}
62
62
 
63
+ {% comment %} analytics_options: {{ analytics_options | debug }} {% endcomment %}
64
+
65
+
63
66
  /*
64
67
  # -----------------------------------------------------------------------------
65
68
  # ~/assets/themes/j1/adapter/js/analytics.js
@@ -91,15 +94,18 @@ var url = new liteURL(window.location.href);
91
94
  var hostname = url.hostname;
92
95
  var environment = '{{environment}}';
93
96
  var gaScript = document.createElement('script');
94
- var providerID = '{{analytics_options.google.trackingID}}';
95
- var skipAllHosts = '{{analytics_options.google.skipAllHosts}}';
96
- var validProviderID = (providerID.includes('your')) ? false : true;
97
- var optInOut = {{analytics_options.google.optInOut}};
98
- var anonymizeIP = {{analytics_options.google.anonymizeIP}};
99
97
  var cookie_names = j1.getCookieNames();
100
98
  var date = new Date();
101
99
  var timestamp_now = date.toISOString();
102
100
  var skipHost = false;
101
+ var analyticsDefaults;
102
+ var analyticsSettings;
103
+ var analyticsOptions;
104
+ var providerID;
105
+ var skipAllHosts;
106
+ var optInOut;
107
+ var anonymizeIP;
108
+ var validProviderID;
103
109
  var skipHosts;
104
110
  var gaCookies;
105
111
  var user_consent;
@@ -120,12 +126,22 @@ var logText;
120
126
  init: function (options) {
121
127
 
122
128
  {% if analytics %}
129
+
130
+ // Load module DEFAULTS|CONFIG
131
+ analyticsDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
132
+ analyticsSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
133
+ analyticsOptions = $.extend(true, {}, analyticsDefaults, analyticsSettings);
134
+
123
135
  // [INFO ] [j1.adapter.analytics ] [ detected analytics provider (j1_config): {{analytics_provider}}} ]
124
136
  // [INFO ] [j1.adapter.analytics ] [ start processing load region head, layout: {{page.layout}} ]
125
-
126
137
  {% case analytics_provider %}
127
138
  {% when "google" %}
128
139
  // [INFO ] [j1.adapter.analytics ] [ place provider: Google Adsense ]
140
+ providerID = analyticsOptions.google.trackingID;
141
+ skipAllHosts = analyticsOptions.google.skipAllHosts;
142
+ optInOut = analyticsOptions.google.optInOut;
143
+ anonymizeIP = analyticsOptions.google.anonymizeIP;
144
+ validProviderID = (providerID.includes('your')) ? false : true;
129
145
 
130
146
  // -----------------------------------------------------------------------
131
147
  // Default module settings
@@ -162,7 +178,7 @@ var logText;
162
178
  var dependencies_met_page_ready = setInterval(function() {
163
179
  if (j1.getState() == 'finished') {
164
180
 
165
- gaExists = document.getElementById('google-tag-manager');
181
+ gaExists = document.getElementById('google-tag-manager') === null ? false : true;
166
182
  skipHosts = skipAllHosts.replace(/,/g, ' ');
167
183
  skipHost = skipHosts.includes(hostname);
168
184
 
@@ -183,7 +199,7 @@ var logText;
183
199
  }
184
200
 
185
201
  user_consent = j1.readCookie(cookie_names.user_consent);
186
- if (user_consent.analysis) {
202
+ if (user_consent.analysis && !skipHost ) {
187
203
  if (validProviderID) {
188
204
  logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
189
205
  logger.info('\n' + 'enable Google Analytics on ID: ' + providerID);
@@ -63,6 +63,7 @@ regenerate: true
63
63
  {% assign production = true %}
64
64
  {% endif %}
65
65
 
66
+
66
67
  /*
67
68
  # -----------------------------------------------------------------------------
68
69
  # ~/assets/themes/j1/adapter/js/carousel.js
@@ -88,11 +89,13 @@ regenerate: true
88
89
  'use strict';
89
90
  j1.adapter.carousel = (function (j1, window) {
90
91
  var environment = '{{environment}}';
91
- var moduleOptions = {};
92
+ var dragging = false;
93
+ var carouselDefaults;
94
+ var carouselSettings;
95
+ var carouselOptions;
92
96
  var _this;
93
97
  var logger;
94
98
  var logText;
95
- var dragging = false;
96
99
 
97
100
  // ---------------------------------------------------------------------------
98
101
  // Helper functions
@@ -122,20 +125,14 @@ j1.adapter.carousel = (function (j1, window) {
122
125
  _this = j1.adapter.carousel;
123
126
  logger = log4javascript.getLogger('j1.adapter.carousel');
124
127
 
128
+ // Load module DEFAULTS|CONFIG
129
+ carouselDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
130
+ carouselSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
131
+ carouselOptions = $.extend(true, {}, carouselDefaults, carouselSettings);
132
+
125
133
  var dependencies_met_page_finished = setInterval(function() {
126
134
  if (j1.getState() == 'finished') {
127
135
 
128
- {% comment %} Load module config from yml data
129
- -------------------------------------------------------------------------- {% endcomment %}
130
- // Load module DEFAULTS|CONFIG
131
- /* eslint-disable */
132
- moduleOptions = $.extend({}, {{carousel_options | replace: '=>', ':' | replace: 'nil', '""'}});
133
- /* eslint-enable */
134
-
135
- if (typeof settings !== 'undefined') {
136
- moduleOptions = $.extend({}, moduleOptions, settings);
137
- }
138
-
139
136
  _this.setState('started');
140
137
  logger.debug('\n' + 'state: ' + _this.getState());
141
138
  logger.info('\n' + 'module is being initialized');
@@ -69,7 +69,9 @@ j1.adapter.clipboard = (function (j1, window) {
69
69
  // globals
70
70
  // ---------------------------------------------------------------------------
71
71
  var environment = '{{environment}}';
72
- var moduleOptions = {};
72
+ var clipboardDefaults;
73
+ var clipboardSettings;
74
+ var clipboardOptions;
73
75
  var logger;
74
76
  var logText;
75
77
  var _this;
@@ -104,6 +106,11 @@ j1.adapter.clipboard = (function (j1, window) {
104
106
  language = '{{site.language}}';
105
107
  logger = log4javascript.getLogger('j1.adapter.clipboard');
106
108
 
109
+ // Load module DEFAULTS|CONFIG
110
+ clipboardDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
111
+ clipboardSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
112
+ clipboardOptions = $.extend(true, {}, clipboardDefaults, clipboardSettings);
113
+
107
114
  // initialize state flag
108
115
  _this.state = 'started';
109
116
  logText = '\n' + 'initialization: started';