Bug 1082450 - Fix quitter extension. r=gabor
--- a/tools/quitter/contentscript.js
+++ b/tools/quitter/contentscript.js
@@ -1,38 +1,37 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var Ci = Components.interfaces;
var Cc = Components.classes;
+var Cu = Components.utils;
function Quitter() {
}
Quitter.prototype = {
toString: function() { return "[Quitter]"; },
- quit: function() {
- sendSyncMessage('Quitter.Quit', {});
- },
- __exposedProps__: {
- 'toString': 'r',
- 'quit': 'r'
- }
+ quit: function() { sendSyncMessage('Quitter.Quit', {}); }
};
// This is a frame script, so it may be running in a content process.
// In any event, it is targeted at a specific "tab", so we listen for
// the DOMWindowCreated event to be notified about content windows
// being created in this context.
function QuitterManager() {
addEventListener("DOMWindowCreated", this, false);
}
QuitterManager.prototype = {
handleEvent: function handleEvent(aEvent) {
+ var quitter = new Quitter(window);
var window = aEvent.target.defaultView;
- window.wrappedJSObject.Quitter = new Quitter(window);
+ window.wrappedJSObject.Quitter = Cu.cloneInto({
+ toString: quitter.toString.bind(quitter),
+ quit: quitter.quit.bind(quitter)
+ }, window, {cloneFunctions: true});
}
};
var quittermanager = new QuitterManager();