webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp
branchRCL_3
changeset 37 ac77f89b1d9e
parent 36 c711bdda59f4
child 38 4917f9bf7995
equal deleted inserted replaced
36:c711bdda59f4 37:ac77f89b1d9e
   383                 if (frame->selectionController()->start() != startPos &&
   383                 if (frame->selectionController()->start() != startPos &&
   384                     frame->selectionController()->end() != endPos) {
   384                     frame->selectionController()->end() != endPos) {
   385                     event->setDefaultHandled();
   385                     event->setDefaultHandled();
   386                 }
   386                 }
   387                 else {
   387                 else {
   388                     m_shouldEndEditing = !m_webView->fepTextEditor()->IsTextAreaFocused();
   388                     m_shouldEndEditing = !(m_webView->fepTextEditor()->IsTextAreaFocused() || m_webView->fepTextEditor()->IsInputElementFocused());
   389                 }
   389                 }
   390                 break;
   390                 break;
   391 
   391 
   392             case EKeyRightArrow:
   392             case EKeyRightArrow:
   393                 if (select)//If shift is pressed then highlight the selection
   393                 if (select)//If shift is pressed then highlight the selection
   406                 if (frame->selectionController()->start() != startPos &&
   406                 if (frame->selectionController()->start() != startPos &&
   407                     frame->selectionController()->end() != endPos) {
   407                     frame->selectionController()->end() != endPos) {
   408                     event->setDefaultHandled();
   408                     event->setDefaultHandled();
   409                 }
   409                 }
   410                 else {
   410                 else {
   411                     m_shouldEndEditing = !m_webView->fepTextEditor()->IsTextAreaFocused();
   411                     m_shouldEndEditing = !(m_webView->fepTextEditor()->IsTextAreaFocused() || m_webView->fepTextEditor()->IsInputElementFocused());
   412                 }
   412                 }
   413                 break;
   413                 break;
   414 
   414 
   415             case EKeyUpArrow:
   415             case EKeyUpArrow:
   416                 if (select) { //If shift is pressed then highlight the selection
   416                 if (select) { //If shift is pressed then highlight the selection
   557 //-----------------------------------------------------------------------------
   557 //-----------------------------------------------------------------------------
   558 // WebEditorClient::doTextFieldCommandFromEvent
   558 // WebEditorClient::doTextFieldCommandFromEvent
   559 //-----------------------------------------------------------------------------
   559 //-----------------------------------------------------------------------------
   560 bool WebEditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
   560 bool WebEditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
   561 {
   561 {
   562     /*
   562      
   563      * Check here from WAP css property. Returning true will cause
   563    notImplemented();
   564      * HTMLInputElement::defaultEventHandler(Event* evt) stop handling
   564    return false;
   565      * keyboard event end set it as default handled.
       
   566      */
       
   567     return !m_webView->fepTextEditor()->validateTextFormat();    
       
   568 }
   565 }
   569 
   566 
   570 //-----------------------------------------------------------------------------
   567 //-----------------------------------------------------------------------------
   571 // WebEditorClient::textWillBeDeletedInTextField
   568 // WebEditorClient::textWillBeDeletedInTextField
   572 //-----------------------------------------------------------------------------
   569 //-----------------------------------------------------------------------------