diff --git a/at_core/includes/preprocess.inc b/at_core/includes/preprocess.inc index fe564b66..65ac1cc9 100644 --- a/at_core/includes/preprocess.inc +++ b/at_core/includes/preprocess.inc @@ -300,7 +300,9 @@ function at_core_preprocess_page(&$variables) { // --- Layout -------------------------------------------------------------- // // Active theme name. $active_theme_name = $variables['theme']['name']; - + // Add current theme name to drupalSettings. + $variables['#attached']['drupalSettings']['at_current_theme_name'] = $active_theme_name; + // BC for pre RC2 themes: // - allow the main content to render in at_generator so users can login if // they set it as default and blew their site up. diff --git a/at_core/scripts/at.breakpoints.js b/at_core/scripts/at.breakpoints.js index 7dcb63d3..7d129ff4 100644 --- a/at_core/scripts/at.breakpoints.js +++ b/at_core/scripts/at.breakpoints.js @@ -18,7 +18,7 @@ // and write the breakpoints used in layout settings, which are themselves // set in breakpoints module config, i.e. themeName.breakpoints.yml and are // the group selected to be used by the themes layout. - var activeTheme = settings['ajaxPageState']['theme']; + var activeTheme = settings.at_current_theme_name; var bps = settings[activeTheme]['at_breakpoints']; function registerEnquire(breakpoint_label, breakpoint_query) { diff --git a/at_core/scripts/at.flexsliderSettings.js b/at_core/scripts/at.flexsliderSettings.js index 0c3ed410..c3db7768 100644 --- a/at_core/scripts/at.flexsliderSettings.js +++ b/at_core/scripts/at.flexsliderSettings.js @@ -5,7 +5,7 @@ Drupal.behaviors.atFS = { attach: function (context, settings) { - var activeTheme = settings['ajaxPageState']['theme'], + var activeTheme = settings.at_current_theme_name, slideshowSettings = settings[activeTheme]['at_slideshows']; for (var item in slideshowSettings) { diff --git a/at_core/scripts/at.responsiveMenus.js b/at_core/scripts/at.responsiveMenus.js index c680a303..fdecfa7e 100644 --- a/at_core/scripts/at.responsiveMenus.js +++ b/at_core/scripts/at.responsiveMenus.js @@ -16,7 +16,7 @@ return; } - var at = settings['ajaxPageState']['theme'], + var at = settings.at_current_theme_name, rm = settings[at]['at_responsivemenus'], def = rm['default'], resp = rm['responsive'], diff --git a/at_core/scripts/min/at.breakpoints.min.js b/at_core/scripts/min/at.breakpoints.min.js index 843a1b64..a6a008f6 100644 --- a/at_core/scripts/min/at.breakpoints.min.js +++ b/at_core/scripts/min/at.breakpoints.min.js @@ -1,2 +1,2 @@ -!function(t,a,e){"use strict";Drupal.behaviors.atBP={attach:function(t,n){if(a.matchMedia("only screen").matches){var i=n[n.ajaxPageState.theme].at_breakpoints;for(var o in i)i.hasOwnProperty(o)&&function(t,a){enquire.register(a,{match:function(){e.body.classList.add("bp--"+t)},unmatch:function(){e.body.classList.remove("bp--"+t)}})}(o.split("_").join("-"),i[o].mediaquery)}}}}(jQuery,window,document); -//# sourceMappingURL=at.breakpoints.min.js.map \ No newline at end of file +!function(t,a,e){"use strict";Drupal.behaviors.atBP={attach:function(t,n){if(a.matchMedia("only screen").matches){var i=n[n.at_current_theme_name].at_breakpoints;for(var o in i)i.hasOwnProperty(o)&&function(t,a){enquire.register(a,{match:function(){e.body.classList.add("bp--"+t)},unmatch:function(){e.body.classList.remove("bp--"+t)}})}(o.split("_").join("-"),i[o].mediaquery)}}}}(jQuery,window,document); +//# sourceMappingURL=at.breakpoints.min.js.map diff --git a/at_core/scripts/min/at.flexsliderSettings.min.js b/at_core/scripts/min/at.flexsliderSettings.min.js index fe6b5121..02a81e4a 100644 --- a/at_core/scripts/min/at.flexsliderSettings.min.js +++ b/at_core/scripts/min/at.flexsliderSettings.min.js @@ -1,2 +1,2 @@ -!function(e,a){"use strict";a.behaviors.atFS={attach:function(a,i){var s=i[i.ajaxPageState.theme].at_slideshows;for(var t in s)if(s.hasOwnProperty(t)){var o=s[t];o.controlnav&&e(o.slideshow_class).addClass("has-pager"),o.directionnav&&e(o.slideshow_class).addClass("has-direction-nav"),o.as_carousel&&e(o.slideshow_class).addClass("is-carousel"),e(o.slideshow_class).flexslider({start:function(a){e(".flexslider").resize().removeClass("loading")},animation:o.animation?o.animation:"slide",direction:o.direction?o.direction:"horizontal",smoothHeight:!!o.smoothheight&&o.smoothheight,slideshowSpeed:o.slideshowspeed?parseFloat(o.slideshowspeed):4e3,animationSpeed:o.animationspeed?parseFloat(o.animationspeed):600,controlNav:!!o.controlnav&&o.controlnav,directionNav:!!o.directionnav&&o.directionnav,itemWidth:o.itemwidth?parseFloat(o.itemwidth):0,itemMargin:o.itemmargin?parseFloat(o.itemmargin):0,minItems:o.minitems?parseFloat(o.minitems):0,maxItems:o.maxitems?parseFloat(o.maxitems):0,move:o.move?parseFloat(o.move):0,pauseOnAction:!!o.pauseonaction&&o.pauseonaction,pauseOnHover:!!o.pauseonhover&&o.pauseonhover,animationLoop:!!o.animationloop&&o.animationloop,reverse:!!o.reverse&&String(o.reverse),randomize:!!o.randomize&&o.randomize,slideshow:!!o.autostart&&o.autostart,initDelay:o.initdelay?parseFloat(o.initdelay):0,easing:o.easing?o.easing:"swing",useCSS:!!o.usecss&&o.usecss,touch:!!o.touch&&o.touch,video:!!o.video&&o.video,prevText:o.prevtext?o.prevtext:"Previous",nextText:o.nexttext?o.nexttext:"Next",selector:o.selector?o.selector:".slides > li"})}}}}(jQuery,Drupal); -//# sourceMappingURL=at.flexsliderSettings.min.js.map \ No newline at end of file +!function(e,a){"use strict";a.behaviors.atFS={attach:function(a,i){var s=i[i.at_current_theme_name].at_slideshows;for(var t in s)if(s.hasOwnProperty(t)){var o=s[t];o.controlnav&&e(o.slideshow_class).addClass("has-pager"),o.directionnav&&e(o.slideshow_class).addClass("has-direction-nav"),o.as_carousel&&e(o.slideshow_class).addClass("is-carousel"),e(o.slideshow_class).flexslider({start:function(a){e(".flexslider").resize().removeClass("loading")},animation:o.animation?o.animation:"slide",direction:o.direction?o.direction:"horizontal",smoothHeight:!!o.smoothheight&&o.smoothheight,slideshowSpeed:o.slideshowspeed?parseFloat(o.slideshowspeed):4e3,animationSpeed:o.animationspeed?parseFloat(o.animationspeed):600,controlNav:!!o.controlnav&&o.controlnav,directionNav:!!o.directionnav&&o.directionnav,itemWidth:o.itemwidth?parseFloat(o.itemwidth):0,itemMargin:o.itemmargin?parseFloat(o.itemmargin):0,minItems:o.minitems?parseFloat(o.minitems):0,maxItems:o.maxitems?parseFloat(o.maxitems):0,move:o.move?parseFloat(o.move):0,pauseOnAction:!!o.pauseonaction&&o.pauseonaction,pauseOnHover:!!o.pauseonhover&&o.pauseonhover,animationLoop:!!o.animationloop&&o.animationloop,reverse:!!o.reverse&&String(o.reverse),randomize:!!o.randomize&&o.randomize,slideshow:!!o.autostart&&o.autostart,initDelay:o.initdelay?parseFloat(o.initdelay):0,easing:o.easing?o.easing:"swing",useCSS:!!o.usecss&&o.usecss,touch:!!o.touch&&o.touch,video:!!o.video&&o.video,prevText:o.prevtext?o.prevtext:"Previous",nextText:o.nexttext?o.nexttext:"Next",selector:o.selector?o.selector:".slides > li"})}}}}(jQuery,Drupal); +//# sourceMappingURL=at.flexsliderSettings.min.js.map diff --git a/at_core/scripts/min/at.responsiveMenus.min.js b/at_core/scripts/min/at.responsiveMenus.min.js index 6543d1f7..2464814e 100644 --- a/at_core/scripts/min/at.responsiveMenus.min.js +++ b/at_core/scripts/min/at.responsiveMenus.min.js @@ -1,2 +1,2 @@ -!function(e,a,r){"use strict";Drupal.behaviors.atrM={attach:function(o,n){function t(a){a.preventDefault(),a.stopPropagation(),e(this).toggleClass("is-open--parent"),"true"==e(this).attr("aria-expanded")?e(this).attr("aria-expanded","false"):"false"==e(this).attr("aria-expanded")&&e(this).attr("aria-expanded","true"),e(this).parent().next(".is-child").toggleClass("is-open--child")}function i(a){var r=e("#rm-accordion-trigger").html();e(a).each(function(){0==e(this).next(".rm-accordion-trigger").length&&e(this).after(r);var a=e(this).parent().parent().attr("id");e(this).next().attr("aria-controls",a+"__child-menu"),e(this).parent().next(".is-child").attr("id",a+"__child-menu")})}if(e(".rm-block").removeClass("js-hide"),r.matchMedia("only screen").matches){var s=n[n.ajaxPageState.theme].at_responsivemenus,c=s.default,l=s.responsive,d=".rm-block .rm-toggle__link",m=s.acd.acd_default,u=s.acd.acd_responsive,p=s.acd.acd_both,_=s.acd.acd_load;e(d,o).on("click",function(r){r.preventDefault(),r.stopPropagation(),e(a.body).toggleClass("rm-is-open"),"true"==e(this).attr("aria-expanded")?(e(this).attr("aria-expanded","false"),e("#rm-toggle__icon--use").attr("xlink:href","#rm-toggle__icon--open")):"false"==e(this).attr("aria-expanded")&&(e(this).attr("aria-expanded","true"),e("#rm-toggle__icon--use").attr("xlink:href","#rm-toggle__icon--close")),e(a).one("click",function(r){0===e(".rm-block").has(r.target).length&&(e(a.body).removeClass("rm-is-open"),e(d).attr("aria-expanded","false"),e("#rm-toggle__icon--use").attr("xlink:href","#rm-toggle__icon--open"))})}),enquire.register(s.bp,{setup:function(){e(a.body).addClass(c),e(".rm-block").parent(".l-r").addClass("rm-region").parent(".l-rw").addClass("rm-row"),"ms-dropmenu"==c&&e(".rm-block__content li:has(ul)").doubleTapToGo(),1==m&&1==_&&(e(".rm-block .menu-level-1").addClass("ms-accordion"),e.ready(i(".ms-accordion .is-parent__wrapper .menu__link")),e(".ms-accordion .rm-accordion-trigger",o).on("click",t))},match:function(){"ms-none"!==l&&l!==c&&(e(a.body).removeClass(c).addClass(l),1==_&&(1==u?0==p&&(e(".rm-block .menu-level-1").addClass("ms-accordion"),e.ready(i(".ms-accordion .is-parent__wrapper .menu__link")),e(".ms-accordion .rm-accordion-trigger",o).on("click",t)):(e(".ms-accordion .rm-accordion-trigger").remove(),e(".rm-block .menu-level-1").removeClass("ms-accordion"),e(".rm-block .menu").removeClass("is-open--child"))),"ms-dropmenu"==l?e(".rm-block__content li:has(ul)").doubleTapToGo():e(".rm-block__content li:has(ul)").doubleTapToGo("unbind"))},unmatch:function(){e(a.body).addClass(c),1==_&&(1==m?0==p&&(e(".rm-block .menu-level-1").addClass("ms-accordion"),e.ready(i(".ms-accordion .is-parent__wrapper .menu__link")),e(".ms-accordion .rm-accordion-trigger",o).on("click",t)):(e(".ms-accordion .rm-accordion-trigger").remove(),e(".rm-block .menu-level-1").removeClass("ms-accordion"),e(".rm-block .menu").removeClass("is-open--child"))),"ms-dropmenu"==c?e(".rm-block__content li:has(ul)").doubleTapToGo():e(".rm-block__content li:has(ul)").doubleTapToGo("unbind"),l!==c&&e(a.body).removeClass(l)}})}}}}(jQuery,document,window); -//# sourceMappingURL=at.responsiveMenus.min.js.map \ No newline at end of file +!function(e,a,r){"use strict";Drupal.behaviors.atrM={attach:function(o,n){function t(a){a.preventDefault(),a.stopPropagation(),e(this).toggleClass("is-open--parent"),"true"==e(this).attr("aria-expanded")?e(this).attr("aria-expanded","false"):"false"==e(this).attr("aria-expanded")&&e(this).attr("aria-expanded","true"),e(this).parent().next(".is-child").toggleClass("is-open--child")}function i(a){var r=e("#rm-accordion-trigger").html();e(a).each(function(){0==e(this).next(".rm-accordion-trigger").length&&e(this).after(r);var a=e(this).parent().parent().attr("id");e(this).next().attr("aria-controls",a+"__child-menu"),e(this).parent().next(".is-child").attr("id",a+"__child-menu")})}if(e(".rm-block").removeClass("js-hide"),r.matchMedia("only screen").matches){var s=n[n.at_current_theme_name].at_responsivemenus,c=s.default,l=s.responsive,d=".rm-block .rm-toggle__link",m=s.acd.acd_default,u=s.acd.acd_responsive,p=s.acd.acd_both,_=s.acd.acd_load;e(d,o).on("click",function(r){r.preventDefault(),r.stopPropagation(),e(a.body).toggleClass("rm-is-open"),"true"==e(this).attr("aria-expanded")?(e(this).attr("aria-expanded","false"),e("#rm-toggle__icon--use").attr("xlink:href","#rm-toggle__icon--open")):"false"==e(this).attr("aria-expanded")&&(e(this).attr("aria-expanded","true"),e("#rm-toggle__icon--use").attr("xlink:href","#rm-toggle__icon--close")),e(a).one("click",function(r){0===e(".rm-block").has(r.target).length&&(e(a.body).removeClass("rm-is-open"),e(d).attr("aria-expanded","false"),e("#rm-toggle__icon--use").attr("xlink:href","#rm-toggle__icon--open"))})}),enquire.register(s.bp,{setup:function(){e(a.body).addClass(c),e(".rm-block").parent(".l-r").addClass("rm-region").parent(".l-rw").addClass("rm-row"),"ms-dropmenu"==c&&e(".rm-block__content li:has(ul)").doubleTapToGo(),1==m&&1==_&&(e(".rm-block .menu-level-1").addClass("ms-accordion"),e.ready(i(".ms-accordion .is-parent__wrapper .menu__link")),e(".ms-accordion .rm-accordion-trigger",o).on("click",t))},match:function(){"ms-none"!==l&&l!==c&&(e(a.body).removeClass(c).addClass(l),1==_&&(1==u?0==p&&(e(".rm-block .menu-level-1").addClass("ms-accordion"),e.ready(i(".ms-accordion .is-parent__wrapper .menu__link")),e(".ms-accordion .rm-accordion-trigger",o).on("click",t)):(e(".ms-accordion .rm-accordion-trigger").remove(),e(".rm-block .menu-level-1").removeClass("ms-accordion"),e(".rm-block .menu").removeClass("is-open--child"))),"ms-dropmenu"==l?e(".rm-block__content li:has(ul)").doubleTapToGo():e(".rm-block__content li:has(ul)").doubleTapToGo("unbind"))},unmatch:function(){e(a.body).addClass(c),1==_&&(1==m?0==p&&(e(".rm-block .menu-level-1").addClass("ms-accordion"),e.ready(i(".ms-accordion .is-parent__wrapper .menu__link")),e(".ms-accordion .rm-accordion-trigger",o).on("click",t)):(e(".ms-accordion .rm-accordion-trigger").remove(),e(".rm-block .menu-level-1").removeClass("ms-accordion"),e(".rm-block .menu").removeClass("is-open--child"))),"ms-dropmenu"==c?e(".rm-block__content li:has(ul)").doubleTapToGo():e(".rm-block__content li:has(ul)").doubleTapToGo("unbind"),l!==c&&e(a.body).removeClass(l)}})}}}}(jQuery,document,window); +//# sourceMappingURL=at.responsiveMenus.min.js.map