j1-template 2024.1.5 → 2024.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_page.html +0 -34
- data/_includes/themes/j1/modules/searcher/generator.html +4 -1
- data/_includes/themes/j1/modules/searcher/procedures/topsearch.proc +59 -56
- data/assets/data/authclient.html +1 -8
- data/assets/data/banner.html +1 -7
- data/assets/data/fab.html +2 -13
- data/assets/data/footer.html +0 -3
- data/assets/data/galeries.html +2 -13
- data/assets/data/gemini-ui.html +74 -21
- data/assets/data/iframes.html +1 -4
- data/assets/data/masonry.html +1 -13
- data/assets/data/masterslider.html +10 -21
- data/assets/data/menu.html +6 -14
- data/assets/data/mmenu.html +6 -5
- data/assets/data/mmenu_toc.html +2 -1
- data/assets/data/panel.html +4 -11
- data/assets/data/particles.yml +8 -8
- data/assets/data/quicklinks.html +4 -23
- data/assets/data/rtext_resizer.html +3 -1
- data/assets/data/slick.html +9 -11
- data/assets/data/translator.html +0 -1
- data/assets/themes/j1/adapter/js/advertising.js +141 -172
- data/assets/themes/j1/adapter/js/algolia.js +61 -54
- data/assets/themes/j1/adapter/js/analytics.js +67 -47
- data/assets/themes/j1/adapter/js/asciidoctor.js +32 -20
- data/assets/themes/j1/adapter/js/attic.js +75 -69
- data/assets/themes/j1/adapter/js/bmd.js +195 -177
- data/assets/themes/j1/adapter/js/carousel.js +786 -761
- data/assets/themes/j1/adapter/js/chatbot.js +77 -35
- data/assets/themes/j1/adapter/js/clipboard.js +66 -49
- data/assets/themes/j1/adapter/js/comments.js +92 -70
- data/assets/themes/j1/adapter/js/cookieConsent.js +466 -462
- data/assets/themes/j1/adapter/js/customFunctions.js +52 -35
- data/assets/themes/j1/adapter/js/customModule.js +56 -46
- data/assets/themes/j1/adapter/js/docsearch.js +54 -34
- data/assets/themes/j1/adapter/js/dropdowns.js +65 -52
- data/assets/themes/j1/adapter/js/fab.js +123 -109
- data/assets/themes/j1/adapter/js/gallery.js +494 -476
- data/assets/themes/j1/adapter/js/gemini.js +933 -299
- data/assets/themes/j1/adapter/js/iconPicker.js +255 -235
- data/assets/themes/j1/adapter/js/iconPickerPage.js +279 -0
- data/assets/themes/j1/adapter/js/iframer.js +81 -61
- data/assets/themes/j1/adapter/js/j1.js +3285 -3222
- data/assets/themes/j1/adapter/js/lazyLoader.js +241 -222
- data/assets/themes/j1/adapter/js/lightbox.js +241 -241
- data/assets/themes/j1/adapter/js/logger.js +77 -66
- data/assets/themes/j1/adapter/js/lunr.js +688 -86
- data/assets/themes/j1/adapter/js/masonry.js +426 -411
- data/assets/themes/j1/adapter/js/masterslider.js +526 -527
- data/assets/themes/j1/adapter/js/mmenu.js +101 -66
- data/assets/themes/j1/adapter/js/navigator.js +291 -356
- data/assets/themes/j1/adapter/js/particles.js +61 -40
- data/assets/themes/j1/adapter/js/rangeSlider.js +65 -48
- data/assets/themes/j1/adapter/js/rouge.js +287 -269
- data/assets/themes/j1/adapter/js/rtable.js +309 -293
- data/assets/themes/j1/adapter/js/rtextResizer.js +57 -44
- data/assets/themes/j1/adapter/js/scroller.js +170 -133
- data/assets/themes/j1/adapter/js/slick.js +487 -485
- data/assets/themes/j1/adapter/js/slimSelect.js +290 -0
- data/assets/themes/j1/adapter/js/speak2me.js +124 -128
- data/assets/themes/j1/adapter/js/themeToggler.js +280 -260
- data/assets/themes/j1/adapter/js/{themer.js → themes.js} +145 -113
- data/assets/themes/j1/adapter/js/toccer.js +87 -54
- data/assets/themes/j1/adapter/js/translator.js +73 -70
- data/assets/themes/j1/adapter/js/waves.js +74 -58
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.css +29 -11
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.min.css +2 -2
- data/assets/themes/j1/core/js/template.js +474 -420
- data/assets/themes/j1/core/js/template.min.js +7 -7
- data/assets/themes/j1/core/js/template.min.js.map +1 -1
- data/assets/themes/j1/modules/carousel/css/theme/uno.css +4 -4
- data/assets/themes/j1/modules/carousel/css/theme/uno.min.css +1 -1
- data/assets/themes/j1/modules/clipboard/js/clipboard.js +0 -1
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js +4 -4
- data/assets/themes/j1/modules/iconPicker/css/theme/uno.css +58 -0
- data/assets/themes/j1/modules/iconPicker/css/theme/uno.min.css +16 -0
- data/assets/themes/j1/modules/iconPicker/js/universal-icon-picker.0.js +493 -0
- data/assets/themes/j1/modules/iconPicker/js/universal-icon-picker.js +7 -7
- data/assets/themes/j1/modules/lightGallery/js/plugins/lg-video.js +4 -4
- data/assets/themes/j1/modules/lightGallery/js/plugins/lg-video.min.js +2 -10
- data/assets/themes/j1/modules/lunr/css/j1.css +12 -6
- data/assets/themes/j1/modules/lunr/css/j1.min.css +1 -1
- data/assets/themes/j1/modules/lunr/js/j1.js +46 -43
- data/assets/themes/j1/modules/lunr/js/j1.min.js +1 -1
- data/assets/themes/j1/modules/masterslider/js/masterslider.js +1 -1
- data/assets/themes/j1/modules/scroller/js/scroller.js +64 -74
- data/assets/themes/j1/modules/scroller/js/scroller.min.js +1 -1
- data/assets/themes/j1/modules/slick/slider/css/theme/uno.css +4 -4
- data/assets/themes/j1/modules/slick/slider/css/theme/uno.min.css +1 -1
- data/assets/themes/j1/modules/slimSelect/js/select.js +1865 -1821
- data/assets/themes/j1/modules/slimSelect/js/select.min.js +2 -1
- data/assets/themes/j1/modules/themeSwitcher/js/switcher.js +87 -89
- data/assets/themes/j1/modules/themeSwitcher/js/switcher.min.js +1 -1
- data/assets/themes/j1/modules/videojs/js/plugins/vm/api/player.min.js +5 -7
- data/assets/themes/j1/modules/videojs/js/plugins/vm/api/v2.20.1/player.min.js +23 -0
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +2 -2
- data/lib/starter_web/README.md +5 -5
- data/lib/starter_web/_config.yml +1 -1
- data/lib/starter_web/_data/blocks/_panel.yml +775 -0
- data/lib/starter_web/_data/blocks/panel.yml +53 -53
- data/lib/starter_web/_data/j1_config.yml +3 -2
- data/lib/starter_web/_data/layouts/default.yml +0 -2
- data/lib/starter_web/_data/modules/_scroller.yml +102 -0
- data/lib/starter_web/_data/modules/carousel.yml +3 -3
- data/lib/starter_web/_data/modules/defaults/attics.yml +5 -5
- data/lib/starter_web/_data/modules/defaults/docsearch.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/gemini.yml +204 -46
- data/lib/starter_web/_data/modules/defaults/{iconPicker.yml → icon_picker.yml} +6 -12
- data/lib/starter_web/_data/modules/defaults/lunr.yml +20 -5
- data/lib/starter_web/_data/modules/defaults/masterslider.yml +4 -4
- data/lib/starter_web/_data/modules/defaults/navigator.yml +20 -24
- data/lib/starter_web/_data/modules/defaults/particles.yml +3 -3
- data/lib/starter_web/_data/modules/defaults/slim_select.yml +54 -0
- data/lib/starter_web/_data/modules/defaults/{themer.yml → themes.yml} +171 -171
- data/lib/starter_web/_data/modules/defaults/toccer.yml +1 -1
- data/lib/starter_web/_data/modules/gallery.yml +33 -38
- data/lib/starter_web/_data/modules/gemini.yml +42 -3
- data/lib/starter_web/_data/modules/{iconPicker.yml → icon_picker.yml} +31 -3
- data/lib/starter_web/_data/modules/lunr.yml +12 -1
- data/lib/starter_web/_data/modules/masonry.yml +37 -38
- data/lib/starter_web/_data/modules/masterslider.yml +78 -95
- data/lib/starter_web/_data/modules/navigator_menu.yml +12 -20
- data/lib/starter_web/_data/modules/particles.yml +3 -3
- data/lib/starter_web/_data/modules/scroller.yml +3 -3
- data/lib/starter_web/_data/modules/slim_select.yml +110 -0
- data/lib/starter_web/_data/modules/{themer.yml → themes.yml} +4 -4
- data/lib/starter_web/_data/resources.yml +57 -47
- data/lib/starter_web/_data/templates/feed.xml +1 -1
- data/lib/starter_web/_includes/attributes.asciidoc +354 -355
- data/lib/starter_web/_plugins/asciidoctor/gemini-ui-block.rb +1 -1
- data/lib/starter_web/_plugins/asciidoctor/slim-select-block.rb +45 -0
- data/lib/starter_web/_plugins/index/lunr.rb +1 -1
- data/lib/starter_web/collections/asciidoc_skeletons/simple-post/_posts/yyyy-mm-dd-your-post-name.asciidoc +5 -2
- data/lib/starter_web/collections/posts/public/featured/_posts/0000-00-00-welcome-to-j1.adoc.erb +3 -3
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-01-01-about-cookies.adoc +9 -9
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-02-01-static-site-generators.adoc +4 -4
- data/lib/starter_web/collections/posts/public/featured/_posts/2022-02-01-about-j1.adoc +3 -2
- data/lib/starter_web/collections/posts/public/featured/_posts/2023-10-18-url-types.adoc +12 -12
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/about/features.adoc +1 -1
- data/lib/starter_web/pages/public/about/reporting_issues.adoc +1 -0
- data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/_includes/attributes.asciidoc +44 -44
- data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/documentation.adoc +1 -0
- data/lib/starter_web/pages/public/asciidoc_skeletons/multi-document/_includes/attributes.asciidoc +12 -12
- data/lib/starter_web/pages/public/blog/navigator/archive/allview.html +1 -1
- data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/attributes.asciidoc +42 -28
- data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/highlghter_rouge.adoc +1 -0
- data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/lunr_search.adoc +1 -0
- data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/present_audio_video.adoc +18 -2
- data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/present_images.adoc +500 -507
- data/lib/starter_web/pages/public/legal/en/100_copyright.adoc +6 -11
- data/lib/starter_web/pages/public/legal/en/200_impress.adoc +4 -11
- data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +5 -12
- data/lib/starter_web/pages/public/legal/en/400_comment_policy.adoc +5 -10
- data/lib/starter_web/pages/public/tools/previewer/_includes/attributes.asciidoc +10 -9
- data/lib/starter_web/pages/public/tools/previewer/preview_bootstrap_theme.adoc +77 -75
- metadata +50 -46
- data/lib/starter_web/pages/public/manuals/integrations/gemini/_includes/attributes.asciidoc +0 -47
- data/lib/starter_web/pages/public/manuals/integrations/gemini/_includes/documents/preview_google_adsense.asciidoc +0 -448
- data/lib/starter_web/pages/public/manuals/integrations/gemini/_includes/documents/readme +0 -0
- data/lib/starter_web/pages/public/manuals/integrations/gemini/_includes/tables/readme +0 -0
- data/lib/starter_web/pages/public/manuals/integrations/gemini/gemini.adoc +0 -525
- data/lib/starter_web/pages/public/manuals/integrations/gemini/security.asccidoc +0 -274
- data/lib/starter_web/pages/public/manuals/integrations/gemini/security.hrml +0 -560
- /data/lib/starter_web/pages/public/{legal/learn → learn}/bookshelf/article_previewer/viewer_biography.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/bookshelf/article_previewer/viewer_fantasy.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/bookshelf/article_previewer/viewer_romance.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/bookshelf/jekyll_collections.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/bookshelf/viewer_all_books.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/100_gistblock.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_bottom_info.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_bottom_left_warning.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_bottom_right_danger.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_central_success.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_full_height_left_info.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_full_height_right_success.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_table_bs_modal_examples.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_top_info.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_top_left_info.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/410_top_right_success.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/419_advanced_modals_demo.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/tables/bs_modal_examples.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/themes_bootstrap.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/_includes/documents/themes_rouge.asciidoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/asciidoc_extensions.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/bootstrap_themes.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/icon_fonts.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/modal_extentions.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/responsive_tables.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/roundtrip/typography.adoc +0 -0
- /data/lib/starter_web/pages/public/{legal/learn → learn}/where_to_go.adoc +0 -0
@@ -28,8 +28,8 @@ regenerate: true
|
|
28
28
|
|
29
29
|
{% comment %} Set global settings
|
30
30
|
-------------------------------------------------------------------------------- {% endcomment %}
|
31
|
-
{% assign environment
|
32
|
-
{% assign template_version
|
31
|
+
{% assign environment = site.environment %}
|
32
|
+
{% assign template_version = site.version %}
|
33
33
|
|
34
34
|
{% comment %} Process YML config data
|
35
35
|
================================================================================ {% endcomment %}
|
@@ -82,11 +82,10 @@ regenerate: true
|
|
82
82
|
/* eslint indent: "off" */
|
83
83
|
// -----------------------------------------------------------------------------
|
84
84
|
'use strict';
|
85
|
-
j1.adapter.logger = (
|
85
|
+
j1.adapter.logger = ((j1, window) => {
|
86
86
|
|
87
|
-
|
88
|
-
|
89
|
-
// ---------------------------------------------------------------------------
|
87
|
+
{% comment %} Global variables
|
88
|
+
------------------------------------------------------------------------------ {% endcomment %}
|
90
89
|
var environment = '{{environment}}';
|
91
90
|
var page_id = j1.generateId(11);
|
92
91
|
var cookie_names = j1.getCookieNames();
|
@@ -99,8 +98,6 @@ j1.adapter.logger = (function (j1, window) {
|
|
99
98
|
var loggerOptions;
|
100
99
|
var user_session;
|
101
100
|
var appDetected;
|
102
|
-
var _this;
|
103
|
-
var logger;
|
104
101
|
var ajaxAppender;
|
105
102
|
var consoleAppender;
|
106
103
|
var jsonLayout;
|
@@ -110,9 +107,19 @@ j1.adapter.logger = (function (j1, window) {
|
|
110
107
|
var nullLayout;
|
111
108
|
var simpleLayout;
|
112
109
|
var patternLayout;
|
113
|
-
var logText;
|
114
110
|
var payloadURL;
|
115
111
|
|
112
|
+
var _this;
|
113
|
+
var logger;
|
114
|
+
var logText;
|
115
|
+
|
116
|
+
// date|time
|
117
|
+
var startTime;
|
118
|
+
var endTime;
|
119
|
+
var startTimeModule;
|
120
|
+
var endTimeModule;
|
121
|
+
var timeSeconds;
|
122
|
+
|
116
123
|
// ---------------------------------------------------------------------------
|
117
124
|
// helper functions
|
118
125
|
//
|
@@ -122,7 +129,7 @@ j1.adapter.logger = (function (j1, window) {
|
|
122
129
|
// throw a 'fake' exception to retrieve the stack trace and analyze
|
123
130
|
// to find the line from which this function was called
|
124
131
|
// ---------------------------------------------------------------------------
|
125
|
-
var getCustomData =
|
132
|
+
var getCustomData = (layout, loggingReference) => {
|
126
133
|
var customData = [];
|
127
134
|
|
128
135
|
try { (0)(); } catch (e) {
|
@@ -160,7 +167,7 @@ j1.adapter.logger = (function (j1, window) {
|
|
160
167
|
return customData[0].value;
|
161
168
|
};
|
162
169
|
|
163
|
-
var requestCallback =
|
170
|
+
var requestCallback = (data) => {
|
164
171
|
var xhrData = data;
|
165
172
|
//
|
166
173
|
// place handling of command|action here
|
@@ -169,19 +176,19 @@ j1.adapter.logger = (function (j1, window) {
|
|
169
176
|
};
|
170
177
|
|
171
178
|
// ---------------------------------------------------------------------------
|
172
|
-
// main
|
173
|
-
//
|
179
|
+
// main
|
180
|
+
// ---------------------------------------------------------------------------
|
174
181
|
return {
|
175
182
|
|
176
183
|
// -------------------------------------------------------------------------
|
177
|
-
// initializer
|
184
|
+
// adapter initializer
|
178
185
|
// -------------------------------------------------------------------------
|
179
|
-
init:
|
186
|
+
init: (options) => {
|
180
187
|
// initialize state flag
|
181
188
|
j1.adapter.logger.state = 'started';
|
182
189
|
|
183
190
|
// -----------------------------------------------------------------------
|
184
|
-
//
|
191
|
+
// default module settings
|
185
192
|
// -----------------------------------------------------------------------
|
186
193
|
var settings = $.extend({
|
187
194
|
module_name: 'j1.adapter.logger',
|
@@ -189,10 +196,10 @@ j1.adapter.logger = (function (j1, window) {
|
|
189
196
|
}, options);
|
190
197
|
|
191
198
|
// -----------------------------------------------------------------------
|
192
|
-
//
|
199
|
+
// global variable settings
|
193
200
|
// -----------------------------------------------------------------------
|
194
|
-
_this
|
195
|
-
logger
|
201
|
+
_this = j1.adapter.logger;
|
202
|
+
logger = log4javascript.getLogger('j1.adapter.logger');
|
196
203
|
|
197
204
|
// Load module DEFAULTS|CONFIG
|
198
205
|
loggerDefaults = $.extend({}, {{logger_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
@@ -204,21 +211,23 @@ j1.adapter.logger = (function (j1, window) {
|
|
204
211
|
utilServerOptions = $.extend({}, {{util_server_options | replace: '=>', ':' | replace: 'nil', '""'}});
|
205
212
|
/* eslint-enable */
|
206
213
|
|
207
|
-
//
|
208
|
-
//
|
209
|
-
|
210
|
-
|
214
|
+
// -----------------------------------------------------------------------
|
215
|
+
// module initializer
|
216
|
+
// -----------------------------------------------------------------------
|
217
|
+
var dependencies_met_mode_detected = setInterval(() => {
|
218
|
+
var userSession = j1.readCookie(cookie_names.user_session);
|
219
|
+
var sessionReady = (userSession.mode !== 'na') ? true : false;
|
211
220
|
|
212
|
-
if (
|
213
|
-
|
214
|
-
|
215
|
-
appDetected = user_session.mode === 'app' ? true : false;
|
221
|
+
if (sessionReady) {
|
222
|
+
startTimeModule = Date.now();
|
223
|
+
|
224
|
+
// appDetected = user_session.mode === 'app' ? true : false;
|
225
|
+
// if (appDetected) {
|
226
|
+
// payloadURL = ajaxAppenderOptions.payload_url_app;
|
227
|
+
// } else {
|
228
|
+
// payloadURL = ajaxAppenderOptions.payload_url_web;
|
229
|
+
// }
|
216
230
|
|
217
|
-
if (appDetected) {
|
218
|
-
payloadURL = ajaxAppenderOptions.payload_url_app;
|
219
|
-
} else {
|
220
|
-
payloadURL = ajaxAppenderOptions.payload_url_web;
|
221
|
-
}
|
222
231
|
payloadURL = 'http://localhost:' + utilServerOptions.port + '/log2disk?request=write';
|
223
232
|
|
224
233
|
// -------------------------------------------------------------------
|
@@ -241,23 +250,19 @@ j1.adapter.logger = (function (j1, window) {
|
|
241
250
|
ajaxAppender.addHeader('X-TZ-Offset', loggerOptions.tz_offset);
|
242
251
|
|
243
252
|
// success callback for testing (disabled for default)
|
244
|
-
//
|
245
253
|
if (loggerRequestCallback) {
|
246
254
|
ajaxAppender.setRequestSuccessCallback(requestCallback);
|
247
255
|
}
|
248
256
|
|
249
|
-
// -----------------------------------------------------------------------
|
250
257
|
// setup layouts
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
// Use the method getLineNumber() as the value for the 0th custom field
|
260
|
-
//
|
258
|
+
patternLayout = new log4javascript.PatternLayout('[%d{HH:mm:ss.SSS}] [%f{4}] [%-5p] [%-60c] [%f{1}:%f{2}] %m%n[%f{3}]');
|
259
|
+
httpPostDataLayout = new log4javascript.HttpPostDataLayout();
|
260
|
+
xmlLayout = new log4javascript.XmlLayout();
|
261
|
+
jsonLayout = new log4javascript.JsonLayout();
|
262
|
+
nullLayout = new log4javascript.NullLayout();
|
263
|
+
simpleLayout = new log4javascript.SimpleLayout();
|
264
|
+
|
265
|
+
// use the method getLineNumber() as the value for the 0th custom field
|
261
266
|
patternLayout.setCustomField('file', getCustomData);
|
262
267
|
patternLayout.setCustomField('line', getCustomData);
|
263
268
|
patternLayout.setCustomField('path', getCustomData);
|
@@ -267,24 +272,24 @@ j1.adapter.logger = (function (j1, window) {
|
|
267
272
|
consoleAppender.setLayout(patternLayout);
|
268
273
|
ajaxAppender.setLayout(httpPostDataLayout);
|
269
274
|
|
270
|
-
// -----------------------------------------------------------------------
|
271
275
|
// setup log levels
|
272
|
-
|
273
|
-
if (environment == 'production') {
|
276
|
+
if (environment === 'production') {
|
274
277
|
log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
|
275
278
|
}
|
276
|
-
if (environment
|
279
|
+
if (environment === 'development' || environment == 'devel' || environment == 'dev' || environment == 'test') {
|
277
280
|
log4javascript.getLogger('j1').setLevel(log4javascript.Level.DEBUG);
|
278
281
|
} else {
|
279
282
|
// fallback settings
|
280
283
|
log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
|
281
284
|
}
|
282
285
|
|
283
|
-
// -----------------------------------------------------------------------
|
284
286
|
// setup (root) loggers
|
285
|
-
//
|
286
287
|
log4javascript.getRootLogger().addAppender(consoleAppender);
|
287
288
|
|
289
|
+
_this.setState('started');
|
290
|
+
logger.debug('\n' + 'state: ' + _this.getState());
|
291
|
+
logger.info('\n' + 'module is being initialized');
|
292
|
+
|
288
293
|
// to use the ajaxAppender (write logs to disk), the utility server
|
289
294
|
// needs to be enabled (util_srv.yml) as well
|
290
295
|
//
|
@@ -299,16 +304,20 @@ j1.adapter.logger = (function (j1, window) {
|
|
299
304
|
logger.debug('\n' + 'state: ' + _this.getState());
|
300
305
|
logger.info('\n' + 'module initialized successfully');
|
301
306
|
|
307
|
+
endTimeModule = Date.now();
|
308
|
+
logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
|
309
|
+
|
310
|
+
clearInterval(dependencies_met_mode_detected);
|
302
311
|
return true;
|
303
|
-
}
|
304
|
-
}, 10); // END
|
312
|
+
} // END sessionReady
|
313
|
+
}, 10); // END dependencies_met_mode_detected
|
305
314
|
}, // END init
|
306
315
|
|
307
316
|
// -------------------------------------------------------------------------
|
308
|
-
// messageHandler
|
309
|
-
// manage messages
|
317
|
+
// messageHandler()
|
318
|
+
// manage messages send from other J1 modules
|
310
319
|
// -------------------------------------------------------------------------
|
311
|
-
messageHandler:
|
320
|
+
messageHandler: (sender, message) => {
|
312
321
|
var json_message = JSON.stringify(message, undefined, 2);
|
313
322
|
|
314
323
|
logText = '\n' + 'received message from ' + sender + ': ' + json_message;
|
@@ -316,11 +325,13 @@ j1.adapter.logger = (function (j1, window) {
|
|
316
325
|
|
317
326
|
// -----------------------------------------------------------------------
|
318
327
|
// process commands|actions
|
319
|
-
//
|
328
|
+
// -----------------------------------------------------------------------
|
320
329
|
if (message.type === 'command' && message.action === 'module_initialized') {
|
330
|
+
|
321
331
|
//
|
322
332
|
// place handling of command|action here
|
323
333
|
//
|
334
|
+
|
324
335
|
logger.info('\n' + message.text);
|
325
336
|
}
|
326
337
|
|
@@ -332,22 +343,22 @@ j1.adapter.logger = (function (j1, window) {
|
|
332
343
|
}, // END messageHandler
|
333
344
|
|
334
345
|
// -------------------------------------------------------------------------
|
335
|
-
// setState
|
336
|
-
//
|
346
|
+
// setState()
|
347
|
+
// sets the current (processing) state of the module
|
337
348
|
// -------------------------------------------------------------------------
|
338
|
-
setState:
|
339
|
-
|
349
|
+
setState: (stat) => {
|
350
|
+
_this.state = stat;
|
340
351
|
}, // END setState
|
341
352
|
|
342
353
|
// -------------------------------------------------------------------------
|
343
|
-
// getState
|
344
|
-
//
|
354
|
+
// getState()
|
355
|
+
// Returns the current (processing) state of the module
|
345
356
|
// -------------------------------------------------------------------------
|
346
|
-
getState:
|
347
|
-
return
|
348
|
-
} // END
|
357
|
+
getState: () => {
|
358
|
+
return _this.state;
|
359
|
+
} // END getState
|
349
360
|
|
350
|
-
}; // END return
|
361
|
+
}; // END main (return)
|
351
362
|
})(j1, window);
|
352
363
|
|
353
364
|
{% endcapture %}
|