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
3ad8dd24
Commit
3ad8dd24
authored
Feb 14, 2011
by
jeresig
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix8033' of
https://github.com/SlexAxton/jquery
into SlexAxton-fix8033
parents
65977334
c50b7437
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
14 deletions
+15
-14
core.js
src/core.js
+1
-1
outro.js
src/outro.js
+1
-0
absolute.html
test/data/offset/absolute.html
+1
-1
body.html
test/data/offset/body.html
+2
-2
fixed.html
test/data/offset/fixed.html
+2
-2
relative.html
test/data/offset/relative.html
+2
-2
scroll.html
test/data/offset/scroll.html
+2
-2
static.html
test/data/offset/static.html
+2
-2
table.html
test/data/offset/table.html
+2
-2
No files found.
src/core.js
View file @
3ad8dd24
...
@@ -1076,6 +1076,6 @@ function doScrollCheck() {
...
@@ -1076,6 +1076,6 @@ function doScrollCheck() {
}
}
// Expose jQuery to the global object
// Expose jQuery to the global object
return
(
window
.
jQuery
=
window
.
$
=
jQuery
)
;
return
jQuery
;
})();
})();
src/outro.js
View file @
3ad8dd24
window
.
jQuery
=
window
.
$
=
jQuery
;
})(
window
);
})(
window
);
test/data/offset/absolute.html
View file @
3ad8dd24
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
src=
"../../../dist/jquery.js"
></script>
<script
type=
"text/javascript"
src=
"../../../dist/jquery.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
$
(
'.absolute'
).
click
(
function
()
{
$
(
'.absolute'
).
click
(
function
()
{
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
var
pos
=
$
(
this
).
position
();
var
pos
=
$
(
this
).
position
();
...
...
test/data/offset/body.html
View file @
3ad8dd24
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
$
(
'body'
).
click
(
function
()
{
$
(
'body'
).
click
(
function
()
{
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
return
false
;
return
false
;
...
...
test/data/offset/fixed.html
View file @
3ad8dd24
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
window
.
scrollTo
(
1000
,
1000
);
window
.
scrollTo
(
1000
,
1000
);
$
(
'.fixed'
).
click
(
function
()
{
$
(
'.fixed'
).
click
(
function
()
{
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
...
...
test/data/offset/relative.html
View file @
3ad8dd24
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
$
(
'.relative'
).
click
(
function
()
{
$
(
'.relative'
).
click
(
function
()
{
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
var
pos
=
$
(
this
).
position
();
var
pos
=
$
(
this
).
position
();
...
...
test/data/offset/scroll.html
View file @
3ad8dd24
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
window
.
scrollTo
(
1000
,
1000
);
window
.
scrollTo
(
1000
,
1000
);
$
(
'#scroll-1'
)[
0
].
scrollLeft
=
5
;
$
(
'#scroll-1'
)[
0
].
scrollLeft
=
5
;
$
(
'#scroll-1'
)[
0
].
scrollTop
=
5
;
$
(
'#scroll-1'
)[
0
].
scrollTop
=
5
;
...
...
test/data/offset/static.html
View file @
3ad8dd24
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
$
(
'.static'
).
click
(
function
()
{
$
(
'.static'
).
click
(
function
()
{
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
var
pos
=
$
(
this
).
position
();
var
pos
=
$
(
this
).
position
();
...
...
test/data/offset/table.html
View file @
3ad8dd24
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/css.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
src=
"../../../src/offset.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
>
<script
type=
"text/javascript"
charset=
"utf-8"
>
$
(
function
(
)
{
jQuery
(
function
(
$
)
{
$
(
'table, th, td'
).
click
(
function
()
{
$
(
'table, th, td'
).
click
(
function
()
{
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
$
(
'#marker'
).
css
(
$
(
this
).
offset
()
);
return
false
;
return
false
;
...
...
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