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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/xml
From:       Harri Porten <porten () kde ! org>
Date:       2010-02-13 22:28:14
Message-ID: 1266100094.598475.32492.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089753 by porten:

Applying Maksim's fix for .innerHTML value of <script> elements.

Fixes display of JIRA dashboard and
BUG: 203149



 M  +5 -1      dom_textimpl.cpp  


--- trunk/KDE/kdelibs/khtml/xml/dom_textimpl.cpp #1089752:1089753
@@ -568,7 +568,11 @@
 DOMString TextImpl::toString() const
 {
     // FIXME: substitute entity references as needed!
-    return escapeHTML( nodeValue() );
+    bool escape = true;
+    for (NodeImpl* node = parentNode(); node; node = node->parentNode())
+        if (node->id() == ID_SCRIPT)
+            escape = false;
+    return escape ? escapeHTML( nodeValue() ) : nodeValue();
 }
 
 DOMString TextImpl::toString(long long startOffset, long long endOffset) const
[prev in list] [next in list] [prev in thread] [next in thread]