Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 415026 IME is always enabled in a page has contentEditable=true r+sr=roc, a1.9=mtschrep

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@245235 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
masayuki%d-toybox.com
2008-02-08 17:58:10 +00:00
parent b1077ad375
commit aa08b61913
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/content/base/public/nsIContent.h
View File

@@ -520,7 +520,17 @@ public:
};
virtual PRUint32 GetDesiredIMEState()
{
return IME_STATUS_DISABLE;
if (!HasFlag(NODE_IS_EDITABLE))
return IME_STATUS_DISABLE;
nsIContent *editableAncestor = nsnull;
for (nsIContent* parent = GetParent();
parent && parent->HasFlag(NODE_IS_EDITABLE);
parent = parent->GetParent())
editableAncestor = parent;
// This is in another editable content, use the result of it.
if (editableAncestor)
return editableAncestor->GetDesiredIMEState();
return IME_STATUS_ENABLE;
}
/**

16
mozilla/content/events/src/nsIMEStateManager.cpp
View File

@@ -237,22 +237,10 @@ nsIMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
return nsIContent::IME_STATUS_DISABLE;
}
if (sInstalledMenuKeyboardListener)
if (sInstalledMenuKeyboardListener || !aContent)
return nsIContent::IME_STATUS_DISABLE;
PRBool isEditable = PR_FALSE;
nsCOMPtr<nsISupports> container = aPresContext->GetContainer();
nsCOMPtr<nsIEditorDocShell> editorDocShell(do_QueryInterface(container));
if (editorDocShell)
editorDocShell->GetEditable(&isEditable);
if (isEditable)
return nsIContent::IME_STATUS_ENABLE;
if (aContent)
return aContent->GetDesiredIMEState();
return nsIContent::IME_STATUS_DISABLE;
return aContent->GetDesiredIMEState();
}
void