зеркало из https://github.com/mozilla/gecko-dev.git
Bug 434998 - Enable the usage of the execCommand API for <xul:editor> elements; r=roc
This commit is contained in:
Ehsan Akhgari
Родитель
62312843c5
Коммит
a10316377d
|
|
@ -374,6 +374,11 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow)
|
||||||
document->FlushPendingNotifications(Flush_Frames);
|
document->FlushPendingNotifications(Flush_Frames);
|
||||||
if (mMakeWholeDocumentEditable) {
|
if (mMakeWholeDocumentEditable) {
|
||||||
document->SetEditableFlag(PR_TRUE);
|
document->SetEditableFlag(PR_TRUE);
|
||||||
|
nsCOMPtr<nsIHTMLDocument> htmlDocument = do_QueryInterface(document);
|
||||||
|
if (htmlDocument) {
|
||||||
|
// Enable usage of the execCommand API
|
||||||
|
htmlDocument->SetEditingState(nsIHTMLDocument::eDesignMode);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -611,6 +616,10 @@ nsEditingSession::TearDownEditorOnWindow(nsIDOMWindow *aWindow)
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
doc->SetEditableFlag(PR_FALSE);
|
doc->SetEditableFlag(PR_FALSE);
|
||||||
|
nsCOMPtr<nsIHTMLDocument> htmlDocument = do_QueryInterface(doc);
|
||||||
|
if (htmlDocument) {
|
||||||
|
htmlDocument->SetEditingState(nsIHTMLDocument::eOff);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,5 +51,12 @@ _TEST_FILES = \
|
||||||
test_bug519928.html \
|
test_bug519928.html \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
_CHROME_TEST_FILES = \
|
||||||
|
test_bug434998.xul \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
libs:: $(_TEST_FILES)
|
libs:: $(_TEST_FILES)
|
||||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
|
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
|
||||||
|
|
||||||
|
libs:: $(_CHROME_TEST_FILES)
|
||||||
|
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,110 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<?xml-stylesheet href="chrome://global/skin"
|
||||||
|
type="text/css"?>
|
||||||
|
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||||
|
type="text/css"?>
|
||||||
|
<!--
|
||||||
|
https://bugzilla.mozilla.org/show_bug.cgi?id=434998
|
||||||
|
-->
|
||||||
|
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
|
title="Mozilla Bug 434998" onload="runTest();">
|
||||||
|
<script type="application/javascript"
|
||||||
|
src="chrome://mochikit/content/MochiKit/packed.js"/>
|
||||||
|
<script type="application/javascript"
|
||||||
|
src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
|
||||||
|
<script type="application/javascript"
|
||||||
|
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
|
||||||
|
|
||||||
|
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=434998"
|
||||||
|
target="_blank">Mozilla Bug 434998</a>
|
||||||
|
<p/>
|
||||||
|
<editor xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
|
id="editor"
|
||||||
|
type="content-primary"
|
||||||
|
editortype="html"
|
||||||
|
style="width: 400px; height: 100px; border: thin solid black"/>
|
||||||
|
<p/>
|
||||||
|
<pre id="test">
|
||||||
|
</pre>
|
||||||
|
</body>
|
||||||
|
<script class="testbody" type="application/javascript">
|
||||||
|
<![CDATA[
|
||||||
|
|
||||||
|
SimpleTest.waitForExplicitFinish();
|
||||||
|
|
||||||
|
function EditorContentListener(aEditor)
|
||||||
|
{
|
||||||
|
this.init(aEditor);
|
||||||
|
}
|
||||||
|
|
||||||
|
EditorContentListener.prototype = {
|
||||||
|
init : function(aEditor)
|
||||||
|
{
|
||||||
|
this.mEditor = aEditor;
|
||||||
|
},
|
||||||
|
|
||||||
|
QueryInterface : function(aIID)
|
||||||
|
{
|
||||||
|
if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
|
||||||
|
aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
|
||||||
|
aIID.equals(Components.interfaces.nsISupports))
|
||||||
|
return this;
|
||||||
|
throw Components.results.NS_NOINTERFACE;
|
||||||
|
},
|
||||||
|
|
||||||
|
onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
|
||||||
|
{
|
||||||
|
if (aStateFlags & Components.interfaces.nsIWebProgressListener.STATE_STOP)
|
||||||
|
{
|
||||||
|
var editor = this.mEditor.getEditor(this.mEditor.contentWindow);
|
||||||
|
if (editor) {
|
||||||
|
// Should not throw
|
||||||
|
var threw = false;
|
||||||
|
try {
|
||||||
|
this.mEditor.contentDocument.execCommand("bold", false, null);
|
||||||
|
} catch (e) {
|
||||||
|
threw = true;
|
||||||
|
}
|
||||||
|
ok(!threw, "The execCommand API should work on <xul:editor>");
|
||||||
|
SimpleTest.finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
onProgressChange : function(aWebProgress, aRequest,
|
||||||
|
aCurSelfProgress, aMaxSelfProgress,
|
||||||
|
aCurTotalProgress, aMaxTotalProgress)
|
||||||
|
{
|
||||||
|
},
|
||||||
|
|
||||||
|
onLocationChange : function(aWebProgress, aRequest, aLocation)
|
||||||
|
{
|
||||||
|
},
|
||||||
|
|
||||||
|
onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage)
|
||||||
|
{
|
||||||
|
},
|
||||||
|
|
||||||
|
onSecurityChange : function(aWebProgress, aRequest, aState)
|
||||||
|
{
|
||||||
|
},
|
||||||
|
|
||||||
|
mEditor: null
|
||||||
|
};
|
||||||
|
|
||||||
|
var progress, progressListener;
|
||||||
|
|
||||||
|
function runTest() {
|
||||||
|
var newEditorElement = document.getElementById("editor");
|
||||||
|
newEditorElement.makeEditable("html", true);
|
||||||
|
var docShell = newEditorElement.boxObject.QueryInterface(Components.interfaces.nsIEditorBoxObject).docShell;
|
||||||
|
progress = docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebProgress);
|
||||||
|
progressListener = new EditorContentListener(newEditorElement);
|
||||||
|
progress.addProgressListener(progressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
|
||||||
|
newEditorElement.setAttribute("src", "data:text/html,");
|
||||||
|
}
|
||||||
|
]]>
|
||||||
|
</script>
|
||||||
|
</window>
|
||||||
Загрузка…
Ссылка в новой задаче