j1-template 2024.3.21 → 2024.3.23

data/assets/theme/j1/adapter/js/themes.js

@@ -107,6 +107,8 @@ regenerate:                             true
 "use strict";
 j1.adapter.themes = (function (j1, window) {
 
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;
+
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment               = '{{environment}}';
@@ -256,52 +258,14 @@ j1.adapter.themes = (function (j1, window) {
           user_consent = j1.readCookie(cookie_names.user_consent);
 
           _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized');
+          logger.debug('state: ' + _this.getState());
+          logger.info('module is being initialized');
 
           // hide page until 'theme' is loaded
-          logger.info('\n' + 'hide page until theme is loaded');
+          logger.info('hide page until theme is loaded');
           $('#no_flicker').hide();
 
-          logger.info('\n' + 'cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
-
-          // load previously selected theme from cookie (preferred)
-          // if (user_state.theme_css !== '') {
-          //   user_state.theme_name       = default_theme_name;
-          //   user_state.theme_css        = default_theme_css;
-          //   user_state.theme_author     = default_theme_author;
-          //   user_state.theme_author_url = default_theme_author_url;
-
-          //   cookie_written = j1.writeCookie({
-          //     name:     cookie_names.user_state,
-          //     data:     user_state,
-          //     secure:   secure,
-          //     expires:  365
-          //   });
-
-          //   if (!cookie_written) {
-          //     logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
-          //   }
-          // } // END load previously selected theme
-
-          // load default theme (j1_config and NO theme given with (user_state) cookie
-          // if (user_state.theme_css === '' && default_theme_css.theme_css !== '') {
-          //   user_state.theme_name       = default_theme_name;
-          //   user_state.theme_css        = default_theme_css;
-          //   user_state.theme_author     = default_theme_author;
-          //   user_state.theme_author_url = default_theme_author_url;
-
-          //   cookie_written = j1.writeCookie({
-          //     name:     cookie_names.user_state,
-          //     data:     user_state,
-          //     secure:   secure,
-          //     expires:  365
-          //   });
-
-          //   if (!cookie_written) {
-          //     logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
-          //   }
-          // } // END load default theme
+          logger.info('cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
 
           // load default theme if NO theme given with (user_state) cookie
           if (user_state.theme_css === '') {
@@ -318,43 +282,53 @@ j1.adapter.themes = (function (j1, window) {
             });
 
             if (!cookie_written) {
-             logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+             logger.error('failed to write cookie: ' + cookie_names.user_consent);
             }
-          } // END oad default theme
+          } // END load default theme
 
           // set the theme switcher state
           user_state.theme_switcher = themesOptions.enabled;
           if (themesOptions.enabled) {
-             // enable BS ThemeSwitcher
-             logger.info('\n' + 'themes detected as: ' + themesOptions.enabled);
-             logger.info('\n' + 'remote themes are being initialized');
-
-             /* eslint-disable */
-             // load list of remote themes
-             $('#remote_themes').ThemeSwitcher.defaults = {
-               debug:                    themesOptions.debug,
-               saveToCookie:             themesOptions.saveToCookie,
-               cssThemeLink:             themesOptions.cssThemeLink,
-               cookieThemeName:          themesOptions.cookieThemeName,
-               cookieDefaultThemeName:   themesOptions.cookieDefaultThemeName,
-               cookieThemeCss:           themesOptions.cookieThemeCss,
-               cookieThemeExtensionCss:  themesOptions.cookieThemeExtensionCss,
-               cookieExpiration:         themesOptions.cookieExpiration,
-               cookiePath:               themesOptions.cookiePath,
-               defaultCssFile:           themesOptions.defaultCssFile,
-               bootswatchApiUrl:         themesOptions.bootswatchApiUrl,
-               bootswatchApiVersion:     themesOptions.bootswatchApiVersion,
-               loadFromBootswatch:       themesOptions.loadFromBootswatch,
-               localFeed:                themesOptions.localThemes,
-               excludeBootswatch:        themesOptions.excludeBootswatch,
-               includeBootswatch:        themesOptions.includeBootswatch,
-               skipIncludeBootswatch:    themesOptions.skipIncludeBootswatch
-             };
-             /* eslint-enable */
-           } else {
-             logger.debug('\n' + 'themes detected as: disabled');
-             logger.debug('\n' + 'no remote themes are available');
-          } // END if themesOptions enabled
+            // enable BS ThemeSwitcher
+            logger.info('themes detected as: ' + themesOptions.enabled);
+            logger.info('remote themes are being initialized');
+
+            // validate if theme api json can be loaded
+            var bootswatchApiJson = `${themesOptions.bootswatchApiUrl}/${themesOptions.bootswatchApiVersion}.json`;
+            urlExists(bootswatchApiJson, function(success) {
+              // load theme
+              if (success) {
+                logger.debug('LOAD remote themes from: ' + bootswatchApiJson);
+                // continue processing if ap json is available
+                /* eslint-disable */
+                // load list of remote themes (api json file)
+                $('#remote_themes').ThemeSwitcher.defaults = {
+                  debug:                    themesOptions.debug,
+                  saveToCookie:             themesOptions.saveToCookie,
+                  cssThemeLink:             themesOptions.cssThemeLink,
+                  cookieThemeName:          themesOptions.cookieThemeName,
+                  cookieDefaultThemeName:   themesOptions.cookieDefaultThemeName,
+                  cookieThemeCss:           themesOptions.cookieThemeCss,
+                  cookieThemeExtensionCss:  themesOptions.cookieThemeExtensionCss,
+                  cookieExpiration:         themesOptions.cookieExpiration,
+                  cookiePath:               themesOptions.cookiePath,
+                  defaultCssFile:           themesOptions.defaultCssFile,
+                  bootswatchApiUrl:         themesOptions.bootswatchApiUrl,
+                  bootswatchApiVersion:     themesOptions.bootswatchApiVersion,
+                  loadFromBootswatch:       themesOptions.loadFromBootswatch,
+                  localFeed:                themesOptions.localThemes,
+                  excludeBootswatch:        themesOptions.excludeBootswatch,
+                  includeBootswatch:        themesOptions.includeBootswatch,
+                  skipIncludeBootswatch:    themesOptions.skipIncludeBootswatch
+                };
+                /* eslint-enable */
+              } else {
+                // failed to load oad list of remote themes (api json file)
+                // TODO: create fallback strategy
+                logger.error('failed to LOAD remote themes from: ' + bootswatchApiJson);
+              } // END if success
+            }); // END urlExists
+          } // END if themesOptions.enabled
 
           // validate theme to be loaded
           urlExists(user_state.theme_css, function(success) {
@@ -370,12 +344,12 @@ j1.adapter.themes = (function (j1, window) {
                }, 10); // END dependencies_met_theme_loaded
              } else {
                // invalid theme, fallback on default
-               logger.warn('\n' + 'themes CSS invalid: ' + user_state.theme_css);
+               logger.warn('themes CSS invalid: ' + user_state.theme_css);
 
                theme_css_html = '<link rel="stylesheet" id="' + id + '" href="' + default_theme_css + '" type="text/css">';
 
-               logger.debug('\n' + 'set default theme :' + default_theme_name);
-               logger.debug('\n' + 'theme CSS loaded: ' + default_theme_css);
+               logger.debug('set default theme :' + default_theme_name);
+               logger.debug('theme CSS loaded: ' + default_theme_css);
 
 
                $('head').append(theme_css_html);
@@ -394,7 +368,7 @@ j1.adapter.themes = (function (j1, window) {
                });
 
                if (!cookie_written) {
-                 logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+                 logger.error('failed to write cookie: ' + cookie_names.user_consent);
                }
 
                // reload page using the default thme
@@ -413,17 +387,17 @@ j1.adapter.themes = (function (j1, window) {
 
         if (styleLoaded) {
           // show page (theme is loaded)
-          logger.info('\n' + 'theme loaded successfully: ' + user_state.theme_name);
-          logger.debug('\n' + 'theme CSS loaded: ' + user_state.theme_css);
-          logger.info('\n' + 'show page on theme loaded');
+          logger.info('theme loaded successfully: ' + user_state.theme_name);
+          logger.debug('theme CSS loaded: ' + user_state.theme_css);
+          logger.info('show page on theme loaded');
           $('#no_flicker').show();
 
           _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'initializing module finished');
+          logger.debug('state: ' + _this.getState());
+          logger.info('initializing module finished');
 
           endTimeModule = Date.now();
-          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+          logger.info('module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
 
           clearInterval(dependencies_met_theme_applied);
         } // ENF if styleLoaded
@@ -438,7 +412,7 @@ j1.adapter.themes = (function (j1, window) {
     messageHandler: (sender, message) => {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logText = 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -450,7 +424,7 @@ j1.adapter.themes = (function (j1, window) {
         // place handling of command|action here
         //
 
-        logger.info('\n' + message.text);
+        logger.info(message.text);
       }
 
       //

data/assets/theme/j1/adapter/js/toccer.js

@@ -98,6 +98,8 @@ regenerate:                             true
 "use strict";
 j1.adapter.toccer = (() => {
 
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;
+
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment         = '{{environment}}';
@@ -165,8 +167,8 @@ j1.adapter.toccer = (() => {
 
       // initialize state flag
       // _this.setState('started');
-      // logger.debug('\n' + 'state: ' + _this.getState());
-      // logger.info('\n' + 'module is being initialized');
+      // logger.debug('state: ' + _this.getState());
+      // logger.info('module is being initialized');
 
       // -----------------------------------------------------------------------
       // module initializer
@@ -181,8 +183,8 @@ j1.adapter.toccer = (() => {
           startTimeModule = Date.now();
 
           _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized');
+          logger.debug('state: ' + _this.getState());
+          logger.info('module is being initialized');
 
           _this.initToccerCore(toccerOptions);
 
@@ -190,11 +192,11 @@ j1.adapter.toccer = (() => {
           _this['moduleOptions'] = toccerOptions;
 
           _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'initializing module finished');
+          logger.debug('state: ' + _this.getState());
+          logger.info('initializing module finished');
 
           endTimeModule = Date.now();
-          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+          logger.info('module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
 
           clearInterval(dependencies_met_toccer);
         } // END
@@ -209,7 +211,7 @@ j1.adapter.toccer = (() => {
       var scrollOffset            = j1.getScrollOffset(scrollOffsetCorrection) + scrollOffsetCorrection;
 
       _this.setState('running');
-      logger.debug('\n' + 'state: ' + _this.getState());
+      logger.debug('state: ' + _this.getState());
 
       // tocbot get fired if HTML portion is loaded (AJAX load finished)
       var dependencies_met_ajax_load_finished = setInterval (() => {
@@ -260,7 +262,7 @@ j1.adapter.toccer = (() => {
           });
           /* eslint-enable */
 
-          logger.debug('\n' + 'met dependencies for: loadHTML');
+          logger.debug('met dependencies for: loadHTML');
           clearInterval(dependencies_met_ajax_load_finished);
         } // END AJAX load finished
       }, 10); // END dependencies_met_ajax_load_finished
@@ -274,7 +276,7 @@ j1.adapter.toccer = (() => {
     messageHandler: (sender, message) => {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logText = 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -286,7 +288,7 @@ j1.adapter.toccer = (() => {
         // place handling of command|action here
         //
 
-        logger.info('\n' + message.text);
+        logger.info(message.text);
       }
 
       //

data/assets/theme/j1/adapter/js/translator.js

@@ -87,6 +87,9 @@ regenerate:                             true
 "use strict";
 
 j1.adapter.translator = (function (j1, window) {
+
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;
+
   var environment       = '{{environment}}';
   var state             = 'not_started';
   var user_translate    = {};
@@ -221,15 +224,15 @@ j1.adapter.translator = (function (j1, window) {
           }
 
           _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState ());
-          logger.info('\n' + 'module is being initialized');
+          logger.debug('state: ' + _this.getState ());
+          logger.info('module is being initialized');
 
           // load|initialize user translate cookie
           //
           if (j1.existsCookie(cookie_names.user_translate)) {
             user_translate = j1.readCookie(cookie_names.user_translate);
           } else {
-            logger.debug ('\n' + 'write to cookie : ' + cookie_names.user_translate);
+            logger.debug ('write to cookie : ' + cookie_names.user_translate);
             cookie_written = j1.writeCookie({
               name:     cookie_names.user_translate,
               data:     user_translate,
@@ -252,7 +255,7 @@ j1.adapter.translator = (function (j1, window) {
               // disable google translate button if visible
               //
               if ($('#quickLinksTranslateButton').css('display') === 'block')  {
-                logger.info('\n' + 'disable quickLinksTranslateButton');
+                logger.info('disable quickLinksTranslateButton');
                 $('#quickLinksTranslateButton').css('display', 'none');
               }
             }
@@ -260,7 +263,7 @@ j1.adapter.translator = (function (j1, window) {
               // enable google translate button if NOT visible
               //
               if ($('#quickLinksTranslateButton').css('display') === 'none')  {
-                logger.info('\n' + 'enable quickLinksTranslateButton');
+                logger.info('enable quickLinksTranslateButton');
                 $('#quickLinksTranslateButton').css('display', 'block');
               }
             }
@@ -282,7 +285,7 @@ j1.adapter.translator = (function (j1, window) {
             //
             j1.expireCookie({ name: cookie_names.user_translate });
           } else {
-            logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
+            logger.debug('write to cookie : ' + cookie_names.user_translate);
             cookie_written = j1.writeCookie({
               name:     cookie_names.user_translate,
               data:     user_translate,
@@ -330,7 +333,7 @@ j1.adapter.translator = (function (j1, window) {
           // enable|disable translation (after callback)
           if (user_translate.analysis && user_translate.personalization && user_translate.translationEnabled) {
             if (translatorOptions.translatorName === 'google') {
-              logger.info('\n' + 'append Google Translate Script: ' + gtTranslateScript.id);
+              logger.info('append Google Translate Script: ' + gtTranslateScript.id);
               head.appendChild(gtTranslateScript);
               if ($('google_translate_element')) {
                 $('google_translate_element').hide();
@@ -338,8 +341,8 @@ j1.adapter.translator = (function (j1, window) {
             }
           } else {
             if (translatorOptions.translatorName === 'google') {
-              logger.info('\n' + 'translation disabled');
-              logger.info('\n' + 'remove existing Google Translate cookies');
+              logger.info('translation disabled');
+              logger.info('remove existing Google Translate cookies');
 
               // remove all googtrans cookies that POTENTIALLY exists
               //
@@ -355,8 +358,8 @@ j1.adapter.translator = (function (j1, window) {
           // -------------------------------------------------------------------
 
           _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module initialized successfully');
+          logger.debug('state: ' + _this.getState());
+          logger.info('module initialized successfully');
 
           clearInterval(dependencies_met_page_ready);
         }
@@ -370,8 +373,8 @@ j1.adapter.translator = (function (j1, window) {
     // -------------------------------------------------------------------------
     postTranslateElementInit: function (response) {
       // code for post processing
-      logger.info('\n' + 'postTranslateElementInit entered');
-      logger.info('\n' + response.T.Dh);
+      logger.info('postTranslateElementInit entered');
+      logger.info(response.T.Dh);
 
       return;
     }, // END postTranslateElementInit
@@ -411,7 +414,7 @@ j1.adapter.translator = (function (j1, window) {
       }
 
       selectedTranslationLanguage = msDropdown.value;
-      logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
+      logger.info('selected translation language: ' + selectedTranslationLanguage);
 
       // set content language
       //
@@ -485,7 +488,7 @@ j1.adapter.translator = (function (j1, window) {
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logText = 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -497,7 +500,7 @@ j1.adapter.translator = (function (j1, window) {
         // Place handling of command|action here
         //
 
-        logger.info('\n' + message.text);
+        logger.info(message.text);
       }
 
       //

data/assets/theme/j1/adapter/js/videojs.js

@@ -73,6 +73,8 @@ regenerate:                             true
 "use strict";
 j1.adapter.videojs = ((j1, window) => {
 
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;
+
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var vjsDefaults;
@@ -132,19 +134,19 @@ j1.adapter.videojs = ((j1, window) => {
           startTimeModule = Date.now();
 
           _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized');
+          logger.debug('state: ' + _this.getState());
+          logger.info('module is being initialized');
 
           // save vjsOptions for later access
           j1.modules.videojs         = {};
           j1.modules.videojs.options = vjsOptions || {};
 
           _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'initializing module finished');
+          logger.debug('state: ' + _this.getState());
+          logger.info('initializing module finished');
 
           endTimeModule = Date.now();
-          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+          logger.info('module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
 
           clearInterval(dependencies_met_page_ready);
         } // END pageVisible
@@ -159,7 +161,7 @@ j1.adapter.videojs = ((j1, window) => {
     messageHandler: (sender, message) => {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logText = 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -171,7 +173,7 @@ j1.adapter.videojs = ((j1, window) => {
         // place handling of command|action here
         //
 
-        logger.info('\n' + message.text);
+        logger.info(message.text);
       }
 
       //

data/assets/theme/j1/adapter/js/waves.js

@@ -86,6 +86,8 @@ regenerate:                             true
 "use strict";
 j1.adapter.waves = ((j1, window) => {
 
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;
+
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment         = '{{environment}}';
@@ -166,40 +168,40 @@ j1.adapter.waves = ((j1, window) => {
           theme_enabled  = waveOptions.themes.indexOf(theme) > -1 ? true : false;
 
           _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized');
+          logger.debug('state: ' + _this.getState());
+          logger.info('module is being initialized');
 
-          logger.debug('\n' + 'themes allowd: ' + themes_allowed);
-          logger.debug('\n' + 'theme detected: ' + theme);
+          logger.debug('themes allowd: ' + themes_allowed);
+          logger.debug('theme detected: ' + theme);
 
           // TODO: Check why a timeout is required to enable|disable the wave elements
           if (themes_allowed === 'all') {
-            logger.info('\n' + 'activate waves for theme: ' + 'all' );
+            logger.info('activate waves for theme: ' + 'all' );
             setTimeout(() => {
               $('.wave').show();
-              logger.info('\n' + 'initializing module finished');
+              logger.info('initializing module finished');
             }, {{template_config.page_on_load_timeout}} );
           } else if (theme_enabled) {
-            logger.info('\n' + 'activate waves for theme: ' + theme );
+            logger.info('activate waves for theme: ' + theme );
             setTimeout(() => {
               $('.wave').show();
-              logger.info('\n' + 'initializing module finished');
+              logger.info('initializing module finished');
             }, {{template_config.page_on_load_timeout}} );
           } else {
-            logger.warn('\n' + 'no valid theme/s found');
-            logger.warn('\n' + 'deactivate (hide) waves');
+            logger.warn('no valid theme/s found');
+            logger.warn('deactivate (hide) waves');
             setTimeout(() => {
               $('.wave').hide();
-              logger.info('\n' + 'initializing module finished');
+              logger.info('initializing module finished');
             }, {{template_config.page_on_load_timeout}} );
           }
 
           _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'initializing module finished');
+          logger.debug('state: ' + _this.getState());
+          logger.info('initializing module finished');
 
           endTimeModule = Date.now();
-          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+          logger.info('module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
 
           clearInterval(dependencies_met_page_ready);
         } // END pageVisible
@@ -213,7 +215,7 @@ j1.adapter.waves = ((j1, window) => {
     messageHandler: (sender, message) => {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logText = 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -225,7 +227,7 @@ j1.adapter.waves = ((j1, window) => {
         // place handling of command|action here
         //
 
-        logger.info('\n' + message.text);
+        logger.info(message.text);
       }
 
       //