Skip to content

Commit 3db610a

Browse files
glebmglebm
committed
rake convert[v3.4.0-dev]
1 parent 58db771 commit 3db610a

File tree

8 files changed

+19
-15
lines changed

8 files changed

+19
-15
lines changed

‎assets/javascripts/bootstrap.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ if (typeof jQuery === 'undefined') {
684684
}
685685

686686
Collapse.prototype.getParent = function () {
687-
return $(this.options.parent)
687+
return $(document).find(this.options.parent)
688688
.find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
689689
.each($.proxy(function (i, element) {
690690
var $element = $(element)
@@ -1320,7 +1320,7 @@ if (typeof jQuery === 'undefined') {
13201320
this.type = type
13211321
this.$element = $(element)
13221322
this.options = this.getOptions(options)
1323-
this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
1323+
this.$viewport = this.options.viewport && $(document).find($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
13241324
this.inState = { click: false, hover: false, focus: false }
13251325

13261326
if (this.$element[0] instanceof document.constructor && !this.options.selector) {
@@ -1473,7 +1473,7 @@ if (typeof jQuery === 'undefined') {
14731473
.addClass(placement)
14741474
.data('bs.' + this.type, this)
14751475

1476-
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
1476+
this.options.container ? $tip.appendTo($(document).find(this.options.container)) : $tip.insertAfter(this.$element)
14771477
this.$element.trigger('inserted.bs.' + this.type)
14781478

14791479
var pos = this.getPosition()
@@ -2120,7 +2120,7 @@ if (typeof jQuery === 'undefined') {
21202120

21212121
if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
21222122

2123-
var $target = $(selector)
2123+
var $target = $(document).find(selector)
21242124

21252125
this.activate($this.closest('li'), $ul)
21262126
this.activate($target, $target.parent(), function () {
@@ -2244,7 +2244,9 @@ if (typeof jQuery === 'undefined') {
22442244
var Affix = function (element, options) {
22452245
this.options = $.extend({}, Affix.DEFAULTS, options)
22462246

2247-
this.$target = $(this.options.target)
2247+
var target = this.options.target === Affix.DEFAULTS.target ? $(this.options.target) : $(document).find(this.options.target)
2248+
2249+
this.$target = target
22482250
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
22492251
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
22502252

‎assets/javascripts/bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/javascripts/bootstrap/affix.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
var Affix = function (element, options) {
1717
this.options = $.extend({}, Affix.DEFAULTS, options)
1818

19-
this.$target = $(this.options.target)
19+
var target = this.options.target === Affix.DEFAULTS.target ? $(this.options.target) : $(document).find(this.options.target)
20+
21+
this.$target = target
2022
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
2123
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
2224

‎assets/javascripts/bootstrap/collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
}
138138

139139
Collapse.prototype.getParent = function () {
140-
return $(this.options.parent)
140+
return $(document).find(this.options.parent)
141141
.find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
142142
.each($.proxy(function (i, element) {
143143
var $element = $(element)

‎assets/javascripts/bootstrap/tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
5050

51-
var $target = $(selector)
51+
var $target = $(document).find(selector)
5252

5353
this.activate($this.closest('li'), $ul)
5454
this.activate($target, $target.parent(), function () {

‎assets/javascripts/bootstrap/tooltip.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
this.type = type
5252
this.$element = $(element)
5353
this.options = this.getOptions(options)
54-
this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
54+
this.$viewport = this.options.viewport && $(document).find($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
5555
this.inState = { click: false, hover: false, focus: false }
5656

5757
if (this.$element[0] instanceof document.constructor && !this.options.selector) {
@@ -204,7 +204,7 @@
204204
.addClass(placement)
205205
.data('bs.' + this.type, this)
206206

207-
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
207+
this.options.container ? $tip.appendTo($(document).find(this.options.container)) : $tip.insertAfter(this.$element)
208208
this.$element.trigger('inserted.bs.' + this.type)
209209

210210
var pos = this.getPosition()

‎assets/stylesheets/bootstrap/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ $link-hover-decoration: underline !default;
4343
//
4444
//## Font, line-height, and color for body text, headings, and more.
4545

46-
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
46+
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
4747
$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
4848
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
49-
$font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Courier New", monospace !default;
49+
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
5050
$font-family-base: $font-family-sans-serif !default;
5151

5252
$font-size-base: 14px !default;

‎templates/project/_bootstrap-variables.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
//
4545
//## Font, line-height, and color for body text, headings, and more.
4646
47-
// $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif
47+
// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif
4848
// $font-family-serif: Georgia, "Times New Roman", Times, serif
4949
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
50-
// $font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Courier New", monospace
50+
// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace
5151
// $font-family-base: $font-family-sans-serif
5252
5353
// $font-size-base: 14px

0 commit comments

Comments
 (0)