diff -r d39add9822e2 -r 5bfc169077b2 webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp --- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Tue Feb 02 00:56:45 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Fri Mar 19 09:52:28 2010 +0200 @@ -451,6 +451,26 @@ break; case EKeyF18: + if (magnify) + { + switch (kevent->symbianEvent().iScanCode) + { + case EEikCmdEditCut: + m_webView->fepTextEditor()->CcpuCutL(); + frame->editor()->deleteWithDirection(SelectionController::BACKWARD, + CharacterGranularity, false, true); + m_webView->fepTextEditor()->HandleUpdateCursor(); + break; + case EEikCmdEditCopy: + m_webView->fepTextEditor()->CcpuCopyL(); + break; + case EEikCmdEditPaste: + m_webView->fepTextEditor()->CcpuPasteL(); + break; + default: + break; + } + } break; // All of the diagonal KeyEvents are allowed to flow through the "default" case... @@ -506,11 +526,9 @@ //----------------------------------------------------------------------------- // WebEditorClient::handleInputMethodKeypress //----------------------------------------------------------------------------- -void WebEditorClient::handleInputMethodKeypress(KeyboardEvent* event) +void WebEditorClient::handleInputMethodKeypress(KeyboardEvent*) { - const PlatformKeyboardEvent* kevent = event->keyEvent(); - if(kevent->isKeyDown()) - handleKeypress(event); + notImplemented(); } //----------------------------------------------------------------------------- @@ -545,12 +563,8 @@ //----------------------------------------------------------------------------- bool WebEditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*) { - /* - * Check here from WAP css property. Returning true will cause - * HTMLInputElement::defaultEventHandler(Event* evt) stop handling - * keyboard event end set it as default handled. - */ - return !m_webView->fepTextEditor()->validateTextFormat(); + notImplemented(); + return false; } //----------------------------------------------------------------------------- @@ -677,12 +691,3 @@ } } -void WebEditorClient::preFocusChange(Node* oldNode, Node* newNode) - { - TBool contentEditable = m_webView->page()->focusController()->focusedOrMainFrame()->selectionController()->isContentEditable(); - if ( oldNode && newNode && contentEditable ) { - m_webView->fepTextEditor()->FocusChanging(); - } - } - -