--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -451,26 +451,6 @@
                 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...
@@ -563,8 +543,12 @@
 //-----------------------------------------------------------------------------
 bool WebEditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
 {
-    notImplemented();
-    return false;
+    /*
+     * 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();    
 }
 
 //-----------------------------------------------------------------------------
@@ -691,3 +675,12 @@
     }
 }
 
+void WebEditorClient::preFocusChange(Node* oldNode, Node* newNode)
+    {      
+    TBool contentEditable = m_webView->page()->focusController()->focusedOrMainFrame()->selectionController()->isContentEditable();    
+    if ( oldNode && newNode && contentEditable ) {       
+        m_webView->fepTextEditor()->FocusChanging();
+       }
+    }
+
+