Skip to content
GitLab
Commit 5f2e6fa5 authored by Heinrich Fenkart's avatar Heinrich Fenkart
Browse files

grunt

parent 1b323762
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 22 deletions
+59 -22
dist/js/bootstrap.js
+ 20
- 8
View file @ 5f2e6fa5
...@@ -1588,12 +1588,18 @@ if (typeof jQuery === 'undefined') { ...@@ -1588,12 +1588,18 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) { function Plugin(option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
var data = $this.data('bs.tooltip') var data = $this.data('bs.tooltip')
var options = typeof option == 'object' && option var options = typeof option == 'object' && option
var selector = options && options.selector
if (!data && option == 'destroy') return if (!data && option == 'destroy') return
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (selector) {
if (!data) $this.data('bs.tooltip', (data = {}))
if (!data[selector]) data[selector] = new Tooltip(this, options)
} else {
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
}
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
...@@ -1702,12 +1708,18 @@ if (typeof jQuery === 'undefined') { ...@@ -1702,12 +1708,18 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) { function Plugin(option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
var data = $this.data('bs.popover') var data = $this.data('bs.popover')
var options = typeof option == 'object' && option var options = typeof option == 'object' && option
var selector = options && options.selector
if (!data && option == 'destroy') return if (!data && option == 'destroy') return
if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (selector) {
if (!data) $this.data('bs.popover', (data = {}))
if (!data[selector]) data[selector] = new Popover(this, options)
} else {
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
}
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
......
dist/js/bootstrap.min.js
+ 2
- 2
View file @ 5f2e6fa5
This diff is collapsed.
docs/assets/js/customize.min.js
+ 1
- 1
View file @ 5f2e6fa5
This diff is collapsed.
docs/assets/js/raw-files.min.js
+ 1
- 1
View file @ 5f2e6fa5
This diff is collapsed.
docs/dist/js/bootstrap.js
+ 20
- 8
View file @ 5f2e6fa5
...@@ -1588,12 +1588,18 @@ if (typeof jQuery === 'undefined') { ...@@ -1588,12 +1588,18 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) { function Plugin(option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
var data = $this.data('bs.tooltip') var data = $this.data('bs.tooltip')
var options = typeof option == 'object' && option var options = typeof option == 'object' && option
var selector = options && options.selector
if (!data && option == 'destroy') return if (!data && option == 'destroy') return
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (selector) {
if (!data) $this.data('bs.tooltip', (data = {}))
if (!data[selector]) data[selector] = new Tooltip(this, options)
} else {
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
}
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
...@@ -1702,12 +1708,18 @@ if (typeof jQuery === 'undefined') { ...@@ -1702,12 +1708,18 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) { function Plugin(option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
var data = $this.data('bs.popover') var data = $this.data('bs.popover')
var options = typeof option == 'object' && option var options = typeof option == 'object' && option
var selector = options && options.selector
if (!data && option == 'destroy') return if (!data && option == 'destroy') return
if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (selector) {
if (!data) $this.data('bs.popover', (data = {}))
if (!data[selector]) data[selector] = new Popover(this, options)
} else {
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
}
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
......
docs/dist/js/bootstrap.min.js
+ 2
- 2
View file @ 5f2e6fa5
This diff is collapsed.
docs/dist/js/npm.js 0 → 100644
+ 13
- 0
View file @ 5f2e6fa5
// This file is generated. You can require() it in a CommonJS environment.
require('../../js/transition.js')
require('../../js/alert.js')
require('../../js/button.js')
require('../../js/carousel.js')
require('../../js/collapse.js')
require('../../js/dropdown.js')
require('../../js/modal.js')
require('../../js/tooltip.js')
require('../../js/popover.js')
require('../../js/scrollspy.js')
require('../../js/tab.js')
require('../../js/affix.js')
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment