Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

1 files changed, 46 insertions, 52 deletions

diff --git a/vendor/twbs/bootstrap/js/src/button.js b/vendor/twbs/bootstrap/js/src/button.js
index f5b4fa0a7..0da254511 100644
--- a/vendor/twbs/bootstrap/js/src/button.js
+++ b/vendor/twbs/bootstrap/js/src/button.js
@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.4.1): button.js
+ * Bootstrap (v4.5.0): button.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -14,34 +14,28 @@ import $ from 'jquery'
  */
 
 const NAME                = 'button'
-const VERSION             = '4.4.1'
+const VERSION             = '4.5.0'
 const DATA_KEY            = 'bs.button'
 const EVENT_KEY           = `.${DATA_KEY}`
 const DATA_API_KEY        = '.data-api'
 const JQUERY_NO_CONFLICT  = $.fn[NAME]
 
-const ClassName = {
-  ACTIVE : 'active',
-  BUTTON : 'btn',
-  FOCUS  : 'focus'
-}
+const CLASS_NAME_ACTIVE = 'active'
+const CLASS_NAME_BUTTON = 'btn'
+const CLASS_NAME_FOCUS  = 'focus'
 
-const Selector = {
-  DATA_TOGGLE_CARROT   : '[data-toggle^="button"]',
-  DATA_TOGGLES         : '[data-toggle="buttons"]',
-  DATA_TOGGLE          : '[data-toggle="button"]',
-  DATA_TOGGLES_BUTTONS : '[data-toggle="buttons"] .btn',
-  INPUT                : 'input:not([type="hidden"])',
-  ACTIVE               : '.active',
-  BUTTON               : '.btn'
-}
+const SELECTOR_DATA_TOGGLE_CARROT   = '[data-toggle^="button"]'
+const SELECTOR_DATA_TOGGLES         = '[data-toggle="buttons"]'
+const SELECTOR_DATA_TOGGLE          = '[data-toggle="button"]'
+const SELECTOR_DATA_TOGGLES_BUTTONS = '[data-toggle="buttons"] .btn'
+const SELECTOR_INPUT                = 'input:not([type="hidden"])'
+const SELECTOR_ACTIVE               = '.active'
+const SELECTOR_BUTTON               = '.btn'
 
-const Event = {
-  CLICK_DATA_API      : `click${EVENT_KEY}${DATA_API_KEY}`,
-  FOCUS_BLUR_DATA_API : `focus${EVENT_KEY}${DATA_API_KEY} ` +
-                          `blur${EVENT_KEY}${DATA_API_KEY}`,
-  LOAD_DATA_API       : `load${EVENT_KEY}${DATA_API_KEY}`
-}
+const EVENT_CLICK_DATA_API      = `click${EVENT_KEY}${DATA_API_KEY}`
+const EVENT_FOCUS_BLUR_DATA_API = `focus${EVENT_KEY}${DATA_API_KEY} ` +
+                          `blur${EVENT_KEY}${DATA_API_KEY}`
+const EVENT_LOAD_DATA_API       = `load${EVENT_KEY}${DATA_API_KEY}`
 
 /**
  * ------------------------------------------------------------------------
@@ -66,35 +60,31 @@ class Button {
     let triggerChangeEvent = true
     let addAriaPressed = true
     const rootElement = $(this._element).closest(
-      Selector.DATA_TOGGLES
+      SELECTOR_DATA_TOGGLES
     )[0]
 
     if (rootElement) {
-      const input = this._element.querySelector(Selector.INPUT)
+      const input = this._element.querySelector(SELECTOR_INPUT)
 
       if (input) {
         if (input.type === 'radio') {
           if (input.checked &&
-            this._element.classList.contains(ClassName.ACTIVE)) {
+            this._element.classList.contains(CLASS_NAME_ACTIVE)) {
             triggerChangeEvent = false
           } else {
-            const activeElement = rootElement.querySelector(Selector.ACTIVE)
+            const activeElement = rootElement.querySelector(SELECTOR_ACTIVE)
 
             if (activeElement) {
-              $(activeElement).removeClass(ClassName.ACTIVE)
+              $(activeElement).removeClass(CLASS_NAME_ACTIVE)
             }
           }
-        } else if (input.type === 'checkbox') {
-          if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName.ACTIVE)) {
-            triggerChangeEvent = false
-          }
-        } else {
-          // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input
-          triggerChangeEvent = false
         }
 
         if (triggerChangeEvent) {
-          input.checked = !this._element.classList.contains(ClassName.ACTIVE)
+          // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input
+          if (input.type === 'checkbox' || input.type === 'radio') {
+            input.checked = !this._element.classList.contains(CLASS_NAME_ACTIVE)
+          }
           $(input).trigger('change')
         }
 
@@ -106,11 +96,11 @@ class Button {
     if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {
       if (addAriaPressed) {
         this._element.setAttribute('aria-pressed',
-          !this._element.classList.contains(ClassName.ACTIVE))
+          !this._element.classList.contains(CLASS_NAME_ACTIVE))
       }
 
       if (triggerChangeEvent) {
-        $(this._element).toggleClass(ClassName.ACTIVE)
+        $(this._element).toggleClass(CLASS_NAME_ACTIVE)
       }
     }
   }
@@ -145,54 +135,58 @@ class Button {
  */
 
 $(document)
