diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 03:46:01 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 03:46:01 +0000 |
| commit | 865f314dd5ed55508f45a32973b709b79a541e36 (patch) | |
| tree | dc1a3a884bb2fc10a89a3c46313897d22c5771eb /khtml/html | |
| parent | ce4a32fe52ef09d8f5ff1dd22c001110902b60a2 (diff) | |
| download | tdelibs-865f314dd5ed55508f45a32973b709b79a541e36.tar.gz tdelibs-865f314dd5ed55508f45a32973b709b79a541e36.zip | |
kdelibs update to Trinity v3.5.11
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/html')
| -rw-r--r-- | khtml/html/html_elementimpl.cpp | 7 | ||||
| -rw-r--r-- | khtml/html/html_formimpl.cpp | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index 9c0e58335..cd47ea728 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -565,6 +565,13 @@ DocumentFragment HTMLElementImpl::createContextualFragment( const DOMString &htm void HTMLElementImpl::setInnerHTML( const DOMString &html, int &exceptioncode ) { + // Works line innerText in Gecko + // ### test if needed for ID_SCRIPT as well. + if ( id() == ID_STYLE ) { + setInnerText(html, exceptioncode); + return; + } + DocumentFragment fragment = createContextualFragment( html ); if ( fragment.isNull() ) { exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR; diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index e59098499..1abaa606a 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -614,17 +614,7 @@ void HTMLFormElementImpl::submit( ) bool checkboxResult = false; const int savePassword = KMessageBox::createKMessageBox(dialog, QMessageBox::Information, - formUrl.host().isEmpty() ? // e.g. local file - i18n("Konqueror has the ability to store the password " - "in an encrypted wallet. When the wallet is unlocked, it " - "can then automatically restore the login information " - "next time you submit this form. Do you want to store " - "the information now?") : - i18n("Konqueror has the ability to store the password " - "in an encrypted wallet. When the wallet is unlocked, it " - "can then automatically restore the login information " - "next time you visit %1. Do you want to store " - "the information now?").arg(formUrl.host()), + i18n("Store passwords on this page?"), QStringList(), QString::null, &checkboxResult, KMessageBox::Notify); if ( savePassword == KDialogBase::Yes ) { |