Bug 1266478 - Eslint fixes followup;r=me

MozReview-Commit-ID: 2BtKqZ23Qna
This commit is contained in:
Brian Grinstead 2016-06-10 16:51:47 -07:00
parent ad19bb6b11
commit 70988d77e5
4 changed files with 10 additions and 16 deletions

View File

@ -33,7 +33,7 @@ add_task(function* () {
function* assertCopyImageDataNotAvailable(inspector) {
let allMenuItems = openContextMenuAndGetAllItems(inspector);
let item = allMenuItems.find(item => item.id === "node-menu-copyimagedatauri");
let item = allMenuItems.find(i => i.id === "node-menu-copyimagedatauri");
ok(item, "The menu item was found in the contextual menu");
ok(item.disabled, "The menu item is disabled");
@ -41,7 +41,7 @@ function* assertCopyImageDataNotAvailable(inspector) {
function* assertCopyImageDataAvailable(inspector) {
let allMenuItems = openContextMenuAndGetAllItems(inspector);
let item = allMenuItems.find(item => item.id === "node-menu-copyimagedatauri");
let item = allMenuItems.find(i => i.id === "node-menu-copyimagedatauri");
ok(item, "The menu item was found in the contextual menu");
ok(!item.disabled, "The menu item is enabled");

View File

@ -75,7 +75,6 @@ const TEST_DATA = [{
}];
add_task(function* () {
let {inspector} = yield openInspectorForURL(TEST_URL);
for (let test of TEST_DATA) {
@ -94,7 +93,7 @@ add_task(function* () {
});
let linkFollow = allMenuItems.find(i => i.id === "node-menu-link-follow");
let linkCopy = allMenuItems.find(i => i.id === "node-menu-link-copy");
let linkCopy = allMenuItems.find(i => i.id === "node-menu-link-copy");
// The contextual menu setup is async, because it needs to know if the
// inspector has the resolveRelativeURL method first. So call actorHasMethod

View File

@ -294,17 +294,15 @@ function wait(ms) {
*/
var isEditingMenuDisabled = Task.async(
function* (nodeFront, inspector, assert = true) {
let doc = inspector.panelDoc;
// To ensure clipboard contains something to paste.
clipboard.set("<p>test</p>", "html");
yield selectNode(nodeFront, inspector);
let allMenuItems = openContextMenuAndGetAllItems(inspector);
let deleteMenuItem = allMenuItems.find(item => item.id === "node-menu-delete");
let editHTMLMenuItem = allMenuItems.find(item => item.id === "node-menu-edithtml");
let pasteHTMLMenuItem = allMenuItems.find(item => item.id === "node-menu-pasteouterhtml");
let deleteMenuItem = allMenuItems.find(i => i.id === "node-menu-delete");
let editHTMLMenuItem = allMenuItems.find(i => i.id === "node-menu-edithtml");
let pasteHTMLMenuItem = allMenuItems.find(i => i.id === "node-menu-pasteouterhtml");
if (assert) {
ok(deleteMenuItem.disabled, "Delete menu item is disabled");
@ -328,18 +326,15 @@ function* (nodeFront, inspector, assert = true) {
*/
var isEditingMenuEnabled = Task.async(
function* (nodeFront, inspector, assert = true) {
let doc = inspector.panelDoc;
// To ensure clipboard contains something to paste.
clipboard.set("<p>test</p>", "html");
let menu = inspector.nodemenu;
yield selectNode(nodeFront, inspector);
let allMenuItems = openContextMenuAndGetAllItems(inspector);
let deleteMenuItem = allMenuItems.find(item => item.id === "node-menu-delete");
let editHTMLMenuItem = allMenuItems.find(item => item.id === "node-menu-edithtml");
let pasteHTMLMenuItem = allMenuItems.find(item => item.id === "node-menu-pasteouterhtml");
let deleteMenuItem = allMenuItems.find(i => i.id === "node-menu-delete");
let editHTMLMenuItem = allMenuItems.find(i => i.id === "node-menu-edithtml");
let pasteHTMLMenuItem = allMenuItems.find(i => i.id === "node-menu-pasteouterhtml");
if (assert) {
ok(!deleteMenuItem.disabled, "Delete menu item is enabled");

View File

@ -41,7 +41,7 @@ add_task(function* () {
yield selectNode(selector, inspector);
let allMenuItems = openContextMenuAndGetAllItems(inspector);
let item = allMenuItems.find(item => item.id === id);
let item = allMenuItems.find(i => i.id === id);
ok(item, "The popup has a " + desc + " menu item.");
yield waitForClipboard(() => item.click(), text);