-  .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {
+  .on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, (event) => {
     let button = event.target
+    const initialButton = button
 
-    if (!$(button).hasClass(ClassName.BUTTON)) {
-      button = $(button).closest(Selector.BUTTON)[0]
+    if (!$(button).hasClass(CLASS_NAME_BUTTON)) {
+      button = $(button).closest(SELECTOR_BUTTON)[0]
     }
 
     if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {
       event.preventDefault() // work around Firefox bug #1540995
     } else {
-      const inputBtn = button.querySelector(Selector.INPUT)
+      const inputBtn = button.querySelector(SELECTOR_INPUT)
 
       if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {
         event.preventDefault() // work around Firefox bug #1540995
         return
       }
 
+      if (initialButton.tagName === 'LABEL' && inputBtn && inputBtn.type === 'checkbox') {
+        event.preventDefault() // work around event sent to label and input
+      }
       Button._jQueryInterface.call($(button), 'toggle')
     }
   })
-  .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {
-    const button = $(event.target).closest(Selector.BUTTON)[0]
-    $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type))
+  .on(EVENT_FOCUS_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, (event) => {
+    const button = $(event.target).closest(SELECTOR_BUTTON)[0]
+    $(button).toggleClass(CLASS_NAME_FOCUS, /^focus(in)?$/.test(event.type))
   })
 
-$(window).on(Event.LOAD_DATA_API, () => {
+$(window).on(EVENT_LOAD_DATA_API, () => {
   // ensure correct active class is set to match the controls' actual values/states
 
   // find all checkboxes/readio buttons inside data-toggle groups
-  let buttons = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLES_BUTTONS))
+  let buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLES_BUTTONS))
   for (let i = 0, len = buttons.length; i < len; i++) {
     const button = buttons[i]
-    const input = button.querySelector(Selector.INPUT)
+    const input = button.querySelector(SELECTOR_INPUT)
     if (input.checked || input.hasAttribute('checked')) {
-      button.classList.add(ClassName.ACTIVE)
+      button.classList.add(CLASS_NAME_ACTIVE)
     } else {
-      button.classList.remove(ClassName.ACTIVE)
+      button.classList.remove(CLASS_NAME_ACTIVE)
     }
   }
 
   // find all button toggles
-  buttons = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))
+  buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE))
   for (let i = 0, len = buttons.length; i < len; i++) {
     const button = buttons[i]
     if (button.getAttribute('aria-pressed') === 'true') {
-      button.classList.add(ClassName.ACTIVE)
+      button.classList.add(CLASS_NAME_ACTIVE)
     } else {
-      button.classList.remove(ClassName.ACTIVE)
+      button.classList.remove(CLASS_NAME_ACTIVE)
     }
   }
 })