grunt

94b544c2 · Heinrich Fenkart · 36e3d07c · 94b544c2 · 94b544c2 · 94b544c2
Commit 94b544c2 authored 10 years ago by Heinrich Fenkart
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 104 additions and 38 deletions
+104 -38
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -541,9 +541,15 @@ if (typeof jQuery === 'undefined') {
  var Collapse = function (element, options) {
    this.$element      = $(element)
    this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.$trigger      = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
    this.transitioning = null
-    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.parent) {
+      this.$parent = this.getParent()
+    } else {
+      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
+    }
    if (this.options.toggle) this.toggle()
  }
@@ -552,7 +558,8 @@ if (typeof jQuery === 'undefined') {
  Collapse.TRANSITION_DURATION = 350
  Collapse.DEFAULTS = {
-    toggle: true
+    toggle: true,
+    trigger: '[data-toggle="collapse"]'
  }
  Collapse.prototype.dimension = function () {
@@ -587,6 +594,10 @@ if (typeof jQuery === 'undefined') {
      .addClass('collapsing')[dimension](0)
      .attr('aria-expanded', true)
+    this.$trigger
+      .removeClass('collapsed')
+      .attr('aria-expanded', true)
    this.transitioning = 1
    var complete = function () {
@@ -623,6 +634,10 @@ if (typeof jQuery === 'undefined') {
      .removeClass('collapse in')
      .attr('aria-expanded', false)
+    this.$trigger
+      .addClass('collapsed')
+      .attr('aria-expanded', false)
    this.transitioning = 1
    var complete = function () {
@@ -645,6 +660,33 @@ if (typeof jQuery === 'undefined') {
    this[this.$element.hasClass('in') ? 'hide' : 'show']()
  }
+  Collapse.prototype.getParent = function () {
+    return $(this.options.parent)
+      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
+      .each($.proxy(function (i, element) {
+        var $element = $(element)
+        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
+      }, this))
+      .end()
+  }
+  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
+    var isOpen = $element.hasClass('in')
+    $element.attr('aria-expanded', isOpen)
+    $trigger
+      .toggleClass('collapsed', !isOpen)
+      .attr('aria-expanded', isOpen)
+  }
+  function getTargetFromTrigger($trigger) {
+    var href
+    var target = $trigger.attr('data-target')
+      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+    return $(target)
+  }
  // COLLAPSE PLUGIN DEFINITION
  // ==========================
@@ -680,22 +722,13 @@ if (typeof jQuery === 'undefined') {
  // =================
  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var href
    var $this   = $(this)
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
+    if (!$this.attr('data-target')) e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-    var $target = $(target)
+    var $target = getTargetFromTrigger($this)
    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
+    var option  = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)
-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed').attr('aria-expanded', false)
-      var isCollapsed = $target.hasClass('in')
-      $this.toggleClass('collapsed', isCollapsed).attr('aria-expanded', !isCollapsed)
-    }
    Plugin.call($target, option)
  })

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -541,9 +541,15 @@ if (typeof jQuery === 'undefined') {
  var Collapse = function (element, options) {
    this.$element      = $(element)
    this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.$trigger      = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
    this.transitioning = null
-    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.parent) {
+      this.$parent = this.getParent()
+    } else {
+      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
+    }
    if (this.options.toggle) this.toggle()
  }
@@ -552,7 +558,8 @@ if (typeof jQuery === 'undefined') {
  Collapse.TRANSITION_DURATION = 350
  Collapse.DEFAULTS = {
-    toggle: true
+    toggle: true,
+    trigger: '[data-toggle="collapse"]'
  }
  Collapse.prototype.dimension = function () {
@@ -587,6 +594,10 @@ if (typeof jQuery === 'undefined') {
      .addClass('collapsing')[dimension](0)
      .attr('aria-expanded', true)
+    this.$trigger
+      .removeClass('collapsed')
+      .attr('aria-expanded', true)
    this.transitioning = 1
    var complete = function () {
@@ -623,6 +634,10 @@ if (typeof jQuery === 'undefined') {
      .removeClass('collapse in')
      .attr('aria-expanded', false)
+    this.$trigger
+      .addClass('collapsed')
+      .attr('aria-expanded', false)
    this.transitioning = 1
    var complete = function () {
@@ -645,6 +660,33 @@ if (typeof jQuery === 'undefined') {
    this[this.$element.hasClass('in') ? 'hide' : 'show']()
  }
+  Collapse.prototype.getParent = function () {
+    return $(this.options.parent)
+      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
+      .each($.proxy(function (i, element) {
+        var $element = $(element)
+        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
+      }, this))
+      .end()
+  }
+  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
+    var isOpen = $element.hasClass('in')
+    $element.attr('aria-expanded', isOpen)
+    $trigger
+      .toggleClass('collapsed', !isOpen)
+      .attr('aria-expanded', isOpen)
+  }
+  function getTargetFromTrigger($trigger) {
+    var href
+    var target = $trigger.attr('data-target')
+      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+    return $(target)
+  }
  // COLLAPSE PLUGIN DEFINITION
  // ==========================
@@ -680,22 +722,13 @@ if (typeof jQuery === 'undefined') {
  // =================
  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var href
    var $this   = $(this)
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
+    if (!$this.attr('data-target')) e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-    var $target = $(target)
+    var $target = getTargetFromTrigger($this)
    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
+    var option  = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)
-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed').attr('aria-expanded', false)
-      var isCollapsed = $target.hasClass('in')
-      $this.toggleClass('collapsed', isCollapsed).attr('aria-expanded', !isCollapsed)
-    }
    Plugin.call($target, option)
  })

--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js