Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Unmaintained
KDE Libraries
Commits
6c195c5e
Commit
6c195c5e
authored
Nov 05, 2014
by
Andrea Iacovitti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return resolved url for frame src.
parent
9c49a28a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
khtml/dom/html_base.cpp
khtml/dom/html_base.cpp
+2
-1
khtml/ecma/kjs_html.cpp
khtml/ecma/kjs_html.cpp
+1
-1
No files found.
khtml/dom/html_base.cpp
View file @
6c195c5e
...
...
@@ -231,7 +231,8 @@ void HTMLFrameElement::setScrolling( const DOMString &value )
DOMString
HTMLFrameElement
::
src
()
const
{
if
(
!
impl
)
return
DOMString
();
return
((
ElementImpl
*
)
impl
)
->
getAttribute
(
ATTR_SRC
);
const
QString
s
=
((
ElementImpl
*
)
impl
)
->
getAttribute
(
ATTR_SRC
).
string
().
trimmed
();
return
!
s
.
isNull
()
?
impl
->
document
()
->
completeURL
(
s
)
:
DOMString
();
}
void
HTMLFrameElement
::
setSrc
(
const
DOMString
&
value
)
...
...
khtml/ecma/kjs_html.cpp
View file @
6c195c5e
...
...
@@ -1551,7 +1551,7 @@ const KJS::HTMLElement::BoundPropInfo KJS::HTMLElement::bpTable[] = {
{
ID_FRAME
,
FrameName
,
T_String
,
ATTR_NAME
},
{
ID_FRAME
,
FrameNoResize
,
T_Bool
,
ATTR_NORESIZE
},
{
ID_FRAME
,
FrameScrolling
,
T_String
,
ATTR_SCROLLING
},
{
ID_FRAME
,
FrameSrc
,
T_
String
,
ATTR_SRC
},
//### not URL?
{
ID_FRAME
,
FrameSrc
,
T_
URL
,
ATTR_SRC
},
{
ID_FRAME
,
FrameLocation
,
BoundPropType
(
T_String
|
T_ReadOnly
),
ATTR_SRC
},
{
ID_IFRAME
,
IFrameFrameBorder
,
T_String
,
ATTR_FRAMEBORDER
},
{
ID_IFRAME
,
IFrameLongDesc
,
T_String
,
ATTR_LONGDESC
},
...
...
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