Commit 58500691 authored by Aryeh Gregor's avatar Aryeh Gregor
Browse files

Bug 742261 - Remove useless queryCommandText/execCommandShowHelp methods; r=ehsan

parent 342965bb

content/html/document/src/nsHTMLDocument.cpp

+0 −30
Original line number Diff line number Diff line
@@ -3124,22 +3124,6 @@ nsHTMLDocument::ExecCommand(const nsAString & commandID, 
  return rv;

}



/* TODO: don't let this call do anything if the page is not done loading */

/* boolean execCommandShowHelp(in DOMString commandID); */

NS_IMETHODIMP

nsHTMLDocument::ExecCommandShowHelp(const nsAString & commandID,

                                    bool *_retval)

{

  NS_ENSURE_ARG_POINTER(_retval);

  *_retval = false;



  // if editing is not on, bail

  if (!IsEditingOnAfterFlush())

    return NS_ERROR_FAILURE;



  return NS_ERROR_NOT_IMPLEMENTED;

}



/* boolean queryCommandEnabled(in DOMString commandID); */

NS_IMETHODIMP

nsHTMLDocument::QueryCommandEnabled(const nsAString & commandID,
@@ -3306,20 +3290,6 @@ nsHTMLDocument::QueryCommandSupported(const nsAString & commandID, 
  return NS_OK;

}



/* DOMString queryCommandText(in DOMString commandID); */

NS_IMETHODIMP

nsHTMLDocument::QueryCommandText(const nsAString & commandID,

                                 nsAString & _retval)

{

  _retval.SetLength(0);



  // if editing is not on, bail

  if (!IsEditingOnAfterFlush())

    return NS_ERROR_FAILURE;



  return NS_ERROR_NOT_IMPLEMENTED;

}



/* DOMString queryCommandValue(in DOMString commandID); */

NS_IMETHODIMP

nsHTMLDocument::QueryCommandValue(const nsAString & commandID,

content/html/document/test/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ _TEST_FILES = test_bug1682.html \ 
		test_bug571981.html \

		test_bug677495.html \

		test_bug677495-1.html \

		test_bug742261.html \

		$(NULL)



ifneq (mobile,$(MOZ_BUILD_APP))

content/html/document/test/test_bug742261.html

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<!doctype html>

<!--

https://bugzilla.mozilla.org/show_bug.cgi?id=742261

-->

<title>Test for Bug 742261</title>

<script src="/tests/SimpleTest/SimpleTest.js"></script>

<link rel="stylesheet" href="/tests/SimpleTest/test.css"/>

<body>

<script>

is(document.execCommandShowHelp, undefined,

   "execCommandShowHelp shouldn't exist");

is(document.queryCommandText, undefined,

   "queryCommandText shouldn't exist");

</script>

dom/interfaces/html/nsIDOMHTMLDocument.idl

+1 −7
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 */

interface nsISelection;



[scriptable, uuid(0d59c4f0-2272-4a72-8197-da6f86353ec1)]

[scriptable, uuid(3dae5807-3615-4567-913f-c3956a2aa251)]

interface nsIDOMHTMLDocument : nsIDOMDocument

{

  readonly attribute DOMString            URL;
@@ -94,9 +94,6 @@ interface nsIDOMHTMLDocument : nsIDOMDocument 
                                        [optional] in boolean doShowUI,

                                        [optional] in DOMString value);



  // returns true if the help is being shown for command (false if not)

  boolean                   execCommandShowHelp(in DOMString commandID);



  // returns true if the command is enabled (false otherwise)

  boolean                   queryCommandEnabled(in DOMString commandID);
@@ -109,9 +106,6 @@ interface nsIDOMHTMLDocument : nsIDOMDocument 
  // returns true if the command is supported on the current range

  boolean                   queryCommandSupported(in DOMString commandID);



  //

  DOMString                 queryCommandText(in DOMString commandID);



  // returns the current value of the document or current selection for command

  DOMString                 queryCommandValue(in DOMString commandID);