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
0b9f0343
Commit
0b9f0343
authored
Sep 11, 2013
by
Michał Gołębiowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No ticket. Abstract conditional hook definition.
parent
4ded9be7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
40 deletions
+52
-40
css.js
src/css.js
+9
-20
addGetHookIf.js
src/css/addGetHookIf.js
+33
-0
offset.js
src/offset.js
+10
-20
No files found.
src/css.js
View file @
0b9f0343
...
...
@@ -14,6 +14,7 @@ var
curCSS
=
require
(
"./css/curCSS"
),
support
=
require
(
"./css/support"
),
defaultDisplay
=
require
(
"./css/defaultDisplay"
),
addGetHookIf
=
require
(
"./css/addGetHookIf"
),
data_priv
=
require
(
"./data/var/data_priv"
),
// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
...
...
@@ -369,28 +370,16 @@ jQuery.each([ "height", "width" ], function( i, name ) {
});
// Support: Android 2.3
jQuery
.
cssHooks
.
marginRight
=
{
get
:
function
(
elem
,
computed
)
{
if
(
support
.
reliableMarginRight
()
)
{
//
Hook not needed, remove it.
//
Since there are no other hooks for marginRight, remove the whole object.
delete
jQuery
.
cssHooks
.
marginRight
;
return
;
addGetHookIf
(
jQuery
.
cssHooks
.
marginRight
,
support
.
reliableMarginRight
,
function
(
elem
,
computed
)
{
if
(
computed
)
{
//
WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
//
Work around by temporarily setting element display to inline-block
return
jQuery
.
swap
(
elem
,
{
"display"
:
"inline-block"
},
curCSS
,
[
elem
,
"marginRight"
]
)
;
}
jQuery
.
cssHooks
.
marginRight
.
get
=
function
(
elem
,
computed
)
{
if
(
computed
)
{
// Support: Android 2.3
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
// Work around by temporarily setting element display to inline-block
return
jQuery
.
swap
(
elem
,
{
"display"
:
"inline-block"
},
curCSS
,
[
elem
,
"marginRight"
]
);
}
};
return
jQuery
.
cssHooks
.
marginRight
.
get
(
elem
,
computed
);
}
}
;
)
;
// These hooks are used by animate to expand properties
jQuery
.
each
({
...
...
src/css/addGetHookIf.js
0 → 100644
View file @
0b9f0343
define
(
function
()
{
function
addGetHookIf
(
hookVar
,
conditionFn
,
hookFn
)
{
// Define the hook, we'll check on the first run if it's really needed.
hookVar
=
{
get
:
function
()
{
var
condition
=
conditionFn
();
if
(
condition
==
null
)
{
// The test was not ready at this point; screw the hook this time
// but check again when needed next time.
return
;
}
if
(
condition
)
{
// Hook not needed (or it's not possible to use it due to missing dependency),
// remove it.
// Since there are no other hooks for marginRight, remove the whole object.
delete
hookVar
.
get
;
return
;
}
// Hook needed; redefine it so that the support test is not executed again.
hookVar
.
get
=
hookFn
;
return
hookVar
.
get
.
apply
(
hookVar
,
arguments
);
}
};
}
return
addGetHookIf
;
});
src/offset.js
View file @
0b9f0343
...
...
@@ -6,6 +6,7 @@ var
access
=
require
(
"./core/access"
),
rnumnonpx
=
require
(
"./css/var/rnumnonpx"
),
curCSS
=
require
(
"./css/curCSS"
),
addGetHookIf
=
require
(
"./css/addGetHookIf"
),
support
=
require
(
"./css/support"
),
docElem
=
window
.
document
.
documentElement
;
...
...
@@ -186,28 +187,17 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me
// getComputedStyle returns percent when specified for top/left/bottom/right
// rather than make the css module depend on the offset module, we just check for it here
jQuery
.
each
(
[
"top"
,
"left"
],
function
(
i
,
prop
)
{
jQuery
.
cssHooks
[
prop
]
=
{
get
:
function
(
elem
,
computed
)
{
if
(
support
.
pixelPosition
()
)
{
// Hook not needed, remove it.
// Since there are no other hooks for prop, remove the whole object.
delete
jQuery
.
cssHooks
[
prop
];
return
;
addGetHookIf
(
jQuery
.
cssHooks
[
prop
],
support
.
pixelPosition
,
function
(
elem
,
computed
)
{
if
(
computed
)
{
computed
=
curCSS
(
elem
,
prop
);
// if curCSS returns percentage, fallback to offset
return
rnumnonpx
.
test
(
computed
)
?
jQuery
(
elem
).
position
()[
prop
]
+
"px"
:
computed
;
}
jQuery
.
cssHooks
[
prop
].
get
=
function
(
i
,
prop
)
{
if
(
computed
)
{
computed
=
curCSS
(
elem
,
prop
);
// if curCSS returns percentage, fallback to offset
return
rnumnonpx
.
test
(
computed
)
?
jQuery
(
elem
).
position
()[
prop
]
+
"px"
:
computed
;
}
};
return
jQuery
.
cssHooks
[
prop
].
get
(
i
,
prop
);
}
}
;
)
;
});
return
jQuery
;
...
...
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