nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset aa7f507ac743 (bug 1558674) for dt failures on browser_console_context_menu_entries.js . CLOSED TREE

Browse source
This commit is contained in:
Narcis Beleuzu 2019-06-14 05:57:52 +03:00
parent 1ad559bb39
commit 72a734cf98
10 changed files with 39 additions and 50 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
View file

@ -46,13 +46,12 @@ add_task(async function checkMenuEntryStates() {
is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled"); is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled"); is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled"); is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
if (isWindows()) { // Cut/Copy/Paste items are enabled in context menu even if there
// emptyClipboard only works on Windows (666254), assert paste only for this OS. // is no selection. See also Bug 1303033, and 1317322
is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled"); is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
} is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
is(cmdPaste.getAttribute("disabled"), "", "cmdPaste is enabled");
const onContextMenuHidden = toolbox.once("menu-close"); const onContextMenuHidden = toolbox.once("menu-close");
EventUtils.sendKey("ESCAPE", toolbox.win); EventUtils.sendKey("ESCAPE", toolbox.win);

11
devtools/client/inspector/computed/test/browser_computed_search-filter_context-menu.js
View file

@ -44,12 +44,11 @@ add_task(async function() {
is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled"); is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled"); is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled"); // Cut/Copy/Paste items are enabled in context menu even if there is no
is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled"); // selection. See also Bug 1303033, and 1317322
if (isWindows()) { is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
// emptyClipboard only works on Windows (666254), assert paste only for this OS. is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled"); is(cmdPaste.getAttribute("disabled"), "", "cmdPaste is enabled");
}
info("Closing context menu"); info("Closing context menu");
let onContextMenuClose = toolbox.once("menu-close"); let onContextMenuClose = toolbox.once("menu-close");

11
devtools/client/inspector/rules/test/browser_rules_search-filter_context-menu.js
View file

@ -42,13 +42,12 @@ add_task(async function() {
is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled"); is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled"); is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled"); is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
if (isWindows()) { // Cut/Copy/Paste items are enabled in context menu even if there is no
// emptyClipboard only works on Windows (666254), assert paste only for this OS. // selection. See also Bug 1303033, and 1317322
is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled"); is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
} is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
is(cmdPaste.getAttribute("disabled"), "", "cmdPaste is enabled");
info("Closing context menu"); info("Closing context menu");
let onContextMenuClose = toolbox.once("menu-close"); let onContextMenuClose = toolbox.once("menu-close");

11
devtools/client/inspector/test/browser_inspector_search-filter_context-menu.js
View file

@ -39,13 +39,12 @@ add_task(async function() {
is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled"); is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled"); is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled"); is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
if (isWindows()) { // Cut/Copy items are enabled in context menu even if there
// emptyClipboard only works on Windows (666254), assert paste only for this OS. // is no selection. See also Bug 1303033, and 1317322
is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled"); is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
} is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
is(cmdPaste.getAttribute("disabled"), "", "cmdPaste is enabled");
info("Closing context menu"); info("Closing context menu");
let onContextMenuClose = toolbox.once("menu-close"); let onContextMenuClose = toolbox.once("menu-close");

6
devtools/client/scratchpad/test/browser_scratchpad_edit_ui_updates.js
View file

@ -113,7 +113,7 @@ function runTests() {
}; };
const firstShow = function() { const firstShow = function() {
ok(cutItem.hasAttribute("disabled"), "cut menuitem is disabled"); ok(!cutItem.hasAttribute("disabled"), "cut menuitem is enabled");
closeMenu(firstHide); closeMenu(firstHide);
}; };
@ -143,7 +143,7 @@ function runTests() {
}; };
const showAfterCut = function() { const showAfterCut = function() {
ok(cutItem.hasAttribute("disabled"), "cut menuitem is disabled after cut"); ok(!cutItem.hasAttribute("disabled"), "cut menuitem is enabled after cut");
ok(!pasteItem.hasAttribute("disabled"), "paste menuitem is enabled after cut"); ok(!pasteItem.hasAttribute("disabled"), "paste menuitem is enabled after cut");
closeMenu(hideAfterCut); closeMenu(hideAfterCut);
}; };
@ -161,7 +161,7 @@ function runTests() {
}; };
const showAfterPaste = function() { const showAfterPaste = function() {
ok(cutItem.hasAttribute("disabled"), "cut menuitem is disabled after paste"); ok(!cutItem.hasAttribute("disabled"), "cut menuitem is enabled after paste");
ok(!pasteItem.hasAttribute("disabled"), "paste menuitem is enabled after paste"); ok(!pasteItem.hasAttribute("disabled"), "paste menuitem is enabled after paste");
closeMenu(hideAfterPaste); closeMenu(hideAfterPaste);
}; };

12
devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js
View file

@ -73,9 +73,9 @@ async function performTests() {
expectedContextMenu = [ expectedContextMenu = [
"#editmenu-undo (editmenu-undo) [disabled]", "#editmenu-undo (editmenu-undo) [disabled]",
"#editmenu-cut (editmenu-cut) [disabled]", "#editmenu-cut (editmenu-cut)",
"#editmenu-copy (editmenu-copy) [disabled]", "#editmenu-copy (editmenu-copy)",
"#editmenu-paste (editmenu-paste)" + (isWindows() ? "" : " [disabled]"), "#editmenu-paste (editmenu-paste)",
"#editmenu-delete (editmenu-delete) [disabled]", "#editmenu-delete (editmenu-delete) [disabled]",
"#editmenu-selectAll (editmenu-select-all) [disabled]", "#editmenu-selectAll (editmenu-select-all) [disabled]",
]; ];
@ -88,9 +88,9 @@ async function performTests() {
expectedContextMenu = [ expectedContextMenu = [
"#editmenu-undo (editmenu-undo) [disabled]", "#editmenu-undo (editmenu-undo) [disabled]",
"#editmenu-cut (editmenu-cut) [disabled]", "#editmenu-cut (editmenu-cut)",
"#editmenu-copy (editmenu-copy) [disabled]", "#editmenu-copy (editmenu-copy)",
"#editmenu-paste (editmenu-paste)" + (isWindows() ? "" : " [disabled]"), "#editmenu-paste (editmenu-paste)",
"#editmenu-delete (editmenu-delete) [disabled]", "#editmenu-delete (editmenu-delete) [disabled]",
"#editmenu-selectAll (editmenu-select-all) [disabled]", "#editmenu-selectAll (editmenu-select-all) [disabled]",
]; ];

4
dom/base/nsGlobalWindowCommands.cpp
View file

@ -488,9 +488,9 @@ nsresult nsClipboardCommand::IsCommandEnabled(const char* aCommandName,
RefPtr<dom::Document> doc = window->GetExtantDoc(); RefPtr<dom::Document> doc = window->GetExtantDoc();
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE); NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
if (doc->IsHTMLOrXHTML() && !nsContentUtils::IsChromeDoc(doc)) { if (doc->IsHTMLOrXHTML()) {
// In HTML and XHTML documents, we always want the cut, copy and paste // In HTML and XHTML documents, we always want the cut, copy and paste
// commands to be enabled, but if the document is chrome, let it control it. // commands to be enabled.
*outCmdEnabled = true; *outCmdEnabled = true;
} else { } else {
// Cut isn't enabled in xul documents which use nsClipboardCommand // Cut isn't enabled in xul documents which use nsClipboardCommand

6
editor/libeditor/HTMLEditorDataTransfer.cpp
View file

@ -1642,11 +1642,9 @@ static const char* textHtmlEditorFlavors[] = {kUnicodeMime, kHTMLMime,
kPNGImageMime, kGIFImageMime}; kPNGImageMime, kGIFImageMime};
bool HTMLEditor::CanPaste(int32_t aClipboardType) const { bool HTMLEditor::CanPaste(int32_t aClipboardType) const {
// Always enable the paste command when inside of a HTML or XHTML document, // Always enable the paste command when inside of a HTML or XHTML document.
// but if the document is chrome, let it control it.
Document* document = GetDocument(); Document* document = GetDocument();
if (document && document->IsHTMLOrXHTML() && if (document && document->IsHTMLOrXHTML()) {
!nsContentUtils::IsChromeDoc(document)) {
return true; return true;
} }

12
editor/libeditor/TextEditor.cpp
View file

@ -1794,11 +1794,9 @@ bool TextEditor::CanCut() const {
return false; return false;
} }
// Cut is always enabled in HTML documents, but if the document is chrome, // Cut is always enabled in HTML documents
// let it control it.
Document* document = GetDocument(); Document* document = GetDocument();
if (document && document->IsHTMLOrXHTML() && if (document && document->IsHTMLOrXHTML()) {
!nsContentUtils::IsChromeDoc(document)) {
return true; return true;
} }
@ -1825,11 +1823,9 @@ bool TextEditor::CanCopy() const {
return false; return false;
} }
// Copy is always enabled in HTML documents, but if the document is chrome, // Copy is always enabled in HTML documents
// let it control it.
Document* document = GetDocument(); Document* document = GetDocument();
if (document && document->IsHTMLOrXHTML() && if (document && document->IsHTMLOrXHTML()) {
!nsContentUtils::IsChromeDoc(document)) {
return true; return true;
} }

5
editor/libeditor/TextEditorDataTransfer.cpp
View file

@ -443,10 +443,9 @@ nsresult TextEditor::PasteTransferableAsAction(nsITransferable* aTransferable,
} }
bool TextEditor::CanPaste(int32_t aClipboardType) const { bool TextEditor::CanPaste(int32_t aClipboardType) const {
// Always enable the paste command when inside of a HTML or XHTML document, // Always enable the paste command when inside of a HTML or XHTML document.
// but if the document is chrome, let it control it.
RefPtr<Document> doc = GetDocument(); RefPtr<Document> doc = GetDocument();
if (doc && doc->IsHTMLOrXHTML() && !nsContentUtils::IsChromeDoc(doc)) { if (doc && doc->IsHTMLOrXHTML()) {
return true; return true;
} }