forked from mozilla/gecko-dev
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge mozilla-inbound to mozilla-central a=merge
- Loading branch information
Showing
65 changed files
with
823 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
browser/base/content/test/tabs/browser_tabswitch_updatecommands.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // This test ensures that only one command update happens when switching tabs. | ||
|
|
||
| "use strict"; | ||
|
|
||
| add_task(function* () { | ||
| const uri = "data:text/html,<body><input>"; | ||
| let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, uri); | ||
| let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, uri); | ||
|
|
||
| let updates = 0; | ||
| function countUpdates(event) { updates++; } | ||
| let updater = document.getElementById("editMenuCommandSetAll"); | ||
| updater.addEventListener("commandupdate", countUpdates, true); | ||
| yield BrowserTestUtils.switchTab(gBrowser, tab1); | ||
|
|
||
| is(updates, 1, "only one command update per tab switch"); | ||
|
|
||
| updater.removeEventListener("commandupdate", countUpdates, true); | ||
| yield BrowserTestUtils.removeTab(tab1); | ||
| yield BrowserTestUtils.removeTab(tab2); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
162 changes: 162 additions & 0 deletions
162
browser/components/customizableui/test/browser_editcontrols_update.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| // This test checks that the edit command enabled state (cut/paste) is updated | ||
| // properly when the edit controls are on the toolbar, popup and not present. | ||
| // It also verifies that the performance optimiation implemented by | ||
| // updateEditUIVisibility in browser.js is applied. | ||
|
|
||
| let isMac = navigator.platform.indexOf("Mac") == 0; | ||
|
|
||
| function checkState(allowCut, desc, testWindow = window) { | ||
| is(testWindow.document.getElementById("cmd_cut").getAttribute("disabled") == "true", !allowCut, desc + " - cut"); | ||
| is(testWindow.document.getElementById("cmd_paste").getAttribute("disabled") == "true", false, desc + " - paste"); | ||
| } | ||
|
|
||
| // Add a special controller to the urlbar and browser to listen in on when | ||
| // commands are being updated. Return a promise that resolves when 'count' | ||
| // updates have occurred. | ||
| function expectCommandUpdate(count, testWindow = window) { | ||
| return new Promise((resolve, reject) => { | ||
| let overrideController = { | ||
| supportsCommand(cmd) { return cmd == "cmd_delete"; }, | ||
| isCommandEnabled(cmd) { | ||
| if (!count) { | ||
| ok(false, "unexpected update"); | ||
| reject(); | ||
| } | ||
|
|
||
| if (!--count) { | ||
| testWindow.gURLBar.controllers.removeControllerAt(0, overrideController); | ||
| testWindow.gBrowser.selectedBrowser.controllers.removeControllerAt(0, overrideController); | ||
| resolve(true); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| if (!count) { | ||
| SimpleTest.executeSoon(() => { | ||
| testWindow.gURLBar.controllers.removeControllerAt(0, overrideController); | ||
| testWindow.gBrowser.selectedBrowser.controllers.removeControllerAt(0, overrideController); | ||
| resolve(false); | ||
| }); | ||
| } | ||
|
|
||
| testWindow.gURLBar.controllers.insertControllerAt(0, overrideController); | ||
| testWindow.gBrowser.selectedBrowser.controllers.insertControllerAt(0, overrideController); | ||
| }); | ||
| } | ||
|
|
||
| add_task(function* test_init() { | ||
| // Put something on the clipboard to verify that the paste button is properly enabled during the test. | ||
| let clipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); | ||
| yield new Promise(resolve => { | ||
| SimpleTest.waitForClipboard("Sample", function() { clipboardHelper.copyString("Sample"); }, resolve); | ||
| }); | ||
|
|
||
| // Open and close the panel first so that it is fully initialized. | ||
| yield PanelUI.show(); | ||
| let hiddenPromise = promisePanelHidden(window); | ||
| PanelUI.hide(); | ||
| yield hiddenPromise; | ||
| }); | ||
|
|
||
| // Test updating when the panel is open with the edit-controls on the panel. | ||
| // Updates should occur. | ||
| add_task(function* test_panelui_opened() { | ||
| gURLBar.focus(); | ||
| gURLBar.value = "test"; | ||
|
|
||
| yield PanelUI.show(); | ||
|
|
||
| checkState(false, "Update when edit-controls is on panel and visible"); | ||
|
|
||
| let overridePromise = expectCommandUpdate(1); | ||
| gURLBar.select(); | ||
| yield overridePromise; | ||
|
|
||
| checkState(true, "Update when edit-controls is on panel and selection changed"); | ||
|
|
||
| overridePromise = expectCommandUpdate(0); | ||
| let hiddenPromise = promisePanelHidden(window); | ||
| PanelUI.hide(); | ||
| yield hiddenPromise; | ||
| yield overridePromise; | ||
|
|
||
| // Check that updates do not occur after the panel has been closed. | ||
| checkState(true, "Update when edit-controls is on panel and hidden"); | ||
|
|
||
| // Mac will update the enabled st1ate even when the panel is closed so that | ||
| // main menubar shortcuts will work properly. | ||
| overridePromise = expectCommandUpdate(isMac ? 1 : 0); | ||
| gURLBar.select(); | ||
| yield overridePromise; | ||
| checkState(true, "Update when edit-controls is on panel, hidden and selection changed"); | ||
| }); | ||
|
|
||
| // Test updating when the edit-controls are moved to the toolbar. | ||
| add_task(function* test_panelui_customize_to_toolbar() { | ||
| yield startCustomizing(); | ||
| let navbar = document.getElementById("nav-bar").customizationTarget; | ||
| simulateItemDrag(document.getElementById("edit-controls"), navbar); | ||
| yield endCustomizing(); | ||
|
|
||
| // updateEditUIVisibility should be called when customization ends but isn't. See bug 1359790. | ||
| updateEditUIVisibility(); | ||
|
|
||
| let overridePromise = expectCommandUpdate(1); | ||
| gURLBar.select(); | ||
| gURLBar.focus(); | ||
| gURLBar.value = "other"; | ||
| yield overridePromise; | ||
| checkState(false, "Update when edit-controls on toolbar and focused"); | ||
|
|
||
| overridePromise = expectCommandUpdate(1); | ||
| gURLBar.select(); | ||
| yield overridePromise; | ||
| checkState(true, "Update when edit-controls on toolbar and selection changed"); | ||
| }); | ||
|
|
||
| // Test updating when the edit-controls are moved to the palette. | ||
| add_task(function* test_panelui_customize_to_palette() { | ||
| yield startCustomizing(); | ||
| let palette = document.getElementById("customization-palette"); | ||
| simulateItemDrag(document.getElementById("edit-controls"), palette); | ||
| yield endCustomizing(); | ||
|
|
||
| // updateEditUIVisibility should be called when customization ends but isn't. See bug 1359790. | ||
| updateEditUIVisibility(); | ||
|
|
||
| let overridePromise = expectCommandUpdate(isMac ? 1 : 0); | ||
| gURLBar.focus(); | ||
| gURLBar.value = "other"; | ||
| gURLBar.select(); | ||
| yield overridePromise; | ||
|
|
||
| // If the UI isn't found, the command is set to be enabled. | ||
| checkState(true, "Update when edit-controls is on palette, hidden and selection changed"); | ||
| }); | ||
|
|
||
| add_task(function* finish() { | ||
| yield resetCustomization(); | ||
| }); | ||
|
|
||
| // Test updating in the initial state when the edit-controls are on the panel but | ||
| // have not yet been created. This needs to be done in a new window to ensure that | ||
| // other tests haven't opened the panel. | ||
| add_task(function* test_initial_state() { | ||
| let testWindow = yield BrowserTestUtils.openNewBrowserWindow(); | ||
| yield SimpleTest.promiseFocus(testWindow); | ||
|
|
||
| let overridePromise = expectCommandUpdate(isMac, testWindow); | ||
|
|
||
| testWindow.gURLBar.focus(); | ||
| testWindow.gURLBar.value = "test"; | ||
|
|
||
| yield overridePromise; | ||
|
|
||
| // Commands won't update when no edit UI is present. They default to being | ||
| // enabled so that keyboard shortcuts will work. The real enabled state will | ||
| // be checked when shortcut is pressed. | ||
| checkState(!isMac, "No update when edit-controls is on panel and not visible", testWindow); | ||
|
|
||
| yield BrowserTestUtils.closeWindow(testWindow); | ||
| yield SimpleTest.promiseFocus(window); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.