Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
96e5fa61
Commit
96e5fa61
authored
12 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
parent
7c456c85
6 merge requests
!6821
Typeahead updater
,
!6666
Patch 1
,
!6610
Add outline for input[type="image"]
,
!6546
3.0.0 wip - fixed the issue in which the test pid isn't killed if a test fails
,
!6503
control markup changes added
,
!6345
Input classes addition
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/js/bootstrap-dropdown.js
+3
-2
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-tooltip.js
+0
-1
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap.js
+3
-3
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
js/bootstrap-dropdown.js
+3
-2
js/bootstrap-dropdown.js
with
10 additions
and
9 deletions
+10
-9
docs/assets/js/bootstrap-dropdown.js
+
3
-
2
View file @
96e5fa61
...
...
@@ -115,8 +115,9 @@
selector
=
selector
&&
/#/
.
test
(
selector
)
&&
selector
.
replace
(
/.*
(?=
#
[^\s]
*$
)
/
,
''
)
//strip for ie7
}
$parent
=
$
(
selector
)
$parent
.
length
||
(
$parent
=
$this
.
parent
())
$parent
=
selector
&&
$
(
selector
)
if
(
!
$parent
||
!
$parent
.
length
)
$parent
=
$this
.
parent
()
return
$parent
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-tooltip.js
+
0
-
1
View file @
96e5fa61
...
...
@@ -192,7 +192,6 @@
,
getPosition
:
function
()
{
var
el
=
this
.
$element
[
0
]
return
$
.
extend
({},
el
.
getBoundingClientRect
?
el
.
getBoundingClientRect
()
:
{
width
:
el
.
offsetWidth
,
height
:
el
.
offsetHeight
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
3
-
3
View file @
96e5fa61
...
...
@@ -726,8 +726,9 @@
selector
=
selector
&&
/#/
.
test
(
selector
)
&&
selector
.
replace
(
/.*
(?=
#
[^\s]
*$
)
/
,
''
)
//strip for ie7
}
$parent
=
$
(
selector
)
$parent
.
length
||
(
$parent
=
$this
.
parent
())
$parent
=
selector
&&
$
(
selector
)
if
(
!
$parent
||
!
$parent
.
length
)
$parent
=
$this
.
parent
()
return
$parent
}
...
...
@@ -1208,7 +1209,6 @@
,
getPosition
:
function
()
{
var
el
=
this
.
$element
[
0
]
return
$
.
extend
({},
el
.
getBoundingClientRect
?
el
.
getBoundingClientRect
()
:
{
width
:
el
.
offsetWidth
,
height
:
el
.
offsetHeight
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
96e5fa61
This diff is collapsed.
Click to expand it.
js/bootstrap-dropdown.js
+
3
-
2
View file @
96e5fa61
...
...
@@ -115,8 +115,9 @@
selector
=
selector
&&
/#/
.
test
(
selector
)
&&
selector
.
replace
(
/.*
(?=
#
[^\s]
*$
)
/
,
''
)
//strip for ie7
}
$parent
=
$
(
selector
)
$parent
.
length
||
(
$parent
=
$this
.
parent
())
$parent
=
selector
&&
$
(
selector
)
if
(
!
$parent
||
!
$parent
.
length
)
$parent
=
$this
.
parent
()
return
$parent
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets