j1-template 2021.1.5 → 2021.1.10

data/assets/themes/j1/modules/themeSwitcher/js/switcher.min.js

@@ -1,6 +1,6 @@
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/modules/bsThemeSwitcher/js/switcher.min.js
+ # ~/assets/themes/j1/modules/bsThemeSwitcher/js/switcher.js
  # Provides Javascript functions for Bootstrap ThemeSwitcher
  #
  # Product/Info:
@@ -15,7 +15,26 @@
  # Bootstrap Theme Switcher is licensed under the MIT License.
  # See: https://github.com/jguadagno/bootstrapThemeSwitcher
  # -----------------------------------------------------------------------------
+ # NOTE: This modules is MODIFIED to be used with MobileMenu (mmenuLight).
+ #       The original version cannot be used with J1 for theme menu creation!
+ # -----------------------------------------------------------------------------
 */
+'use strict';
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }]          */
+/* eslint no-unused-vars: "off"                                               */
+/* eslint no-undef: "off"                                                     */
+/* eslint no-useless-escape: "off"                                            */
+/* eslint no-prototype-builtins: "off"                                        */
+/* eslint no-shadow-restricted-names: "off"                                   */
+/* global jQuery                                                              */
+/* global Cookies                                                             */
+// -----------------------------------------------------------------------------
+
 /**
 * jQuery Twitter Bootstrap Theme Switcher v1.1.5
 * https://github.com/jguadagno/bootstrapThemeSwitcher
@@ -23,4 +42,393 @@
 * Copyright 2014, Joseph Guadagno
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */
-"use strict";(function(h,i,j,e){var d=h.fn.bootstrapThemeSwitcher;var f=j1.getCookieNames();const n=f.user_state;var m=log4javascript.getLogger("j1.core.switcher");var a;var g;var b={};var k;var c;var l=function(p,o){this.$element=h(p);this.settings=h.extend({},h.fn.bootstrapThemeSwitcher.defaults,o);this.themesList=[];this.getThemes();return this};l.prototype={clear:function(){m.debug("bootstrapThemeSwitcher.clear");return this.$element.each(function(){this.$element.empty()})},update:function(){m.debug("bootstrapThemeSwitcher.update");this.getThemes()},checkStyleSheetByName:function(o){var r=false;var s="/"+o+"/";var q=new RegExp(s,"i");for(var p=0;p<j.styleSheets.length;p++){if(q.test(j.styleSheets[p].href)){r=true;break}}return r},switchTheme:function(p,u){var v=h(this);var r=h.extend({},h.fn.bootstrapThemeSwitcher.defaults,v.data("bootstrapThemeSwitcher"));var t;var x;var w;var q=r.cssThemeLink;var o=r.debug;var s=this.settings.includeBootswatch;g=j1.existsCookie("j1.user.state");if(g){m.debug("user state cookie found");b=j1.readCookie(n)}else{m.error("user state NOT cookie found")}t=b.theme_name;x=b.theme_css;w=b.theme_extension_css;if(u===e){u=this.settings.defaultCssFile}if(p===e){p=u}if(p===this.settings.skipIncludeBootswatch){s=""}if(r.saveToCookie){if(Cookies===e){if(o==="true"){m.error("saveToCookie is set to true but Cookies library is not present")}return false}b.theme_name=p;b.theme_css=u;if(!(b.theme_name.includes("Uno")||b.theme_name=="Bootstrap")){b.theme_author="Bootswatch";b.theme_author_url="https://bootswatch.com/"}else{b.theme_author="J1 Team";b.theme_author_url="https://jekyll.one/"}j1.writeCookie({name:n,data:b});location.reload(true)}else{m.warn("write to cookie : disabled");m.warn("selected theme not activated: "+p)}},loadThemeFromCookie:function(o){if(Cookies===e){m.error("loadThemeFromCookie was called but Cookies library is not present");return false}var p=h.extend({},h.fn.bootstrapThemeSwitcher.defaults,o);g=j1.existsCookie("j1.user.state");if(g){m.info("User state cookie found");b=j1.readCookie(n)}else{m.error("User state NOT cookie found")}var r=b.theme_name;var q=b.theme_css;this.switchTheme(r,q)},addTheme:function(p,o,r,q){if(r===e){r=0}if(q===e){q=0}this.themesList.splice(r,q,{name:p,css:o});this.addThemesToControl()},addThemesToControl:function(){if(this.$element===e){m.error("bootstrapThemeSelector|addThemesToControl: Element is undefined");return false}if(this.themesList===e){m.error("bootstrapThemeSelector|addThemesToControl: Themes is undefined");return false}if(this.settings.excludeBootswatch){var v;if(this.settings.excludeBootswatch.indexOf(",")!==-1){v=this.settings.excludeBootswatch.replace(/ /g,"").split(",")}else{v=[];v.push(this.settings.excludeBootswatch)}var r=this.themesList;h.each(r,function(z,A){if(A&&A.name){if(h.inArray(A.name,v)!==-1){r.splice(z,1)}}});this.themesList=r}var q=this;if(this.$element.is("ul")){var w=h(this);var s=h.extend({},h.fn.bootstrapThemeSwitcher.defaults,w.data("bootstrapThemeSwitcher"));var p=s.cssThemeLink;var t;var o=s.debug;g=j1.existsCookie("j1.user.state");if(g){m.debug("User state cookie found");b=j1.readCookie(n)}else{m.error("User state NOT cookie found")}t=b.theme_name;if(o==="true"){m.debug("bootstrapThemeSelector: UL element selected")}this.$element.empty();var y;var x="#9E9E9E";h.each(this.themesList,function(A,B){if(q.$element[0].id.includes("mmenu")){y="mmenu-item"}else{y="dropdown-item"}if(B.name===t){if(q.$element[0].id.includes("mmenu")){y="mmenu-item active"}else{y="dropdown-item active"}}var z=h("<li />").attr("class",y).append('<a href="#"><i class="mdi mdi-view-quilt mdi-18px mr-2" style="color: '+x+'"></i>'+B.name+"</a>").on("click",function(){if(s.loadFromBootswatch){q.switchTheme(B.name,B.css)}else{q.switchTheme(B.name,B.cssCdn)}h(this).parent().find("li").removeClass("active");h(this).addClass("active")});q.$element.append(z)})}else{if(this.$element.is("select")){m.debug("bootstrapThemeSelector: SELECT element selected");this.$element.empty();var u;h.each(this.themesList,function(z,A){u=null;if(A.name===t){u="selected"}if(s.loadFromBootswatch){q.$element.append("<option "+u+" value='"+A.css+"'>"+A.name+"</option>")}else{q.$element.append("<option "+u+" value='"+A.cssCdn+"'>"+A.name+"</option>")}});this.$element.on("change",function(){var z=h("option:selected",this);q.switchTheme(z.text(),z.val())})}else{m.info("bootstrapThemeSelector: no UL or SELECT element found");m.error("bootstrapThemeSelector: failed")}}},getThemes:function(){var o=this;if(this.settings.localFeed!==null&&this.settings.localFeed!==""){h.ajax({url:this.settings.localFeed,dataType:"json",success:function(p){o.themesList=p.themes;o.addThemesToControl()},error:function(p,r,q){m.error("Failed to retrieve the local feed from: '"+o.settings.localFeed+"'")}})}else{h.ajax({url:this.settings.bootswatchApiUrl+"/"+this.settings.bootswatchApiVersion+".json",dataType:"json",success:function(p){if(p.themes===e){return null}o.themesList=p.themes;o.themesList.splice(0,0,{name:"default",css:o.settings.defaultCssFile});o.addThemesToControl()}})}},themes:function(o){if(o===e){return this.themesList}else{this.themesList=o}}};h.fn.bootstrapThemeSwitcher=function(q){var s;var p=Array.prototype.slice.call(arguments,1);var t=h(this);var r=t.data("bootstrapThemeSwitcher");var o=typeof q==="object"&&q;if(!r){t.data("bootstrapThemeSwitcher",(r=new l(this,o)))}if(typeof q==="string"){s=r[q].apply(r,p)}return(s===e)?t:s};h.fn.bootstrapThemeSwitcher.defaults={debug:false,saveToCookie:true,cssThemeLink:"bootstrapTheme",cookieThemeName:"bootstrapTheme.name",cookieThemeCss:"boostrapTheme.css",cookieExpiration:365,cookiePath:"/",defaultCssFile:"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css",bootswatchApiUrl:"https://bootswatch.com/api/",bootswatchApiVersion:"4",loadFromBootswatch:true,localFeed:"",excludeBootswatch:""};h.fn.bootstrapThemeSwitcher.Constructor=l;h.fn.bootstrapThemeSwitcher.noConflict=function(){h.fn.BootstrapThemeSwitcher=d;return this}})(jQuery,window,document);
+
+(function ($, window, document, undefined) {
+
+  var old = $.fn.bootstrapThemeSwitcher;
+
+  var cookie_names              = j1.getCookieNames();
+  const user_state_cookie_name  = cookie_names.user_state;
+
+  var logger = log4javascript.getLogger('j1.core.switcher');
+  var logText;
+
+  var user_state_detected;
+  var j1_user_state = {};
+  var j1_user_state_json;
+  var j1_user_state_cookie;
+
+  // Constructor
+  // ---------------------------------------------------------------------------
+  var BootstrapThemeSwitcher = function (element, options) {
+
+    this.$element = $(element);
+    this.settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, options);
+    this.themesList = [];
+
+    // loading local themes
+    this.getThemes();
+    return this;
+  };
+
+  // Prototype
+  // ---------------------------------------------------------------------------
+  BootstrapThemeSwitcher.prototype = {
+    clear: function () {
+      logger.debug('bootstrapThemeSwitcher.clear');
+      return this.$element.each(function () {
+        this.$element.empty();
+      });
+    },
+    update: function () {
+      logger.debug('bootstrapThemeSwitcher.update');
+      this.getThemes();
+    },
+
+    // -------------------------------------------------------------------------
+    //  checkStyleSheetByName
+    // -------------------------------------------------------------------------
+    checkStyleSheetByName: function (name) {
+      var found   = false;
+      var test    = '\/' + name + '\/';
+      var re      = new RegExp(test, 'i');
+
+      for(var i = 0; i < document.styleSheets.length; i++){
+        if(re.test(document.styleSheets[i].href)){
+          found=true;
+          break;
+        }
+      }
+      return found;
+    },
+
+    // -------------------------------------------------------------------------
+    //  switchTheme
+    // -------------------------------------------------------------------------
+    // NOTE:
+    // For J1 template, switchTheme set only the cookies contents. The theme
+    // switch is done by a page reload. The reload triggers the theme_generator
+    // to load theme CSS from cookies, finally.
+    // -------------------------------------------------------------------------
+    switchTheme: function (name, cssFile) {
+
+      var $this             = $(this);
+      var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var themeName;
+      var theme_css;
+      var theme_extension_css;
+
+      var id                = settings.cssThemeLink;
+      var debug             = settings.debug;
+      var includeCSS        = this.settings.includeBootswatch;
+
+      // detect|set user state cookie
+      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      if ( user_state_detected ) {
+        logger.debug('cookie found: j1.user.state');
+        j1_user_state = j1.readCookie(user_state_cookie_name);
+      } else {
+        logger.error('cookie not found: j1.user.state');
+      }
+
+      themeName           = j1_user_state.theme_name;
+      theme_css           = j1_user_state.theme_css;
+
+      if (typeof cssFile === 'undefined') { cssFile = this.settings.defaultCssFile; }
+      if (typeof name === 'undefined') { name = cssFile; }
+
+      // check if theme is to be saved to cookie
+      if (settings.saveToCookie) {
+        if ( typeof Cookies === 'undefined' ) {
+          if ( debug === 'true' ) {
+            logger.error('cookies library not present');
+          }
+          return false;
+        }
+
+        j1_user_state.theme_name  = name;
+        j1_user_state.theme_css   = cssFile;
+
+        if (!(j1_user_state.theme_name.includes('Uno') || j1_user_state.theme_name == 'Bootstrap')) {
+          j1_user_state.theme_author        = 'Bootswatch';
+          j1_user_state.theme_author_url    = 'https://bootswatch.com/';
+        } else {
+          j1_user_state.theme_author        = 'J1 Team';
+          j1_user_state.theme_author_url    = 'https://jekyll.one/';
+        }
+
+        j1.writeCookie({
+          name: user_state_cookie_name,
+          data: j1_user_state
+        });
+
+        // force reload the page from the server (skip cache)
+        // and detect selected theme from cookie
+        location.reload(true);
+      } else {
+        logger.warn('write to cookie : disabled');
+        logger.warn('selected theme not activated: ' + name);
+      } // END if saveToCookie
+
+    }, // END switchTheme
+
+    // -------------------------------------------------------------------------
+    //  loadThemeFromCookie
+    // -------------------------------------------------------------------------
+    loadThemeFromCookie: function (options) {
+
+      if ( typeof Cookies === 'undefined' ) {
+        logger.error('cookies library not present');
+        return false;
+      }
+
+      var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, options);
+
+      // detect|set user state cookie
+      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+
+      if ( user_state_detected ) {
+        logger.info('cookie found: j1.user.state');
+        j1_user_state = j1.readCookie(user_state_cookie_name);
+      } else {
+        logger.error('cookie not found: j1.user.state');
+      }
+
+      var themeName = j1_user_state.theme_name;
+      var themeCss  = j1_user_state.theme_css;
+      this.switchTheme(themeName, themeCss);
+
+    }, // END loadThemeFromCookie
+
+    // -------------------------------------------------------------------------
+    //  addTheme
+    // -------------------------------------------------------------------------
+    addTheme: function(name, cssFile, start, deleteCount) {
+      if (typeof start === 'undefined') { start = 0; }
+      if (typeof deleteCount === 'undefined') { deleteCount = 0; }
+      this.themesList.splice(start, deleteCount, {name: name, css: cssFile});
+      this.addThemesToControl();
+    }, // END addTheme
+
+    // -------------------------------------------------------------------------
+    //  addThemesToControl
+    // -------------------------------------------------------------------------
+    addThemesToControl: function() {
+      if (typeof this.$element === 'undefined') {
+        logger.error('bootstrapThemeSelector|addThemesToControl: Element is undefined');
+        return false;
+      }
+      if (typeof this.themesList === 'undefined') {
+        logger.error('bootstrapThemeSelector|addThemesToControl: Themes is undefined');
+        return false;
+      }
+
+      // if BootSwatch excludes are set
+      if(this.settings.excludeBootswatch){
+        var excludeBootswatchs;
+        // split the string on ,
+        if(this.settings.excludeBootswatch.indexOf(',') !== -1){
+          excludeBootswatchs = this.settings.excludeBootswatch.replace(/ /g, '').split(',');
+        } else {
+          excludeBootswatchs = [];
+          excludeBootswatchs.push(this.settings.excludeBootswatch);
+        }
+
+        var tempThemeList = this.themesList;
+        $.each(tempThemeList, function (i, value) {
+          if(value && value.name){
+            if( $.inArray( value.name, excludeBootswatchs ) !== -1 ){
+              tempThemeList.splice(i,1);
+            }
+          }
+        });
+        this.themesList = tempThemeList;
+      }
+
+      var base = this;
+
+      if (this.$element.is('ul')) {
+        var $this             = $(this);
+        var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+        var id                = settings.cssThemeLink;
+        var themeName;
+        var debug             = settings.debug;
+
+        // detect|set user state cookie
+        user_state_detected = j1.existsCookie ( 'j1.user.state' );
+        if ( user_state_detected ) {
+          logger.debug('User state cookie found');
+          j1_user_state = j1.readCookie(user_state_cookie_name);
+        } else {
+          logger.error('User state NOT cookie found');
+        }
+
+        themeName = j1_user_state.theme_name;
+
+        if ( debug === 'true' ) {
+          logger.debug('bootstrapThemeSelector: UL element selected');
+        }
+        this.$element.empty();
+
+        var cssClass;
+        var iconColor = '#9E9E9E';
+        $.each(this.themesList, function (i, value) {
+          // Use DIFFERENT class for MobileMenu
+          //if (base.$element[0].id.includes('MMenu')) {
+          if (base.$element[0].id.includes('mmenu')) {
+            cssClass = 'mmenu-item';
+          } else {
+            cssClass = 'dropdown-item';
+          }
+          // Add class "active" to the current theme selected
+          if ( value.name === themeName ) {
+            // if (base.$element[0].id.includes('MMenu')) {
+            if (base.$element[0].id.includes('mmenu')) {
+              cssClass = 'mmenu-item active';
+            } else {
+              cssClass = 'dropdown-item active';
+            }
+          }
+          var li = $('<li />')
+              .attr('class',cssClass)
+              .append('<a href="#"><i class="mdi mdi-view-quilt mdi-18px mr-2" style="color: ' +iconColor+ '"></i>' +value.name+ '</a>')
+              .on('click', function () {
+                if (settings.loadFromBootswatch) {
+                  base.switchTheme(value.name, value.css);
+                } else {
+                  base.switchTheme(value.name, value.cssCdn);
+                }
+                // remove previous "active" class and apply to latest clicked element
+                $(this).parent().find('li').removeClass('active');
+                $(this).addClass('active');
+              });
+          base.$element.append(li);
+        });
+
+      } else if (this.$element.is('select')) {
+        logger.debug('bootstrapThemeSelector: SELECT element selected');
+        this.$element.empty();
+
+        var optionSelectedMarker;
+        $.each(this.themesList, function (i, value) {
+          optionSelectedMarker = null;
+          if ( value.name === themeName ) {
+            optionSelectedMarker = 'selected';
+          }
+          if (settings.loadFromBootswatch) {
+            base.$element.append('<option ' + optionSelectedMarker + ' value=\'' + value.css + '\'>' + value.name + '</option>');
+          } else {
+            base.$element.append('<option ' + optionSelectedMarker + ' value=\'' + value.cssCdn + '\'>' + value.name + '</option>');
+          }
+        });
+        this.$element.on('change', function () {
+          var optionSelected = $('option:selected', this);
+          base.switchTheme(optionSelected.text(), optionSelected.val());
+        });
+
+      } else {
+        // no container found to add Theme list
+        logger.info('bootstrapThemeSelector: no UL or SELECT element found');
+        logger.error('bootstrapThemeSelector: failed');
+        // console.warn('bootstrapThemeSelector only works with ul or select elements');
+      }
+    }, // END addThemesToControl
+
+    // -------------------------------------------------------------------------
+    //  getThemes
+    // -------------------------------------------------------------------------
+    getThemes: function() {
+      var base = this;
+
+      if (this.settings.localFeed !== null && this.settings.localFeed !== '') {
+        // Deferred loading themes from local themes (json file)
+        $.ajax({
+          url: this.settings.localFeed,
+          // jadams 2016-10-10: removed the setting for sychronous XMLHttpRequest
+          // async: false,
+          dataType: 'json',
+          success: function (data) {
+            base.themesList = data.themes;
+            base.addThemesToControl();
+          },
+          error: function (jqXHR, textStatus, errorThrown) {
+            logger.error('Failed to retrieve the local feed from: \'' + base.settings.localFeed + '\'');
+          }
+        });
+      } else {
+        // Deferred loading remote themes from Bootswatch API
+        // -----------------------------------------------------------------------
+        $.ajax({
+          url: this.settings.bootswatchApiUrl + '/' + this.settings.bootswatchApiVersion + '.json',
+          // jadams 2016-10-10: removed the setting for sychronous XMLHttpRequest
+          // async: false,
+          dataType: 'json',
+          success: function (data) {
+            if (typeof data.themes === 'undefined') {
+              return null;
+            }
+            base.themesList = data.themes;
+            base.themesList.splice(0,0, {name: 'default', css: base.settings.defaultCssFile});
+            base.addThemesToControl();
+          }
+        });
+      }
+    }, // END getThemes
+
+    // -------------------------------------------------------------------------
+    //  themes
+    // -------------------------------------------------------------------------
+    themes : function (newThemeList) {
+      if (typeof newThemeList === 'undefined') {
+        return this.themesList;
+      }
+      else {
+        // TODO: Set the associated control.
+        this.themesList = newThemeList;
+      }
+    } // END themes
+
+  }; // END prototype
+
+  // Plugin definition
+  // ---------------------------------------------------------------------------
+  $.fn.bootstrapThemeSwitcher = function (option) {
+    var methodReturn;
+    var args      = Array.prototype.slice.call(arguments, 1);
+    var $this     = $(this);
+    var data      = $this.data('bootstrapThemeSwitcher');
+    var options   = typeof option === 'object' && option;
+
+    if (!data) {
+      $this.data('bootstrapThemeSwitcher', (data = new BootstrapThemeSwitcher(this, options) ));
+    }
+    if (typeof option === 'string') {
+      methodReturn = data[ option ].apply(data, args);
+    }
+    return ( typeof methodReturn === 'undefined' ) ? $this : methodReturn;
+  };
+
+  $.fn.bootstrapThemeSwitcher.defaults = {
+    debug:                  false,
+    saveToCookie:           true,
+    cssThemeLink:           'bootstrapTheme',
+    cookieThemeName:        'bootstrapTheme.name',
+    cookieThemeCss:         'boostrapTheme.css',
+    cookieExpiration:       365,
+    cookiePath:             '/',
+    defaultCssFile:         'https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css',
+    bootswatchApiUrl:       'https://bootswatch.com/api/',
+    bootswatchApiVersion:   '4',
+    loadFromBootswatch:     true,
+    localFeed:              '',
+    excludeBootswatch:      ''
+  };
+
+  $.fn.bootstrapThemeSwitcher.Constructor = BootstrapThemeSwitcher;
+
+  $.fn.bootstrapThemeSwitcher.noConflict = function () {
+    $.fn.BootstrapThemeSwitcher = old;
+    return this;
+  };
+
+})(jQuery, window, document);

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.1.5'
+  VERSION = '2021.1.10'
 end

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -154,10 +154,9 @@ module J1App
     # --------------------------------------------------------------------------
     j1_mw_auth_mgr.info 'initialize web session cookie'
     use Rack::Session::Cookie,
-        http_only: true,   # if set to 'true', make session cookie visible to the browser (document) for HTTP
+        http_only: true,
         key: 'j1.app.session',
-#       same_site: 'None',
-        same_site: 'Lax',
+        same_site: 'Strict',
         secret: ENV['J1_SESSION_SECRET'] || SecureRandom.hex
 
     # use Rack::Cache do |config|

data/lib/starter_web/Gemfile

@@ -54,7 +54,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.1.5'
+gem 'j1-template', '~> 2021.1.10'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment