From: Jeff Veit Date: Tue, 13 Nov 2018 18:25:05 +0000 (+0000) Subject: Updated the Bootstrap theme. X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=commitdiff_plain;h=dd08b95e4e519a02d45a50fb504bf5d685eaa9e3 Updated the Bootstrap theme. --- diff --git a/web/themes/contrib/bootstrap/bootstrap.info.yml b/web/themes/contrib/bootstrap/bootstrap.info.yml index d613fe3bf..b464980d9 100644 --- a/web/themes/contrib/bootstrap/bootstrap.info.yml +++ b/web/themes/contrib/bootstrap/bootstrap.info.yml @@ -73,8 +73,8 @@ libraries-override: theme: css/node.preview.css: false -# Information added by Drupal.org packaging script on 2018-03-11 -version: '8.x-3.11' +# Information added by Drupal.org packaging script on 2018-11-12 +version: '8.x-3.14' core: '8.x' project: 'bootstrap' -datestamp: 1520792888 +datestamp: 1542006206 diff --git a/web/themes/contrib/bootstrap/js/attributes.js b/web/themes/contrib/bootstrap/js/attributes.js index e0c0c441f..ced3356b1 100644 --- a/web/themes/contrib/bootstrap/js/attributes.js +++ b/web/themes/contrib/bootstrap/js/attributes.js @@ -345,17 +345,17 @@ identifier = identifier.toLowerCase(); if (filter['__'] === void 0) { - identifier = identifier.replace('__', '#DOUBLE_UNDERSCORE#', identifier); + identifier = identifier.replace('__', '#DOUBLE_UNDERSCORE#'); } - identifier = identifier.replace(Object.keys(filter), Object.keys(filter).map(function(key) { return filter[key]; }), identifier); + identifier = identifier.replace(Object.keys(filter), Object.keys(filter).map(function(key) { return filter[key]; })); if (filter['__'] === void 0) { - identifier = identifier.replace('#DOUBLE_UNDERSCORE#', '__', identifier); + identifier = identifier.replace('#DOUBLE_UNDERSCORE#', '__'); } identifier = identifier.replace(/[^\u002D\u0030-\u0039\u0041-\u005A\u005F\u0061-\u007A\u00A1-\uFFFF]/g, ''); - identifier = identifier.replace(['/^[0-9]/', '/^(-[0-9])|^(--)/'], ['_', '__'], identifier); + identifier = identifier.replace(['/^[0-9]/', '/^(-[0-9])|^(--)/'], ['_', '__']); return identifier; }; diff --git a/web/themes/contrib/bootstrap/js/drupal.bootstrap.js b/web/themes/contrib/bootstrap/js/drupal.bootstrap.js index 07af6a35c..573afd37f 100644 --- a/web/themes/contrib/bootstrap/js/drupal.bootstrap.js +++ b/web/themes/contrib/bootstrap/js/drupal.bootstrap.js @@ -353,14 +353,17 @@ /** * Simulates a native event on an element in the browser. * - * Note: This is a pretty complete modern implementation. If things are quite - * working the way you intend (in older browsers), you may wish to use the - * jQuery.simulate plugin. If it's available, this method will defer to it. + * Note: This is a fairly complete modern implementation. If things aren't + * working quite the way you intend (in older browsers), you may wish to use + * the jQuery.simulate plugin. If it's available, this method will defer to + * that plugin. * * @see https://github.com/jquery/jquery-simulate * - * @param {HTMLElement} element - * A DOM element to dispatch event on. + * @param {HTMLElement|jQuery} element + * A DOM element to dispatch event on. Note: this may be a jQuery object, + * however be aware that this will trigger the same event for each element + * inside the jQuery collection; use with caution. * @param {String} type * The type of event to simulate. * @param {Object} [options] @@ -368,13 +371,36 @@ * an event is being proxied, you should just pass the original event * object here. This allows, if the browser supports it, to be a truly * simulated event. + * + * @return {Boolean} + * The return value is false if event is cancelable and at least one of the + * event handlers which handled this event called Event.preventDefault(). + * Otherwise it returns true. */ Bootstrap.simulate = function (element, type, options) { + // Handle jQuery object wrappers so it triggers on each element. + if (element instanceof $) { + var ret = true; + element.each(function () { + if (!Bootstrap.simulate(this, type, options)) { + ret = false; + } + }); + return ret; + } + + if (!(element instanceof HTMLElement)) { + this.fatal('Passed element must be an instance of HTMLElement, got "@type" instead.', { + '@type': typeof element, + }); + } + // Defer to the jQuery.simulate plugin, if it's available. if (typeof $.simulate === 'function') { new $.simulate(element, type, options); - return; + return true; } + var event; var ctor; for (var name in this.eventMap) { @@ -398,20 +424,44 @@ } if (typeof window[ctor] === 'function') { event = new window[ctor](type, opts); - element.dispatchEvent(event); + return element.dispatchEvent(event); } else if (document.createEvent) { event = document.createEvent(ctor); event.initEvent(type, opts.bubbles, opts.cancelable); - element.dispatchEvent(event); + return element.dispatchEvent(event); } else if (typeof element.fireEvent === 'function') { event = $.extend(document.createEventObject(), opts); - element.fireEvent('on' + type, event); + return element.fireEvent('on' + type, event); } else if (typeof element[type]) { element[type](); + return true; + } + }; + + /** + * Strips HTML and returns just text. + * + * @param {String|Element|jQuery} html + * A string of HTML content, an Element DOM object or a jQuery object. + * + * @return {String} + * The text without HTML tags. + * + * @todo Replace with http://locutus.io/php/strings/strip_tags/ + */ + Bootstrap.stripHtml = function (html) { + if (html instanceof $) { + html = html.html(); } + else if (html instanceof Element) { + html = html.innerHTML; + } + var tmp = document.createElement('DIV'); + tmp.innerHTML = html; + return (tmp.textContent || tmp.innerText || '').replace(/^[\s\n\t]*|[\s\n\t]*$/g, ''); }; /** @@ -425,12 +475,24 @@ * The value of the unsupported object. */ Bootstrap.unsupported = function (type, name, value) { + Bootstrap.warn('Unsupported by Drupal Bootstrap: (@type) @name -> @value', { + '@type': type, + '@name': name, + '@value': typeof value === 'object' ? JSON.stringify(value) : value + }); + }; + + /** + * Provide a helper method to display a warning. + * + * @param {String} message + * The message to display. + * @param {Object} [args] + * Arguments to use as replacements in Drupal.formatString. + */ + Bootstrap.warn = function (message, args) { if (this.settings.dev && console.warn) { - console.warn(Drupal.formatString('Unsupported Drupal Bootstrap Modal @type: @name -> @value', { - '@type': type, - '@name': name, - '@value': typeof value === 'object' ? JSON.stringify(value) : value - })); + console.warn(Drupal.formatString(message, args)); } }; diff --git a/web/themes/contrib/bootstrap/js/misc/dialog.ajax.js b/web/themes/contrib/bootstrap/js/misc/dialog.ajax.js index f5c853cb4..7bfdcd33a 100644 --- a/web/themes/contrib/bootstrap/js/misc/dialog.ajax.js +++ b/web/themes/contrib/bootstrap/js/misc/dialog.ajax.js @@ -2,25 +2,34 @@ * @file * dialog.ajax.js */ -(function ($, Drupal) { +(function ($, Drupal, Bootstrap) { - var dialogAjaxCurrentButton; - var dialogAjaxOriginalButton; + Drupal.behaviors.dialog.ajaxCurrentButton = null; + Drupal.behaviors.dialog.ajaxOriginalButton = null; + + /** + * Synchronizes a faux button with its original counterpart. + * + * @param {Boolean} [reset = false] + * Whether to reset the current and original buttons after synchronizing. + */ + Drupal.behaviors.dialog.ajaxUpdateButtons = function (reset) { + if (this.ajaxCurrentButton && this.ajaxOriginalButton) { + this.ajaxCurrentButton.html(this.ajaxOriginalButton.html()); + this.ajaxCurrentButton.prop('disabled', this.ajaxOriginalButton.prop('disabled')); + } + if (reset) { + this.ajaxCurrentButton = null; + this.ajaxOriginalButton = null; + } + }; $(document) .ajaxSend(function () { - if (dialogAjaxCurrentButton && dialogAjaxOriginalButton) { - dialogAjaxCurrentButton.html(dialogAjaxOriginalButton.html()); - dialogAjaxCurrentButton.prop('disabled', dialogAjaxOriginalButton.prop('disabled')); - } + Drupal.behaviors.dialog.ajaxUpdateButtons(); }) .ajaxComplete(function () { - if (dialogAjaxCurrentButton && dialogAjaxOriginalButton) { - dialogAjaxCurrentButton.html(dialogAjaxOriginalButton.html()); - dialogAjaxCurrentButton.prop('disabled', dialogAjaxOriginalButton.prop('disabled')); - } - dialogAjaxCurrentButton = null; - dialogAjaxOriginalButton = null; + Drupal.behaviors.dialog.ajaxUpdateButtons(true); }) ; @@ -28,34 +37,46 @@ * {@inheritdoc} */ Drupal.behaviors.dialog.prepareDialogButtons = function prepareDialogButtons($dialog) { + var _that = this; var buttons = []; var $buttons = $dialog.find('.form-actions').find('button, input[type=submit], .form-actions a.button'); $buttons.each(function () { - var $originalButton = $(this).css({ - display: 'block', - width: 0, - height: 0, - padding: 0, - border: 0, - overflow: 'hidden' - }); - var classes = $originalButton.attr('class').replace('use-ajax-submit', ''); + var $originalButton = $(this) + // Prevent original button from being tabbed to. + .attr('tabindex', -1) + // Visually make the original button invisible, but don't actually hide + // or remove it from the DOM because the click needs to be proxied from + // the faux button created in the footer to its original counterpart. + .css({ + display: 'block', + width: 0, + height: 0, + padding: 0, + border: 0, + overflow: 'hidden' + }); + buttons.push({ - text: $originalButton.html() || $originalButton.attr('value'), - class: classes, + // Strip all HTML from the actual text value. This value is escaped. + // It actual HTML value will be synced with the original button's HTML + // below in the "create" method. + text: Bootstrap.stripHtml($originalButton), + class: $originalButton.attr('class').replace('use-ajax-submit', ''), click: function click(e) { - dialogAjaxCurrentButton = $(e.target); - dialogAjaxOriginalButton = $originalButton; - if ($originalButton.is('a')) { - $originalButton[0].click(); - } - else { - $originalButton.trigger('mousedown').trigger('mouseup').trigger('click'); - e.preventDefault(); - } + e.preventDefault(); + e.stopPropagation(); + _that.ajaxCurrentButton = $(e.target); + _that.ajaxOriginalButton = $originalButton; + Bootstrap.simulate($originalButton, 'click'); + }, + create: function () { + _that.ajaxCurrentButton = $(this); + _that.ajaxOriginalButton = $originalButton; + _that.ajaxUpdateButtons(true); } }); }); + return buttons; }; diff --git a/web/themes/contrib/bootstrap/js/misc/vertical-tabs.js b/web/themes/contrib/bootstrap/js/misc/vertical-tabs.js index 0085c4db7..83cfec446 100644 --- a/web/themes/contrib/bootstrap/js/misc/vertical-tabs.js +++ b/web/themes/contrib/bootstrap/js/misc/vertical-tabs.js @@ -6,6 +6,23 @@ (function ($, window, Drupal, drupalSettings) { "use strict"; + /** + * Show the parent vertical tab pane of a targeted page fragment. + * + * In order to make sure a targeted element inside a vertical tab pane is + * visible on a hash change or fragment link click, show all parent panes. + * + * @param {jQuery.Event} e + * The event triggered. + * @param {jQuery} $target + * The targeted node as a jQuery object. + */ + var handleFragmentLinkClickOrHashChange = function handleFragmentLinkClickOrHashChange(e, $target) { + $target.parents('.vertical-tabs-pane').each(function (index, pane) { + $(pane).data('verticalTab').focus(); + }); + }; + /** * This script transforms a set of details into a stack of vertical * tabs. Another tab pane can be selected by clicking on the respective @@ -26,6 +43,11 @@ return; } + /** + * Binds a listener to handle fragment link clicks and URL hash changes. + */ + $('body').once('vertical-tabs-fragments').on('formFragmentLinkClickOrHashChange.verticalTabs', handleFragmentLinkClickOrHashChange); + $(context).find('[data-vertical-tabs-panes]').once('vertical-tabs').each(function () { var $this = $(this).addClass('tab-content vertical-tabs-panes'); diff --git a/web/themes/contrib/bootstrap/js/modal.jquery.ui.bridge.js b/web/themes/contrib/bootstrap/js/modal.jquery.ui.bridge.js index 88d5ce480..cd9509251 100644 --- a/web/themes/contrib/bootstrap/js/modal.jquery.ui.bridge.js +++ b/web/themes/contrib/bootstrap/js/modal.jquery.ui.bridge.js @@ -127,18 +127,58 @@ */ createButtons: function () { this.$footer.find('.modal-buttons').remove(); + + // jQuery UI supports both objects and arrays. Unfortunately + // developers have misunderstood and abused this by simply placing + // the objects that should be in an array inside an object with + // arbitrary keys (likely to target specific buttons as a hack). var buttons = this.options.dialogOptions && this.options.dialogOptions.buttons || []; + if (!Array.isArray(buttons)) { + var array = []; + for (var k in buttons) { + // Support the proper object values: label => click callback. + if (typeof buttons[k] === 'function') { + array.push({ + label: k, + click: buttons[k], + }); + } + // Support nested objects, but log a warning. + else if (buttons[k].text || buttons[k].label) { + Bootstrap.warn('Malformed jQuery UI dialog button: @key. The button object should be inside an array.', { + '@key': k + }); + array.push(buttons[k]); + } + else { + Bootstrap.unsupported('button', k, buttons[k]); + } + } + buttons = array; + } + if (buttons.length) { var $buttons = $('
').appendTo(this.$footer); for (var i = 0, l = buttons.length; i < l; i++) { var button = buttons[i]; var $button = $(Drupal.theme('bootstrapModalDialogButton', button)); + + // Invoke the "create" method for jQuery UI buttons. + if (typeof button.create === 'function') { + button.create.call($button[0]); + } + + // Bind the "click" method for jQuery UI buttons to the modal. if (typeof button.click === 'function') { - $button.on('click', button.click); + $button.on('click', button.click.bind(this.$element)); } + $buttons.append($button); } } + + // Toggle footer visibility based on whether it has child elements. + this.$footer[this.$footer.children()[0] ? 'show' : 'hide'](); }, /** @@ -159,14 +199,6 @@ this.$footer = $(Drupal.theme('bootstrapModalFooter', {}, true)).insertAfter(this.$dialogBody); } - // Create buttons. - this.createButtons(); - - // Hide the footer if there are no children. - if (!this.$footer.children()[0]) { - this.$footer.hide(); - } - // Now call the parent init method. this.super(); @@ -220,6 +252,16 @@ if (value) { dialogOptions[prop] = value; styles[prop] = value; + + // If there's a defined height of some kind, enforce the modal + // to use flex (on modern browsers). This will ensure that + // the core autoResize calculations don't cause the content + // to overflow. + if (options.autoResize && (prop === 'height' || prop === 'maxHeight')) { + styles.display = 'flex'; + styles.flexDirection = 'column'; + this.$dialogBody.css('overflow', 'scroll'); + } } } } @@ -249,6 +291,11 @@ delete options.dialogClass; } + // Add jQuery UI classes to elements in case developers target them + // in callbacks. + for (var k in classesMap) { + this.$element.find('.' + classesMap[k]).addClass(k); + } // Bind events. var events = [ @@ -265,6 +312,12 @@ this.$element.on('dialog' + event, options[event]); } + // Support title attribute on the modal. + var title; + if ((options.title === null || options.title === void 0) && (title = this.$element.attr('title'))) { + options.title = title; + } + // Handle the reset of the options. for (var name in options) { if (!options.hasOwnProperty(name) || options[name] === void 0) continue; @@ -403,6 +456,9 @@ // Merge in the cloned mapped options. $.extend(true, this.options, this.mapDialogOptions(clone.options)); + + // Update buttons. + this.createButtons(); }, position: function(position) { @@ -457,15 +513,28 @@ var icon = ''; var iconPosition = button.iconPosition || 'beginning'; iconPosition = (iconPosition === 'end' && !rtl) || (iconPosition === 'beginning' && rtl) ? 'after' : 'before'; - if (button.icon) { + + // Handle Bootstrap icons differently. + if (button.bootstrapIcon) { + icon = Drupal.theme('icon', 'bootstrap', button.icon); + } + // Otherwise, assume it's a jQuery UI icon. + // @todo Map jQuery UI icons to Bootstrap icons? + else if (button.icon) { var iconAttributes = Attributes.create() .addClass(['ui-icon', button.icon]) .set('aria-hidden', 'true'); icon = ''; } - // Value. - var value = button.text; + // Label. Note: jQuery UI dialog has an inconsistency where it uses + // "text" instead of "label", so both need to be supported. + var value = button.label || button.text; + + // Show/hide label. + if (icon && ((button.showLabel !== void 0 && !button.showLabel) || (button.text !== void 0 && !button.text))) { + value = '' + value + ''; + } attributes.set('value', iconPosition === 'before' ? icon + value : value + icon); // Handle disabled. @@ -477,6 +546,9 @@ if (button['class']) { attributes.addClass(button['class']); } + if (button.primary) { + attributes.addClass('btn-primary'); + } return Drupal.theme('button', attributes); } diff --git a/web/themes/contrib/bootstrap/js/modal.js b/web/themes/contrib/bootstrap/js/modal.js index 5bcce1784..009d63049 100644 --- a/web/themes/contrib/bootstrap/js/modal.js +++ b/web/themes/contrib/bootstrap/js/modal.js @@ -5,6 +5,49 @@ (function ($, Drupal, Bootstrap, Attributes) { 'use strict'; + /** + * Document jQuery object. + * + * @type {jQuery} + */ + var $document = $(document); + + /** + * Finds the first available and visible focusable input element. + * + * This is abstracted from the main code below so sub-themes can override + * this method to return their own element if desired. + * + * @param {Modal} modal + * The Bootstrap modal instance. + * + * @return {jQuery} + * A jQuery object containing the element that should be focused. Note: if + * this object contains multiple elements, only the first visible one will + * be used. + */ + Bootstrap.modalFindFocusableElement = function (modal) { + return modal.$dialogBody.find(':input,:button,.btn'); + }; + + $document.on('shown.bs.modal', function (e) { + var $modal = $(e.target); + var modal = $modal.data('bs.modal'); + + // Focus the first input element found. + if (modal && modal.options.focusInput) { + var $focusable = Bootstrap.modalFindFocusableElement(modal); + if ($focusable && $focusable[0]) { + var $input = $focusable.filter(':visible:first').focus(); + + // Select text if input is text. + if (modal.options.selectText && $input.is(':text')) { + $input[0].setSelectionRange(0, $input[0].value.length) + } + } + } + }); + /** * Only process this once. */ @@ -40,6 +83,8 @@ Modal.DEFAULTS = $.extend({}, BootstrapModal.DEFAULTS, { animation: !!settings.modal_animation, backdrop: settings.modal_backdrop === 'static' ? 'static' : !!settings.modal_backdrop, + focusInput: !!settings.modal_focus_input, + selectText: !!settings.modal_select_text, keyboard: !!settings.modal_keyboard, show: !!settings.modal_show, size: settings.modal_size @@ -84,6 +129,11 @@ var data = $this.data('bs.modal'); var initialize = false; + // Immediately return if there's no instance to invoke a valid method. + if (!data && method && method !== 'open') { + return; + } + options = $.extend({}, Modal.DEFAULTS, data && data.options, $this.data(), options); if (!data) { // When initializing the Bootstrap Modal, only pass the "supported" @@ -131,12 +181,13 @@ // Replace the data API so that it calls $.fn.modal rather than Plugin. // This allows sub-themes to replace the jQuery Plugin if they like with // out having to redo all this boilerplate. - $(document) + $document .off('click.bs.modal.data-api') .on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { var $this = $(this); var href = $this.attr('href'); - var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))); // strip for ie7 + var target = $this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7 + var $target = $document.find(target); var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()); if ($this.is('a')) e.preventDefault(); diff --git a/web/themes/contrib/bootstrap/js/popover.js b/web/themes/contrib/bootstrap/js/popover.js index 198cd3eb9..1a1ffa42a 100644 --- a/web/themes/contrib/bootstrap/js/popover.js +++ b/web/themes/contrib/bootstrap/js/popover.js @@ -8,6 +8,8 @@ var Drupal = Drupal || {}; (function ($, Drupal, Bootstrap) { "use strict"; + var $document = $(document); + /** * Extend the Bootstrap Popover plugin constructor class. */ @@ -15,12 +17,12 @@ var Drupal = Drupal || {}; return { DEFAULTS: { animation: !!settings.popover_animation, + autoClose: !!settings.popover_auto_close, enabled: settings.popover_enabled, html: !!settings.popover_html, placement: settings.popover_placement, selector: settings.popover_selector, trigger: settings.popover_trigger, - triggerAutoclose: !!settings.popover_trigger_autoclose, title: settings.popover_title, content: settings.popover_content, delay: parseInt(settings.popover_delay, 10), @@ -35,38 +37,49 @@ var Drupal = Drupal || {}; * @todo This should really be properly delegated if selector option is set. */ Drupal.behaviors.bootstrapPopovers = { + $activePopover: null, attach: function (context) { // Immediately return if popovers are not available. if (!$.fn.popover || !$.fn.popover.Constructor.DEFAULTS.enabled) { return; } - // Popover autoclose. - if ($.fn.popover.Constructor.DEFAULTS.triggerAutoclose) { - var $currentPopover = null; - $(document) - .on('show.bs.popover', '[data-toggle=popover]', function () { - var $trigger = $(this); - var popover = $trigger.data('bs.popover'); - - // Only keep track of clicked triggers that we're manually handling. - if (popover.options.originalTrigger === 'click') { - if ($currentPopover && !$currentPopover.is($trigger)) { - $currentPopover.popover('hide'); - } - $currentPopover = $trigger; - } - }) - .on('click', function (e) { - var $target = $(e.target); - var popover = $target.is('[data-toggle=popover]') && $target.data('bs.popover'); - if ($currentPopover && !$target.is('[data-toggle=popover]') && !$target.closest('.popover.in')[0]) { - $currentPopover.popover('hide'); - $currentPopover = null; + var _this = this; + + $document + .on('show.bs.popover', '[data-toggle=popover]', function () { + var $trigger = $(this); + var popover = $trigger.data('bs.popover'); + + // Only keep track of clicked triggers that we're manually handling. + if (popover.options.originalTrigger === 'click') { + if (_this.$activePopover && _this.getOption('autoClose') && !_this.$activePopover.is($trigger)) { + _this.$activePopover.popover('hide'); } - }) - ; - } + _this.$activePopover = $trigger; + } + }) + .on('focus.bs.popover', ':focusable', function (e) { + var $target = $(e.target); + if (_this.$activePopover && _this.getOption('autoClose') && !_this.$activePopover.is($target) && !$target.closest('.popover.in')[0]) { + _this.$activePopover.popover('hide'); + _this.$activePopover = null; + } + }) + .on('click.bs.popover', function (e) { + var $target = $(e.target); + if (_this.$activePopover && _this.getOption('autoClose') && !$target.is('[data-toggle=popover]') && !$target.closest('.popover.in')[0]) { + _this.$activePopover.popover('hide'); + _this.$activePopover = null; + } + }) + .on('keyup.bs.popover', function (e) { + if (_this.$activePopover && _this.getOption('autoClose') && e.which === 27) { + _this.$activePopover.popover('hide'); + _this.$activePopover = null; + } + }) + ; var elements = $(context).find('[data-toggle=popover]').toArray(); for (var i = 0; i < elements.length; i++) { @@ -82,7 +95,8 @@ var Drupal = Drupal || {}; } // Retrieve content from a target element. - var $target = $(options.target || $element.is('a[href^="#"]') && $element.attr('href')).clone(); + var target = options.target || $element.is('a[href^="#"]') && $element.attr('href'); + var $target = $document.find(target).clone(); if (!options.content && $target[0]) { $target.removeClass('visually-hidden hidden').removeAttr('aria-hidden'); options.content = $target.wrap('
').parent()[options.html ? 'html' : 'text']() || ''; @@ -117,6 +131,14 @@ var Drupal = Drupal || {}; .off('click.drupal.bootstrap.popover') .popover('destroy') ; + }, + getOption: function(name, defaultValue, element) { + var $element = element ? $(element) : this.$activePopover; + var options = $.extend(true, {}, $.fn.popover.Constructor.DEFAULTS, (($element && $element.data('bs.popover')).options || {}).options); + if (options[name] !== void 0) { + return options[name]; + } + return defaultValue !== void 0 ? defaultValue : void 0; } }; diff --git a/web/themes/contrib/bootstrap/src/Plugin/Alter/ThemeSuggestions.php b/web/themes/contrib/bootstrap/src/Plugin/Alter/ThemeSuggestions.php index bf20a2307..db96e6699 100644 --- a/web/themes/contrib/bootstrap/src/Plugin/Alter/ThemeSuggestions.php +++ b/web/themes/contrib/bootstrap/src/Plugin/Alter/ThemeSuggestions.php @@ -250,17 +250,23 @@ class ThemeSuggestions extends PluginBase implements AlterInterface { return $cache->get($this->hook); } - // Uppercase each theme hook suggestion to be used in the method name. - $hook_suggestions = $this->hookSuggestions; - foreach ($hook_suggestions as $key => $suggestion) { - $hook_suggestions[$key] = Unicode::ucfirst($suggestion); - } - + // Convert snake_cased hook suggestions into lowerCamelCase alter methods. $methods = []; + $hook_suggestions = array_map('\Drupal\Component\Utility\Unicode::ucfirst', $this->hookSuggestions); while ($hook_suggestions) { - $method = 'alter' . implode('', $hook_suggestions); - if (method_exists($this, $method)) { - $methods[] = $method; + // In order to provide backwards compatibility with sub-themes that used + // the previous malformed method names, both of the method names need to + // be checked. + // @see https://www.drupal.org/project/bootstrap/issues/3008004 + // @todo Only use the last method name and remove array in 8.x-4.x. + $methodNames = [ + 'alter' . implode('', $hook_suggestions), + 'alter' . implode('', array_map('\Drupal\Component\Utility\Unicode::ucfirst', explode('_', implode('', $hook_suggestions)))), + ]; + foreach (array_unique($methodNames) as $method) { + if (method_exists($this, $method)) { + $methods[] = $method; + } } array_pop($hook_suggestions); } diff --git a/web/themes/contrib/bootstrap/src/Plugin/Form/SystemThemeSettings.php b/web/themes/contrib/bootstrap/src/Plugin/Form/SystemThemeSettings.php index 35bbcb15d..298108856 100644 --- a/web/themes/contrib/bootstrap/src/Plugin/Form/SystemThemeSettings.php +++ b/web/themes/contrib/bootstrap/src/Plugin/Form/SystemThemeSettings.php @@ -3,6 +3,7 @@ namespace Drupal\bootstrap\Plugin\Form; use Drupal\bootstrap\Bootstrap; +use Drupal\bootstrap\Plugin\Setting\DeprecatedSettingInterface; use Drupal\bootstrap\Utility\Element; use Drupal\Core\Form\FormStateInterface; @@ -122,6 +123,12 @@ class SystemThemeSettings extends FormBase implements FormInterface { // Iterate over all setting plugins and manually save them since core's // process is severely limiting and somewhat broken. foreach ($theme->getSettingPlugin() as $name => $setting) { + // Skip saving deprecated settings. + if ($setting instanceof DeprecatedSettingInterface) { + $form_state->unsetValue($name); + continue; + } + // Allow the setting to participate in the form submission process. // Must call the "submitForm" method in case any setting actually uses it. // It should, in turn, invoke "submitFormElement", if the setting that diff --git a/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php b/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php index 8c0a6de21..b6eb9094f 100644 --- a/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php +++ b/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php @@ -77,10 +77,9 @@ class BootstrapDropdown extends PreprocessBase implements PreprocessInterface { $wrapper_attributes['hreflang'] = $element['language']->getId(); // Ensure the Url language is set on the object itself. - // @todo Possibly a core bug? - if (empty($element['url']->getOption('language'))) { - $element['url']->setOption('language', $element['language']); - } + // @todo Revisit, possibly a core bug? + // @see https://www.drupal.org/project/bootstrap/issues/2868100 + $element['url']->setOption('language', $element['language']); } // Preserve query parameters (if any) diff --git a/web/themes/contrib/bootstrap/src/Plugin/Preprocess/Menu.php b/web/themes/contrib/bootstrap/src/Plugin/Preprocess/Menu.php new file mode 100644 index 000000000..9af5dc610 --- /dev/null +++ b/web/themes/contrib/bootstrap/src/Plugin/Preprocess/Menu.php @@ -0,0 +1,43 @@ +items as &$item) { + $wrapperAttributes = new Attributes(); + $linkAttributes = new Attributes(); + if ($item['attributes'] instanceof Attribute || $item['attributes'] instanceof Attributes) { + $wrapperAttributes->setAttributes($item['attributes']->getIterator()->getArrayCopy()); + } + if ($item['url'] instanceof Url) { + $wrapperAttributes->setAttributes($item['url']->getOption('wrapper_attributes') ?: []); + $wrapperAttributes->setAttributes($item['url']->getOption('container_attributes') ?: []); + $linkAttributes->setAttributes($item['url']->getOption('attributes') ?: []); + } + + // Unfortunately, in newer core/Twig versions, only certain classes are + // allowed to be invoked due to stricter sandboxing policies. To get + // around this, just rewrap attributes in core's native Attribute class. + $item['attributes'] = new Attribute($wrapperAttributes->getArrayCopy()); + $item['link_attributes'] = new Attribute($linkAttributes->getArrayCopy()); + } + } + +} diff --git a/web/themes/contrib/bootstrap/src/Plugin/Provider/JsDelivr.php b/web/themes/contrib/bootstrap/src/Plugin/Provider/JsDelivr.php index 950a9d3e6..2c0e7a5e3 100644 --- a/web/themes/contrib/bootstrap/src/Plugin/Provider/JsDelivr.php +++ b/web/themes/contrib/bootstrap/src/Plugin/Provider/JsDelivr.php @@ -94,7 +94,7 @@ class JsDelivr extends ProviderBase { * {@inheritdoc} */ public function processApi(array $json, array &$definition) { - $definition['description'] = t('

jsDelivr Logo

jsDelivr is a free multi-CDN infrastructure that uses MaxCDN, Cloudflare and many others to combine their powers for the good of the open source community... read more

', [ + $definition['description'] = t('

jsDelivr is a free multi-CDN infrastructure that uses MaxCDN, Cloudflare and many others to combine their powers for the good of the open source community... read more

', [ ':jsdelivr' => 'https://www.jsdelivr.com', ':jsdelivr_about' => 'https://www.jsdelivr.com/about', ':maxcdn' => 'https://www.maxcdn.com', diff --git a/web/themes/contrib/bootstrap/src/Plugin/Setting/DeprecatedSettingInterface.php b/web/themes/contrib/bootstrap/src/Plugin/Setting/DeprecatedSettingInterface.php new file mode 100644 index 000000000..6c0ae9a01 --- /dev/null +++ b/web/themes/contrib/bootstrap/src/Plugin/Setting/DeprecatedSettingInterface.php @@ -0,0 +1,9 @@ +getSettingElement($form, $form_state); + $setting->setProperty('states', [ + 'visible' => [ + ':input[name="modal_enabled"]' => ['checked' => TRUE], + ], + ]); + } + + /** + * {@inheritdoc} + */ + public function drupalSettings() { + return !!$this->theme->getSetting('modal_enabled'); + } + + /** + * {@inheritdoc} + */ + public function getCacheTags() { + return ['rendered', 'library_info']; + } + +} diff --git a/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSelectText.php b/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSelectText.php new file mode 100644 index 000000000..9a8cb5f7a --- /dev/null +++ b/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSelectText.php @@ -0,0 +1,57 @@ +getSettingElement($form, $form_state); + $setting->setProperty('states', [ + 'visible' => [ + ':input[name="modal_enabled"]' => ['checked' => TRUE], + ':input[name="modal_focus_input"]' => ['checked' => TRUE], + ], + ]); + } + + /** + * {@inheritdoc} + */ + public function drupalSettings() { + return !!$this->theme->getSetting('modal_enabled'); + } + + /** + * {@inheritdoc} + */ + public function getCacheTags() { + return ['rendered', 'library_info']; + } + +} diff --git a/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAutoClose.php b/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAutoClose.php new file mode 100644 index 000000000..fd23b3fc3 --- /dev/null +++ b/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAutoClose.php @@ -0,0 +1,34 @@ +theme->getSetting('popover_enabled'); + } + +} diff --git a/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php b/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php index 027e5c8b3..815477247 100644 --- a/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php +++ b/web/themes/contrib/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php @@ -2,7 +2,7 @@ namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers; -use Drupal\bootstrap\Plugin\Setting\SettingBase; +use Drupal\bootstrap\Plugin\Setting\DeprecatedSettingInterface; /** * The "popover_trigger_autoclose" theme setting. @@ -21,14 +21,10 @@ use Drupal\bootstrap\Plugin\Setting\SettingBase; * "options" = @Translation("Options"), * }, * ) + * + * @deprecated Since 8.x-3.14. Will be removed in a future release. + * + * @see \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverAutoClose */ -class PopoverTriggerAutoclose extends SettingBase { - - /** - * {@inheritdoc} - */ - public function drupalSettings() { - return !!$this->theme->getSetting('popover_enabled'); - } - +class PopoverTriggerAutoclose extends PopoverAutoClose implements DeprecatedSettingInterface { } diff --git a/web/themes/contrib/bootstrap/src/Plugin/Setting/SettingBase.php b/web/themes/contrib/bootstrap/src/Plugin/Setting/SettingBase.php index d8f85c038..c368451d5 100644 --- a/web/themes/contrib/bootstrap/src/Plugin/Setting/SettingBase.php +++ b/web/themes/contrib/bootstrap/src/Plugin/Setting/SettingBase.php @@ -178,6 +178,12 @@ class SettingBase extends PluginBase implements SettingInterface { $group->$plugin_id->setProperty('description', $description); } } + + // Hide the setting if is been deprecated. + if ($this instanceof DeprecatedSettingInterface) { + $group->$plugin_id->access(FALSE); + } + return $group->$plugin_id; } diff --git a/web/themes/contrib/bootstrap/src/Utility/Element.php b/web/themes/contrib/bootstrap/src/Utility/Element.php index f0422265b..9fad8b887 100644 --- a/web/themes/contrib/bootstrap/src/Utility/Element.php +++ b/web/themes/contrib/bootstrap/src/Utility/Element.php @@ -134,6 +134,18 @@ class Element extends DrupalAttributes { parent::__unset($name); } + /** + * Sets the #access property on an element. + * + * @param bool|\Drupal\Core\Access\AccessResultInterface $access + * The value to assign to #access. + * + * @return static + */ + public function access($access = NULL) { + return $this->setProperty('access', $access); + } + /** * Appends a property with a value. * diff --git a/web/themes/contrib/bootstrap/starterkits/sass/README.md b/web/themes/contrib/bootstrap/starterkits/sass/README.md old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/THEMENAME.libraries.yml b/web/themes/contrib/bootstrap/starterkits/sass/THEMENAME.libraries.yml old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/THEMENAME.starterkit.yml b/web/themes/contrib/bootstrap/starterkits/sass/THEMENAME.starterkit.yml old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/THEMENAME.theme b/web/themes/contrib/bootstrap/starterkits/sass/THEMENAME.theme old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/config/install/THEMENAME.settings.yml b/web/themes/contrib/bootstrap/starterkits/sass/config/install/THEMENAME.settings.yml old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/config/schema/THEMENAME.schema.yml b/web/themes/contrib/bootstrap/starterkits/sass/config/schema/THEMENAME.schema.yml old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/favicon.ico b/web/themes/contrib/bootstrap/starterkits/sass/favicon.ico old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/logo.svg b/web/themes/contrib/bootstrap/starterkits/sass/logo.svg old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/starterkits/sass/templates/README.md b/web/themes/contrib/bootstrap/starterkits/sass/templates/README.md old mode 100755 new mode 100644 diff --git a/web/themes/contrib/bootstrap/templates/menu/menu.html.twig b/web/themes/contrib/bootstrap/templates/menu/menu.html.twig index 1f48ae663..3ded5ec34 100644 --- a/web/themes/contrib/bootstrap/templates/menu/menu.html.twig +++ b/web/themes/contrib/bootstrap/templates/menu/menu.html.twig @@ -21,19 +21,22 @@ {% if items %} {% for item in items %} + {% + set item_classes = item.url.getOption('container_attributes').class | split(" ") + %} {% set item_classes = [ - item.is_expanded and item.below ? 'expanded', - item.is_expanded and menu_level == 0 and item.below ? 'dropdown', - item.in_active_trail ? 'active', + item.is_expanded and item.below ? 'expanded dropdown', + item.in_active_trail ? 'active-trail', + loop.first ? 'first', + loop.last ? 'last', ] %} + {% if menu_level == 0 and item.is_expanded and item.below %} - - {{ item.title }} + {{ item.title }} {% else %} - - {{ link(item.title, item.url) }} + {{ item.title }} {% endif %} {% if item.below %} {{ _self.menu_links(item.below, attributes.removeClass(classes), menu_level + 1, classes) }} diff --git a/web/themes/contrib/bootstrap/templates/system/pager.html.twig b/web/themes/contrib/bootstrap/templates/system/pager.html.twig index e65b599a4..5e5bb287c 100644 --- a/web/themes/contrib/bootstrap/templates/system/pager.html.twig +++ b/web/themes/contrib/bootstrap/templates/system/pager.html.twig @@ -39,7 +39,7 @@ {# Print first item if we are not on the first page. #} {% if items.first %}
  • -