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
396dd212
Commit
396dd212
authored
Aug 23, 2010
by
John Resig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing getting/setting classes and makeArray(RegExp) for Blackberry 4.7. Fixes #6930, #6931.
parent
6f031c10
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
17 deletions
+32
-17
attributes.js
src/attributes.js
+2
-1
core.js
src/core.js
+2
-1
core.js
test/unit/core.js
+28
-15
No files found.
src/attributes.js
View file @
396dd212
...
@@ -278,7 +278,8 @@ jQuery.extend({
...
@@ -278,7 +278,8 @@ jQuery.extend({
}
}
// If applicable, access the attribute via the DOM 0 way
// If applicable, access the attribute via the DOM 0 way
if
(
name
in
elem
&&
notxml
&&
!
special
)
{
// 'in' checks fail in Blackberry 4.7 #6931
if
(
(
name
in
elem
||
elem
[
name
]
!==
undefined
)
&&
notxml
&&
!
special
)
{
if
(
set
)
{
if
(
set
)
{
// We can't allow the type property to be changed (since it causes problems in IE)
// We can't allow the type property to be changed (since it causes problems in IE)
if
(
name
===
"type"
&&
rtype
.
test
(
elem
.
nodeName
)
&&
elem
.
parentNode
)
{
if
(
name
===
"type"
&&
rtype
.
test
(
elem
.
nodeName
)
&&
elem
.
parentNode
)
{
...
...
src/core.js
View file @
396dd212
...
@@ -594,7 +594,8 @@ jQuery.extend({
...
@@ -594,7 +594,8 @@ jQuery.extend({
// The window, strings (and functions) also have 'length'
// The window, strings (and functions) also have 'length'
// The extra typeof function check is to prevent crashes
// The extra typeof function check is to prevent crashes
// in Safari 2 (See: #3039)
// in Safari 2 (See: #3039)
if
(
array
.
length
==
null
||
typeof
array
===
"string"
||
jQuery
.
isFunction
(
array
)
||
(
typeof
array
!==
"function"
&&
array
.
setInterval
)
)
{
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
if
(
array
.
length
==
null
||
typeof
array
===
"string"
||
jQuery
.
isFunction
(
array
)
||
typeof
array
===
"function"
||
typeof
array
.
setInterval
!==
"undefined"
)
{
push
.
call
(
ret
,
array
);
push
.
call
(
ret
,
array
);
}
else
{
}
else
{
jQuery
.
merge
(
ret
,
array
);
jQuery
.
merge
(
ret
,
array
);
...
...
test/unit/core.js
View file @
396dd212
...
@@ -258,21 +258,28 @@ test("isPlainObject", function() {
...
@@ -258,21 +258,28 @@ test("isPlainObject", function() {
// Window
// Window
ok
(
!
jQuery
.
isPlainObject
(
window
),
"window"
);
ok
(
!
jQuery
.
isPlainObject
(
window
),
"window"
);
var
iframe
=
document
.
createElement
(
"iframe"
);
document
.
body
.
appendChild
(
iframe
);
window
.
iframeDone
=
function
(
otherObject
){
try
{
// Objects from other windows should be matched
var
iframe
=
document
.
createElement
(
"iframe"
);
ok
(
jQuery
.
isPlainObject
(
new
otherObject
),
"new otherObject"
);
document
.
body
.
appendChild
(
iframe
);
window
.
iframeDone
=
function
(
otherObject
){
// Objects from other windows should be matched
ok
(
jQuery
.
isPlainObject
(
new
otherObject
),
"new otherObject"
);
document
.
body
.
removeChild
(
iframe
);
start
();
};
var
doc
=
iframe
.
contentDocument
||
iframe
.
contentWindow
.
document
;
doc
.
open
();
doc
.
write
(
"<body onload='window.parent.iframeDone(Object);'>"
);
doc
.
close
();
}
catch
(
e
)
{
document
.
body
.
removeChild
(
iframe
);
document
.
body
.
removeChild
(
iframe
);
ok
(
true
,
"new otherObject - iframes not supported"
);
start
();
start
();
};
}
var
doc
=
iframe
.
contentDocument
||
iframe
.
contentWindow
.
document
;
doc
.
open
();
doc
.
write
(
"<body onload='window.parent.iframeDone(Object);'>"
);
doc
.
close
();
});
});
test
(
"isFunction"
,
function
()
{
test
(
"isFunction"
,
function
()
{
...
@@ -374,9 +381,15 @@ test("isXMLDoc - HTML", function() {
...
@@ -374,9 +381,15 @@ test("isXMLDoc - HTML", function() {
try
{
try
{
var
body
=
jQuery
(
iframe
).
contents
()[
0
];
var
body
=
jQuery
(
iframe
).
contents
()[
0
];
ok
(
!
jQuery
.
isXMLDoc
(
body
),
"Iframe body element"
);
}
catch
(
e
){
try
{
ok
(
false
,
"Iframe body element exception"
);
ok
(
!
jQuery
.
isXMLDoc
(
body
),
"Iframe body element"
);
}
catch
(
e
)
{
ok
(
false
,
"Iframe body element exception"
);
}
}
catch
(
e
)
{
ok
(
true
,
"Iframe body element - iframe not working correctly"
);
}
}
document
.
body
.
removeChild
(
iframe
);
document
.
body
.
removeChild
(
iframe
);
...
...
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