wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out ca56f76237df (bug 922934) because of metro-chrome test failures

Browse Source
This commit is contained in:
Matt Brubeck 2013-10-02 16:00:37 -07:00
parent 70bf7ce723
commit d6e4b6f6c9
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/metro/base/content/helperui/MenuUI.js
View File

@ -432,10 +432,9 @@ MenuPopup.prototype = {
let deferred = Promise.defer();
window.addEventListener("keypress", this, true);
window.addEventListener("mousedown", this, true);
window.addEventListener("touchstart", this, true);
window.addEventListener("scroll", this, true);
window.addEventListener("click", this, true);
Elements.stack.addEventListener("PopupChanged", this, false);
Elements.browsers.addEventListener("PanBegin", this, false);
this._panel.hidden = false;
let popupFrom = !aPositionOptions.bottomAligned ? "above" : "below";
@ -462,10 +461,9 @@ MenuPopup.prototype = {
let deferred = Promise.defer();
window.removeEventListener("keypress", this, true);
window.removeEventListener("mousedown", this, true);
window.removeEventListener("touchstart", this, true);
window.removeEventListener("scroll", this, true);
window.removeEventListener("click", this, true);
Elements.stack.removeEventListener("PopupChanged", this, false);
Elements.browsers.removeEventListener("PanBegin", this, false);
let self = this;
this._panel.addEventListener("transitionend", function popuphidden() {
@ -501,9 +499,7 @@ MenuPopup.prototype = {
this.hide();
}
break;
case "mousedown":
case "touchstart":
case "scroll":
case "click":
if (!this._popup.contains(aEvent.target)) {
aEvent.stopPropagation();
this.hide();
@ -521,6 +517,9 @@ MenuPopup.prototype = {
this.hide();
}
break;
case "PanBegin":
this.hide();
break;
}
}
};

6
browser/metro/base/tests/mochitest/browser_context_menu_tests.js
View File

@ -98,11 +98,9 @@ gTests.push({
"context-copy-link"]);
promise = waitForEvent(document, "popuphidden");
win.scrollBy(0, 1);
let hidden = yield promise;
ok(hidden && !(hidden instanceof Error), "scrolling hides the context menu");
ContextMenuUI.hide();
yield promise;
win.getSelection().removeAllRanges();
win.scrollBy(0, -1);
////////////////////////////////////////////////////////////
// Context menu in content on a link

4
browser/metro/base/tests/mochitest/browser_context_menu_tests_02.html
View File

@ -23,8 +23,8 @@
<br />
<br />
<br />
<div style="margin: 0; padding: 5px; margin-bottom: 9999px;">
<div style="margin: 0; padding: 5px;">
<span id="text4">hello, I'm sorry but I must be going.</span>
</div>
</body>
</html>
</html>