[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_khtml/ecma=3A_Fix_toString_not_matching_?=
From:       Maks Orlovich <maksim () kde ! org>
Date:       2011-06-22 21:42:28
Message-ID: 20110622214228.B872FA60B0 () git ! kde ! org
[Download RAW message or body]

Git commit c8aaa79fd289c71ac4b1f93e8e27c834695a4140 by Maks Orlovich.
Committed on 22/06/2011 at 23:32.
Pushed by orlovich into branch 'master'.

Fix toString not matching the implicit stringifier for <a>.

Fixes problem with Flash for Linux download page. Ultimately, we probably
want DOMObject::toString gone and everything done via toString, but that'd
be cleaner in WebIDL land.

BUG: 273941

M  +3    -0    khtml/ecma/kjs_html.cpp     
M  +1    -1    khtml/ecma/kjs_html.h     

http://commits.kde.org/kdelibs/c8aaa79fd289c71ac4b1f93e8e27c834695a4140

diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index 826baa1..e3da95c 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -984,6 +984,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
 @end
 @begin HTMLAnchorElementProtoTable 3
   click		KJS::HTMLElement::AnchorClick		DontDelete|Function 0
+  toString      KJS::HTMLElement::AnchorToString        DontDelete|Function 0
 @end
 @begin HTMLImageElementTable 15
   name		KJS::HTMLElement::ImageName		DontDelete
@@ -2257,6 +2258,8 @@ JSValue* KJS::HTMLElementFunction::callAsFunction(ExecState \
*exec, JSObject *thi  if (id == KJS::HTMLElement::AnchorClick) {
         anchor.click();
         return jsUndefined();
+      } else if (id == KJS::HTMLElement::AnchorToString) {
+        return jsString(static_cast<KJS::HTMLElement *>(thisObj)->toString(exec));
       }
     }
     break;
diff --git a/khtml/ecma/kjs_html.h b/khtml/ecma/kjs_html.h
index 6cfcca8..0f3f544c 100644
--- a/khtml/ecma/kjs_html.h
+++ b/khtml/ecma/kjs_html.h
@@ -126,7 +126,7 @@ namespace KJS {
            AnchorAccessKey, AnchorCoords, AnchorHref, AnchorProtocol, AnchorHost,
            AnchorCharset, AnchorHrefLang, AnchorHostname, AnchorType,
            AnchorPort, AnchorPathName, AnchorHash, AnchorSearch, AnchorName,
-           AnchorRev, AnchorTarget, AnchorText, AnchorClick,
+           AnchorRev, AnchorTarget, AnchorText, AnchorClick, AnchorToString,
            ImageName, ImageAlign, ImageHspace, ImageVspace, ImageUseMap, ImageAlt,
            ImageLowSrc, ImageWidth, ImageIsMap, ImageBorder, ImageHeight,
            ImageLongDesc, ImageSrc, ImageX, ImageY, ImageComplete, ObjectHspace, \
ObjectHeight, ObjectAlign,


[prev in list] [next in list] [prev in thread] [next in thread]