[Pkg-mozext-commits] [firebug] 24/56: Issue 7686 - implement disable e10s
David Prévot
taffit at moszumanska.debian.org
Wed Nov 19 21:01:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firebug.
commit 6e02f269adfd8a919047a7bde460197752ef53ad
Author: Jan Odvarko <odvarko at gmail.com>
Date: Tue Oct 21 12:00:24 2014 +0200
Issue 7686 - implement disable e10s
---
.../content/firebug/firefox/browserOverlay.js | 22 ++++++++++++++++++++-
.../firefox/multiprocessNotificationPanel.xml | 23 ++++------------------
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index d046c62..b4bb5bd 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -4,6 +4,7 @@ define([
"firebug/lib/trace",
"firebug/lib/options",
"firebug/lib/locale",
+ "firebug/lib/events",
"firebug/lib/array",
"firebug/lib/string",
"firebug/lib/xpcom",
@@ -13,7 +14,7 @@ define([
"firebug/firefox/browserToolbar",
"firebug/lib/system",
],
-function(FBTrace, Options, Locale, Arr, Str, Xpcom, BrowserOverlayLib, BrowserCommands,
+function(FBTrace, Options, Locale, Events, Arr, Str, Xpcom, BrowserOverlayLib, BrowserCommands,
BrowserMenu, BrowserToolbar, System) {
// ********************************************************************************************* //
@@ -602,12 +603,31 @@ BrowserOverlay.prototype =
if (!panel)
{
panel = this.doc.createElement("fbMultiprocessNotificationPanel");
+ panel.setAttribute("upgradecommand", "Firebug.browserOverlay.onUpgradeFirebug(event)");
+ panel.setAttribute("disablecommand", "Firebug.browserOverlay.onDisableE10s(event)");
popupSet.appendChild(panel);
}
panel.internationalize(Locale);
panel.open();
},
+
+ onDisableE10s: function(event)
+ {
+ Events.cancelEvent(event);
+
+ Options.setPref("browser.tabs", "remote.autostart", false);
+
+ Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).
+ quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
+ },
+
+ onUpgradeFirebug: function(event)
+ {
+ Events.cancelEvent(event);
+
+ FBTrace.sysout("onUpgradeFirebug");
+ },
};
// ********************************************************************************************* //
diff --git a/extension/content/firebug/firefox/multiprocessNotificationPanel.xml b/extension/content/firebug/firefox/multiprocessNotificationPanel.xml
index 6a00869..9c13c0c 100644
--- a/extension/content/firebug/firefox/multiprocessNotificationPanel.xml
+++ b/extension/content/firebug/firefox/multiprocessNotificationPanel.xml
@@ -33,10 +33,12 @@
class="text-link popup-notification-learnmore-link learnMore"
href="https://getfirebug.com/"/>
<xul:hbox align="right">
- <xul:button anonid="upgrade" type="menu-button" oncommand="onUpgrade(event)"
+ <xul:button anonid="upgrade" type="menu-button"
+ xbl:inherits="oncommand=upgradecommand"
class="popup-notification-menubutton">
<xul:menupopup>
- <xul:menuitem anonid="disable" oncommand="onDisable(event)"/>
+ <xul:menuitem anonid="disable"
+ xbl:inherits="oncommand=disablecommand"/>
</xul:menupopup>
</xul:button>
</xul:hbox>
@@ -80,23 +82,6 @@
panel.openPopup(startButton.button, "after_end", -offsetX, -offsetY, false, false);
]]></body>
</method>
-
- <method name="onDisable">
- <parameter name="event" />
- <body><![CDATA[
- event.stopPropagation();
- ]]></body>
- </method>
-
- <method name="onUpgrade">
- <parameter name="event" />
- <body><![CDATA[
- event.stopPropagation();
- ]]></body>
- </method>
-
</implementation>
-
</binding>
-
</bindings>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git
More information about the Pkg-mozext-commits
mailing list