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
f5d4bf89
Commit
f5d4bf89
authored
Dec 22, 2010
by
Colin Snover
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update jQuery.hasData to always return a boolean, with unit tests.
parent
445fdf72
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
13 deletions
+22
-13
data.js
src/data.js
+1
-1
data.js
test/unit/data.js
+21
-12
No files found.
src/data.js
View file @
f5d4bf89
...
@@ -22,7 +22,7 @@ jQuery.extend({
...
@@ -22,7 +22,7 @@ jQuery.extend({
},
},
hasData
:
function
(
elem
)
{
hasData
:
function
(
elem
)
{
return
!
elem
.
nodeType
||
(
elem
[
jQuery
.
expando
]
&&
!
jQuery
.
isEmptyObject
(
jQuery
.
cache
[
elem
[
jQuery
.
expando
]
]));
return
!
elem
.
nodeType
||
(
!!
elem
[
jQuery
.
expando
]
&&
!
jQuery
.
isEmptyObject
(
jQuery
.
cache
[
elem
[
jQuery
.
expando
]
]));
},
},
data
:
function
(
elem
,
name
,
data
)
{
data
:
function
(
elem
,
name
,
data
)
{
...
...
test/unit/data.js
View file @
f5d4bf89
...
@@ -78,6 +78,15 @@ test("jQuery.data", function() {
...
@@ -78,6 +78,15 @@ test("jQuery.data", function() {
ok
(
jQuery
.
data
(
window
,
"BAD"
),
"Make sure that the value was set."
);
ok
(
jQuery
.
data
(
window
,
"BAD"
),
"Make sure that the value was set."
);
});
});
test
(
"jQuery.hasData"
,
function
()
{
var
div
=
document
.
createElement
(
"div"
);
equals
(
jQuery
.
hasData
(
div
),
false
,
"No data exists"
);
jQuery
.
data
(
div
,
"foo"
,
"bar"
);
equals
(
jQuery
.
hasData
(
div
),
true
,
"Data exists"
);
jQuery
.
removeData
(
div
,
"foo"
);
equals
(
jQuery
.
hasData
(
div
),
false
,
"Data was removed"
);
});
test
(
".data()"
,
function
()
{
test
(
".data()"
,
function
()
{
expect
(
5
);
expect
(
5
);
...
@@ -180,7 +189,7 @@ test(".data(String) and .data(String, Object)", function() {
...
@@ -180,7 +189,7 @@ test(".data(String) and .data(String, Object)", function() {
equals
(
$elem
.
data
(
'emptyString'
,
''
).
data
(
'emptyString'
),
''
,
"Empty strings are preserved"
);
equals
(
$elem
.
data
(
'emptyString'
,
''
).
data
(
'emptyString'
),
''
,
"Empty strings are preserved"
);
equals
(
$elem
.
data
(
'false'
,
false
).
data
(
'false'
),
false
,
"false's are preserved"
);
equals
(
$elem
.
data
(
'false'
,
false
).
data
(
'false'
),
false
,
"false's are preserved"
);
equals
(
$elem
.
data
(
'exists'
),
true
,
"Existing data is returned"
);
equals
(
$elem
.
data
(
'exists'
),
true
,
"Existing data is returned"
);
// Clean up
// Clean up
$elem
.
removeData
();
$elem
.
removeData
();
ok
(
jQuery
.
isEmptyObject
(
$elem
[
0
]
),
"removeData clears the object"
);
ok
(
jQuery
.
isEmptyObject
(
$elem
[
0
]
),
"removeData clears the object"
);
...
@@ -191,7 +200,7 @@ test("data-* attributes", function() {
...
@@ -191,7 +200,7 @@ test("data-* attributes", function() {
var
div
=
jQuery
(
"<div>"
),
var
div
=
jQuery
(
"<div>"
),
child
=
jQuery
(
"<div data-myobj='old data' data-ignored=
\"
DOM
\"
data-other='test'></div>"
),
child
=
jQuery
(
"<div data-myobj='old data' data-ignored=
\"
DOM
\"
data-other='test'></div>"
),
dummy
=
jQuery
(
"<div data-myobj='old data' data-ignored=
\"
DOM
\"
data-other='test'></div>"
);
dummy
=
jQuery
(
"<div data-myobj='old data' data-ignored=
\"
DOM
\"
data-other='test'></div>"
);
equals
(
div
.
data
(
"attr"
),
undefined
,
"Check for non-existing data-attr attribute"
);
equals
(
div
.
data
(
"attr"
),
undefined
,
"Check for non-existing data-attr attribute"
);
div
.
attr
(
"data-attr"
,
"exists"
);
div
.
attr
(
"data-attr"
,
"exists"
);
...
@@ -199,10 +208,10 @@ test("data-* attributes", function() {
...
@@ -199,10 +208,10 @@ test("data-* attributes", function() {
div
.
attr
(
"data-attr"
,
"exists2"
);
div
.
attr
(
"data-attr"
,
"exists2"
);
equals
(
div
.
data
(
"attr"
),
"exists"
,
"Check that updates to data- don't update .data()"
);
equals
(
div
.
data
(
"attr"
),
"exists"
,
"Check that updates to data- don't update .data()"
);
div
.
data
(
"attr"
,
"internal"
).
attr
(
"data-attr"
,
"external"
);
div
.
data
(
"attr"
,
"internal"
).
attr
(
"data-attr"
,
"external"
);
equals
(
div
.
data
(
"attr"
),
"internal"
,
"Check for .data('attr') precedence (internal > external data-* attribute)"
);
equals
(
div
.
data
(
"attr"
),
"internal"
,
"Check for .data('attr') precedence (internal > external data-* attribute)"
);
child
.
appendTo
(
'#main'
);
child
.
appendTo
(
'#main'
);
equals
(
child
.
data
(
"myobj"
),
"old data"
,
"Value accessed from data-* attribute"
);
equals
(
child
.
data
(
"myobj"
),
"old data"
,
"Value accessed from data-* attribute"
);
...
@@ -249,7 +258,7 @@ test("data-* attributes", function() {
...
@@ -249,7 +258,7 @@ test("data-* attributes", function() {
.
attr
(
"data-space"
,
" "
)
.
attr
(
"data-space"
,
" "
)
.
attr
(
"data-null"
,
"null"
)
.
attr
(
"data-null"
,
"null"
)
.
attr
(
"data-string"
,
"test"
);
.
attr
(
"data-string"
,
"test"
);
strictEqual
(
child
.
data
(
'true'
),
true
,
"Primitive true read from attribute"
);
strictEqual
(
child
.
data
(
'true'
),
true
,
"Primitive true read from attribute"
);
strictEqual
(
child
.
data
(
'false'
),
false
,
"Primitive false read from attribute"
);
strictEqual
(
child
.
data
(
'false'
),
false
,
"Primitive false read from attribute"
);
strictEqual
(
child
.
data
(
'five'
),
5
,
"Primitive number read from attribute"
);
strictEqual
(
child
.
data
(
'five'
),
5
,
"Primitive number read from attribute"
);
...
@@ -265,7 +274,7 @@ test("data-* attributes", function() {
...
@@ -265,7 +274,7 @@ test("data-* attributes", function() {
strictEqual
(
child
.
data
(
'string'
),
"test"
,
"Typical string read from attribute"
);
strictEqual
(
child
.
data
(
'string'
),
"test"
,
"Typical string read from attribute"
);
child
.
remove
();
child
.
remove
();
// tests from metadata plugin
// tests from metadata plugin
function
testData
(
index
,
elem
)
{
function
testData
(
index
,
elem
)
{
switch
(
index
)
{
switch
(
index
)
{
...
@@ -289,10 +298,10 @@ test("data-* attributes", function() {
...
@@ -289,10 +298,10 @@ test("data-* attributes", function() {
ok
(
false
,
[
"Assertion failed on index "
,
index
,
", with data "
,
data
].
join
(
''
));
ok
(
false
,
[
"Assertion failed on index "
,
index
,
", with data "
,
data
].
join
(
''
));
}
}
}
}
var
metadata
=
'<ol><li class="test test2" data-foo="bar" data-bar="baz" data-arr="[1,2]">Some stuff</li><li class="test test2" data-test="bar" data-bar="baz">Some stuff</li><li class="test test2" data-zoooo="bar" data-bar=
\'
{"test":"baz"}
\'
>Some stuff</li><li class="test test2" data-number=true data-stuff="[2,8]">Some stuff</li></ol>'
,
var
metadata
=
'<ol><li class="test test2" data-foo="bar" data-bar="baz" data-arr="[1,2]">Some stuff</li><li class="test test2" data-test="bar" data-bar="baz">Some stuff</li><li class="test test2" data-zoooo="bar" data-bar=
\'
{"test":"baz"}
\'
>Some stuff</li><li class="test test2" data-number=true data-stuff="[2,8]">Some stuff</li></ol>'
,
elem
=
jQuery
(
metadata
).
appendTo
(
'#main'
);
elem
=
jQuery
(
metadata
).
appendTo
(
'#main'
);
elem
.
find
(
"li"
).
each
(
testData
);
elem
.
find
(
"li"
).
each
(
testData
);
elem
.
remove
();
elem
.
remove
();
});
});
...
@@ -305,12 +314,12 @@ test(".data(Object)", function() {
...
@@ -305,12 +314,12 @@ test(".data(Object)", function() {
div
.
data
({
"test"
:
"in"
,
"test2"
:
"in2"
});
div
.
data
({
"test"
:
"in"
,
"test2"
:
"in2"
});
equals
(
div
.
data
(
"test"
),
"in"
,
"Verify setting an object in data"
);
equals
(
div
.
data
(
"test"
),
"in"
,
"Verify setting an object in data"
);
equals
(
div
.
data
(
"test2"
),
"in2"
,
"Verify setting an object in data"
);
equals
(
div
.
data
(
"test2"
),
"in2"
,
"Verify setting an object in data"
);
var
obj
=
{
test
:
"unset"
},
var
obj
=
{
test
:
"unset"
},
jqobj
=
jQuery
(
obj
);
jqobj
=
jQuery
(
obj
);
jqobj
.
data
({
"test"
:
"in"
,
"test2"
:
"in2"
});
jqobj
.
data
({
"test"
:
"in"
,
"test2"
:
"in2"
});
equals
(
obj
.
test
,
"in"
,
"Verify setting an object on an object extends the object"
);
equals
(
obj
.
test
,
"in"
,
"Verify setting an object on an object extends the object"
);
equals
(
obj
.
test2
,
"in2"
,
"Verify setting an object on an object extends the object"
);
equals
(
obj
.
test2
,
"in2"
,
"Verify setting an object on an object extends the object"
);
});
});
test
(
"jQuery.removeData"
,
function
()
{
test
(
"jQuery.removeData"
,
function
()
{
...
@@ -324,13 +333,13 @@ test("jQuery.removeData", function() {
...
@@ -324,13 +333,13 @@ test("jQuery.removeData", function() {
jQuery
.
removeData
(
div
);
jQuery
.
removeData
(
div
);
ok
(
!
jQuery
.
data
(
div
,
"test2"
),
"Make sure that the data property no longer exists."
);
ok
(
!
jQuery
.
data
(
div
,
"test2"
),
"Make sure that the data property no longer exists."
);
ok
(
!
div
[
jQuery
.
expando
],
"Make sure the expando no longer exists, as well."
);
ok
(
!
div
[
jQuery
.
expando
],
"Make sure the expando no longer exists, as well."
);
var
obj
=
{};
var
obj
=
{};
jQuery
.
data
(
obj
,
"test"
,
"testing"
);
jQuery
.
data
(
obj
,
"test"
,
"testing"
);
equals
(
obj
.
test
,
"testing"
,
"verify data on plain object"
);
equals
(
obj
.
test
,
"testing"
,
"verify data on plain object"
);
jQuery
.
removeData
(
obj
,
"test"
);
jQuery
.
removeData
(
obj
,
"test"
);
equals
(
jQuery
.
data
(
obj
,
"test"
),
undefined
,
"Check removal of data on plain object"
);
equals
(
jQuery
.
data
(
obj
,
"test"
),
undefined
,
"Check removal of data on plain object"
);
equals
(
obj
.
test
,
undefined
,
"Check removal of data directly from plain object"
);
equals
(
obj
.
test
,
undefined
,
"Check removal of data directly from plain object"
);
jQuery
.
data
(
window
,
"BAD"
,
true
);
jQuery
.
data
(
window
,
"BAD"
,
true
);
jQuery
.
removeData
(
window
,
"BAD"
);
jQuery
.
removeData
(
window
,
"BAD"
);
...
...
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