j1_template 2019.4.7 → 2019.4.8

data/lib/starter_web/assets/themes/j1/adapter/js/switcher.js

@@ -2,7 +2,6 @@
 regenerate:                         false
 ---
 
-
 {% capture cache %}
 
 {% comment %}
@@ -44,37 +43,35 @@ regenerate:                         false
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign config            = modules.j1_theme_switcher %}
+{% assign switcher_defaults = modules.defaults.theme_switcher.defaults %}
+{% assign switcher_settings = modules.theme_switcher.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-
+{% assign switcher_options  = switcher_defaults | merge: switcher_settings %}
 
 /*
  # -----------------------------------------------------------------------------
- #  ~/assets/themes/j1/adapter/js/switcher.js
- #  JS Adapter for J1 Switcher (BS Theme Switcher)
- #
- #  Product/Info:
- #  https://jekyll.one
- #  https://github.com/jguadagno/bootstrapThemeSwitcher
+ # ~/assets/themes/j1/adapter/js/switcher.js
+ # JS Adapter for J1 Switcher (BS Theme Switcher)
  #
- #  Copyright (C) 2019 Juergen Adams
- #  Copyright (C) 2014 Joseph Guadagno
+ # Product/Info:
+ # https://jekyll.one
+ # https://github.com/jguadagno/bootstrapThemeSwitcher
  #
- #  J1 Template is licensed under the MIT License.
- #  For details, see https://jekyll.one
- #  BS Theme Switcher is licensed under the MIT License.
- #  For details, see https://github.com/jguadagno/bootstrapThemeSwitcher/blob/master/LICENSE
+ # Copyright (C) 2019 Juergen Adams
+ # Copyright (C) 2014 Joseph Guadagno
  #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # BS Theme Switcher is licensed under the MIT License.
+ # For details, see https://github.com/jguadagno/bootstrapThemeSwitcher/blob/master/LICENSE
  # -----------------------------------------------------------------------------
- #  Adapter generated: {{site.time}}
+ # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 'use strict';
 
-{% assign config = site.data.modules.j1_theme_switcher %}
-
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 j1.adapter['switcher'] = (function (j1, window) {
@@ -100,40 +97,47 @@ j1.adapter['switcher'] = (function (j1, window) {
       logger = log4javascript.getLogger('j1.adapter.theme-switcher');
       state = 'started';
       logger.info('state: ' + state); // Set|Log status
-      logger.info("ThemeSwitcher being initialized");
-
-      //$().bootstrapThemeSwitcher.defaults = {
-      $('#ThemeList').bootstrapThemeSwitcher.defaults = {
-        debug:                    {{ config.debug | json }},
-        cssThemeLink:             {{ config.cssThemeLink | json }},
-        saveToCookie:             {{ config.saveToCookie | json }},
-        cookieThemeName:          {{ config.cookieThemeName | json }},
-        cookieDefaultThemeName:   {{ config.cookieDefaultThemeName | json }},
-        cookieThemeCss:           {{ config.cookieThemeCss | json }},
-        cookieThemeExtensionCss:  {{ config.cookieThemeExtensionCss | json }},
-        cookieExpiration:         {{ config.cookieExpiration | json }},
-        cookiePath:               {{ config.cookiePath | json }},
-        defaultCssFile:           {{ config.defaultCssFile | json }},
-        bootswatchApiUrl:         {{ config.bootswatchApiUrl | json }},
-        bootswatchApiVersion:     {{ config.bootswatchApiVersion | json }},
-        loadFromBootswatch:       {{ config.loadFromBootswatch | json }},
-        localFeed:                {{ config.localFeed | json }},
-        excludeBootswatch:        {{ config.excludeBootswatch | json }},
-        includeBootswatch:        {{ config.includeBootswatch | json }},
-        skipIncludeBootswatch:    {{ config.skipIncludeBootswatch | json }},
-        hideOnReload:             {{ config.hideOnReload | json }},
-      };
 
-/*
-      // Setup theme selectors moved to j1_adapter_navigator.js
-      // at callback for loading the menu bar
-      $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''}); // Load from Bootswatch API
-      $('#ThemeSelect').bootstrapThemeSwitcher();              // Load from localFeed
-*/
-
-      state = 'finished';
-      logger.info('state: ' + state); // Set|Log status
-      logger.info("J1 Theme Switcher initialized successfully");
+      {% if switcher_options.enabled %}
+        logger.info("ThemeSwitcher being initialized");
+
+        //$().bootstrapThemeSwitcher.defaults = {
+        $('#ThemeList').bootstrapThemeSwitcher.defaults = {
+          debug:                    {{ switcher_options.debug | json }},
+          cssThemeLink:             {{ switcher_options.cssThemeLink | json }},
+          saveToCookie:             {{ switcher_options.saveToCookie | json }},
+          cookieThemeName:          {{ switcher_options.cookieThemeName | json }},
+          cookieDefaultThemeName:   {{ switcher_options.cookieDefaultThemeName | json }},
+          cookieThemeCss:           {{ switcher_options.cookieThemeCss | json }},
+          cookieThemeExtensionCss:  {{ switcher_options.cookieThemeExtensionCss | json }},
+          cookieExpiration:         {{ switcher_options.cookieExpiration | json }},
+          cookiePath:               {{ switcher_options.cookiePath | json }},
+          defaultCssFile:           {{ switcher_options.defaultCssFile | json }},
+          bootswatchApiUrl:         {{ switcher_options.bootswatchApiUrl | json }},
+          bootswatchApiVersion:     {{ switcher_options.bootswatchApiVersion | json }},
+          loadFromBootswatch:       {{ switcher_options.loadFromBootswatch | json }},
+          localFeed:                {{ switcher_options.localFeed | json }},
+          excludeBootswatch:        {{ switcher_options.excludeBootswatch | json }},
+          includeBootswatch:        {{ switcher_options.includeBootswatch | json }},
+          skipIncludeBootswatch:    {{ switcher_options.skipIncludeBootswatch | json }},
+          hideOnReload:             {{ switcher_options.hideOnReload | json }},
+        };
+
+  /*
+        // Setup theme selectors moved to j1_adapter_navigator.js
+        // at callback for loading the menu bar
+        $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''}); // Load from Bootswatch API
+        $('#ThemeSelect').bootstrapThemeSwitcher();              // Load from localFeed
+  */
+
+        state = 'finished';
+        logger.info('state: ' + state); // Set|Log status
+        logger.info("J1 Theme Switcher initialized successfully");
+      {% else %}
+        state = 'finished';
+        logger.info('state: ' + state); // Set|Log status
+        logger.info("J1 Theme Switcher disabled");
+      {% endif %}
 
       return true;
     }, // END init
@@ -152,7 +156,7 @@ j1.adapter['switcher'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        status = 'finished';
         logger.info(message.text);
       }