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

Bug 1299480 - Fix regression in the context menu when containers are in used, r=gijs

Browse source
This commit is contained in:
Andrea Marchesini 2016-09-06 13:19:01 +02:00
parent ebb3c8a52f
commit da901b1816
2 changed files with 3 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
browser/base/content/browser-context.inc
View file

@ -54,7 +54,7 @@
label="&openLinkCmdInCurrent.label;" label="&openLinkCmdInCurrent.label;"
accesskey="&openLinkCmdInCurrent.accesskey;" accesskey="&openLinkCmdInCurrent.accesskey;"
oncommand="gContextMenu.openLinkInCurrent();"/> oncommand="gContextMenu.openLinkInCurrent();"/>
# label and usercontextid are dynamically set. # label and data-usercontextid are dynamically set.
<menuitem id="context-openlinkincontainertab" <menuitem id="context-openlinkincontainertab"
accesskey="&openLinkCmdInTab.accesskey;" accesskey="&openLinkCmdInTab.accesskey;"
oncommand="gContextMenu.openLinkInTab(event);"/> oncommand="gContextMenu.openLinkInTab(event);"/>

4
browser/base/content/nsContextMenu.js
View file

@ -151,7 +151,7 @@ nsContextMenu.prototype = {
inContainer = true; inContainer = true;
var item = document.getElementById("context-openlinkincontainertab"); var item = document.getElementById("context-openlinkincontainertab");
item.setAttribute("usercontextid", userContextId); item.setAttribute("data-usercontextid", userContextId);
var label = ContextualIdentityService.getUserContextLabel(userContextId); var label = ContextualIdentityService.getUserContextLabel(userContextId);
item.setAttribute("label", item.setAttribute("label",
@ -1008,7 +1008,7 @@ nsContextMenu.prototype = {
let params = { let params = {
allowMixedContent: persistAllowMixedContentInChildTab, allowMixedContent: persistAllowMixedContentInChildTab,
userContextId: parseInt(event.target.getAttribute('usercontextid')) userContextId: parseInt(event.target.getAttribute('data-usercontextid')),
}; };
openLinkIn(this.linkURL, "tab", this._openLinkInParameters(params)); openLinkIn(this.linkURL, "tab", this._openLinkInParameters(params));