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
f6a0bf68
Commit
f6a0bf68
authored
Dec 09, 2009
by
John Resig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for .data(Object), overwriting the existing data object. Fixes #4284.
parent
4e27f170
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
5 deletions
+27
-5
data.js
src/data.js
+12
-4
data.js
test/unit/data.js
+15
-1
No files found.
src/data.js
View file @
f6a0bf68
...
@@ -37,21 +37,24 @@ jQuery.extend({
...
@@ -37,21 +37,24 @@ jQuery.extend({
// Avoid generating a new cache unless none exists and we
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
// want to manipulate it.
if
(
cache
[
id
]
)
{
if
(
typeof
name
===
"object"
)
{
elem
[
expando
]
=
id
;
thisCache
=
cache
[
id
]
=
jQuery
.
extend
(
true
,
{},
name
);
}
else
if
(
cache
[
id
]
)
{
thisCache
=
cache
[
id
];
thisCache
=
cache
[
id
];
}
else
if
(
typeof
data
===
"undefined"
)
{
}
else
if
(
typeof
data
===
"undefined"
)
{
thisCache
=
emptyObject
;
thisCache
=
emptyObject
;
}
else
{
}
else
{
thisCache
=
cache
[
id
]
=
{};
thisCache
=
cache
[
id
]
=
{};
}
}
// Prevent overriding the named cache with undefined values
// Prevent overriding the named cache with undefined values
if
(
data
!==
undefined
)
{
if
(
data
!==
undefined
)
{
elem
[
expando
]
=
id
;
elem
[
expando
]
=
id
;
thisCache
[
name
]
=
data
;
thisCache
[
name
]
=
data
;
}
}
return
name
?
thisCache
[
name
]
:
thisCache
;
return
typeof
name
===
"string"
?
thisCache
[
name
]
:
thisCache
;
},
},
removeData
:
function
(
elem
,
name
)
{
removeData
:
function
(
elem
,
name
)
{
...
@@ -100,6 +103,11 @@ jQuery.fn.extend({
...
@@ -100,6 +103,11 @@ jQuery.fn.extend({
data
:
function
(
key
,
value
){
data
:
function
(
key
,
value
){
if
(
typeof
key
===
"undefined"
&&
this
.
length
)
{
if
(
typeof
key
===
"undefined"
&&
this
.
length
)
{
return
jQuery
.
data
(
this
[
0
]
);
return
jQuery
.
data
(
this
[
0
]
);
}
else
if
(
typeof
key
===
"object"
)
{
return
this
.
each
(
function
()
{
jQuery
.
data
(
this
,
key
);
});
}
}
var
parts
=
key
.
split
(
"."
);
var
parts
=
key
.
split
(
"."
);
...
...
test/unit/data.js
View file @
f6a0bf68
...
@@ -25,7 +25,7 @@ test("expando", function(){
...
@@ -25,7 +25,7 @@ test("expando", function(){
});
});
test
(
"jQuery.data"
,
function
()
{
test
(
"jQuery.data"
,
function
()
{
expect
(
6
);
expect
(
8
);
var
div
=
jQuery
(
"#foo"
)[
0
];
var
div
=
jQuery
(
"#foo"
)[
0
];
equals
(
jQuery
.
data
(
div
,
"test"
),
undefined
,
"Check for no data exists"
);
equals
(
jQuery
.
data
(
div
,
"test"
),
undefined
,
"Check for no data exists"
);
...
@@ -43,6 +43,10 @@ test("jQuery.data", function() {
...
@@ -43,6 +43,10 @@ test("jQuery.data", function() {
jQuery
.
data
(
div
,
"test"
,
null
);
jQuery
.
data
(
div
,
"test"
,
null
);
ok
(
jQuery
.
data
(
div
,
"test"
)
===
null
,
"Check for null data"
);
ok
(
jQuery
.
data
(
div
,
"test"
)
===
null
,
"Check for null data"
);
jQuery
.
data
(
div
,
{
"test"
:
"in"
,
"test2"
:
"in2"
});
equals
(
jQuery
.
data
(
div
,
"test"
),
"in"
,
"Verify setting an object in data."
);
equals
(
jQuery
.
data
(
div
,
"test2"
),
"in2"
,
"Verify setting an object in data."
);
});
});
test
(
".data()"
,
function
()
{
test
(
".data()"
,
function
()
{
...
@@ -114,6 +118,16 @@ test(".data(String) and .data(String, Object)", function() {
...
@@ -114,6 +118,16 @@ test(".data(String) and .data(String, Object)", function() {
$elem
.
removeData
();
$elem
.
removeData
();
});
});
test
(
".data(Object)"
,
function
()
{
expect
(
2
);
var
div
=
jQuery
(
"<div/>"
);
div
.
data
({
"test"
:
"in"
,
"test2"
:
"in2"
});
equals
(
div
.
data
(
"test"
),
"in"
,
"Verify setting an object in data."
);
equals
(
div
.
data
(
"test2"
),
"in2"
,
"Verify setting an object in data."
);
});
test
(
"jQuery.removeData"
,
function
()
{
test
(
"jQuery.removeData"
,
function
()
{
expect
(
1
);
expect
(
1
);
var
div
=
jQuery
(
"#foo"
)[
0
];
var
div
=
jQuery
(
"#foo"
)[
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