Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
f3db084f
Commit
f3db084f
authored
Feb 01, 2013
by
Oleg
Committed by
Dave Methvin
Feb 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #13310. Get the right display value for disconnected nodes. Close gh-1156.
parent
a30785a4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
4 deletions
+39
-4
css.js
src/css.js
+13
-4
testsuite.css
test/data/testsuite.css
+2
-0
index.html
test/index.html
+1
-0
css.js
test/unit/css.js
+23
-0
No files found.
src/css.js
View file @
f3db084f
...
@@ -54,7 +54,7 @@ function getStyles( elem ) {
...
@@ -54,7 +54,7 @@ function getStyles( elem ) {
}
}
function
showHide
(
elements
,
show
)
{
function
showHide
(
elements
,
show
)
{
var
elem
,
var
display
,
elem
,
hidden
,
values
=
[],
values
=
[],
index
=
0
,
index
=
0
,
length
=
elements
.
length
;
length
=
elements
.
length
;
...
@@ -64,11 +64,13 @@ function showHide( elements, show ) {
...
@@ -64,11 +64,13 @@ function showHide( elements, show ) {
if
(
!
elem
.
style
)
{
if
(
!
elem
.
style
)
{
continue
;
continue
;
}
}
values
[
index
]
=
jQuery
.
_data
(
elem
,
"olddisplay"
);
values
[
index
]
=
jQuery
.
_data
(
elem
,
"olddisplay"
);
display
=
elem
.
style
.
display
;
if
(
show
)
{
if
(
show
)
{
// Reset the inline display of this element to learn if it is
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
// being hidden by cascaded rules or not
if
(
!
values
[
index
]
&&
elem
.
style
.
display
===
"none"
)
{
if
(
!
values
[
index
]
&&
display
===
"none"
)
{
elem
.
style
.
display
=
""
;
elem
.
style
.
display
=
""
;
}
}
...
@@ -78,8 +80,15 @@ function showHide( elements, show ) {
...
@@ -78,8 +80,15 @@ function showHide( elements, show ) {
if
(
elem
.
style
.
display
===
""
&&
isHidden
(
elem
)
)
{
if
(
elem
.
style
.
display
===
""
&&
isHidden
(
elem
)
)
{
values
[
index
]
=
jQuery
.
_data
(
elem
,
"olddisplay"
,
css_defaultDisplay
(
elem
.
nodeName
)
);
values
[
index
]
=
jQuery
.
_data
(
elem
,
"olddisplay"
,
css_defaultDisplay
(
elem
.
nodeName
)
);
}
}
}
else
if
(
!
values
[
index
]
&&
!
isHidden
(
elem
)
)
{
}
else
{
jQuery
.
_data
(
elem
,
"olddisplay"
,
jQuery
.
css
(
elem
,
"display"
)
);
if
(
!
values
[
index
]
)
{
hidden
=
isHidden
(
elem
);
if
(
display
&&
display
!==
"none"
||
!
hidden
)
{
jQuery
.
_data
(
elem
,
"olddisplay"
,
hidden
?
display
:
jQuery
.
css
(
elem
,
"display"
)
);
}
}
}
}
}
}
...
...
test/data/testsuite.css
View file @
f3db084f
...
@@ -151,3 +151,5 @@ section { background:#f0f; display:block; }
...
@@ -151,3 +151,5 @@ section { background:#f0f; display:block; }
/* #11971 */
/* #11971 */
#foo
{
background
:
url(1x1.jpg)
right
bottom
no-repeat
;
}
#foo
{
background
:
url(1x1.jpg)
right
bottom
no-repeat
;
}
#display
{
display
:
list-item
!important
;
}
test/index.html
View file @
f3db084f
...
@@ -318,6 +318,7 @@ Z</textarea>
...
@@ -318,6 +318,7 @@ Z</textarea>
</div>
</div>
<div
id=
"fx-tests"
></div>
<div
id=
"fx-tests"
></div>
<span
id=
"display"
></span>
</div>
</div>
</div>
</div>
</dl>
</dl>
...
...
test/unit/css.js
View file @
f3db084f
...
@@ -970,4 +970,27 @@ asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Eleme
...
@@ -970,4 +970,27 @@ asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Eleme
window
.
setTimeout
(
start
,
1000
);
window
.
setTimeout
(
start
,
1000
);
});
});
asyncTest
(
"Make sure initialized display value for disconnected nodes is correct (#13310)"
,
4
,
function
()
{
var
display
=
jQuery
(
"#display"
).
css
(
"display"
),
div
=
jQuery
(
"<div/>"
);
equal
(
div
.
css
(
"display"
,
"inline"
).
hide
().
show
().
appendTo
(
"body"
).
css
(
"display"
),
"inline"
,
"Initialized display value has returned"
);
div
.
remove
();
div
.
css
(
"display"
,
"none"
).
hide
();
equal
(
jQuery
.
_data
(
div
[
0
],
"olddisplay"
),
undefined
,
"olddisplay is undefined after hiding a detached and hidden element"
);
div
.
remove
();
div
.
css
(
"display"
,
"inline-block"
).
hide
().
appendTo
(
"body"
).
fadeIn
(
function
()
{
equal
(
div
.
css
(
"display"
),
"inline-block"
,
"Initialized display value has returned"
);
div
.
remove
();
start
();
});
equal
(
jQuery
.
_data
(
jQuery
(
"#display"
).
css
(
"display"
,
"inline"
).
hide
()[
0
],
"olddisplay"
),
display
,
"display: * !Important value should used as initialized display"
);
jQuery
.
_removeData
(
jQuery
(
"#display"
)[
0
]
);
});
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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