Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon

Browse Source
This commit is contained in:
Kyle Huey 2012-10-30 08:26:12 -07:00
parent 55785543f7
commit 50b5d3f681
477 changed files with 2287 additions and 2057 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/src/jsat/AccessFu.jsm
View File

@ -9,7 +9,7 @@ const Ci = Components.interfaces;
const Cu = Components.utils; const Cu = Components.utils;
const Cr = Components.results; const Cr = Components.results;
var EXPORTED_SYMBOLS = ['AccessFu']; this.EXPORTED_SYMBOLS = ['AccessFu'];
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
Cu.import('resource://gre/modules/Geometry.jsm'); Cu.import('resource://gre/modules/Geometry.jsm');
@ -21,7 +21,7 @@ const ACCESSFU_DISABLE = 0;
const ACCESSFU_ENABLE = 1; const ACCESSFU_ENABLE = 1;
const ACCESSFU_AUTO = 2; const ACCESSFU_AUTO = 2;
var AccessFu = { this.AccessFu = {
/** /**
* Initialize chrome-layer accessibility functionality. * Initialize chrome-layer accessibility functionality.
* If accessibility is enabled on the platform, then a special accessibility * If accessibility is enabled on the platform, then a special accessibility

4
accessible/src/jsat/EventManager.jsm
View File

@ -13,9 +13,9 @@ Cu.import('resource://gre/modules/accessibility/TraversalRules.jsm');
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
var EXPORTED_SYMBOLS = ['EventManager']; this.EXPORTED_SYMBOLS = ['EventManager'];
var EventManager = { this.EventManager = {
editState: {}, editState: {},
start: function start(aSendMsgFunc) { start: function start(aSendMsgFunc) {

18
accessible/src/jsat/Presenters.jsm
View File

@ -13,11 +13,11 @@ Cu.import('resource://gre/modules/accessibility/Utils.jsm');
Cu.import('resource://gre/modules/accessibility/UtteranceGenerator.jsm'); Cu.import('resource://gre/modules/accessibility/UtteranceGenerator.jsm');
Cu.import('resource://gre/modules/Geometry.jsm'); Cu.import('resource://gre/modules/Geometry.jsm');
var EXPORTED_SYMBOLS = ['VisualPresenter', this.EXPORTED_SYMBOLS = ['VisualPresenter',
'AndroidPresenter', 'AndroidPresenter',
'DummyAndroidPresenter', 'DummyAndroidPresenter',
'SpeechPresenter', 'SpeechPresenter',
'PresenterContext']; 'PresenterContext'];
/** /**
* The interface for all presenter classes. A presenter could be, for example, * The interface for all presenter classes. A presenter could be, for example,
@ -111,7 +111,7 @@ Presenter.prototype = {
* Visual presenter. Draws a box around the virtual cursor's position. * Visual presenter. Draws a box around the virtual cursor's position.
*/ */
function VisualPresenter() {} this.VisualPresenter = function VisualPresenter() {}
VisualPresenter.prototype = { VisualPresenter.prototype = {
__proto__: Presenter.prototype, __proto__: Presenter.prototype,
@ -179,7 +179,7 @@ VisualPresenter.prototype = {
* Android presenter. Fires Android a11y events. * Android presenter. Fires Android a11y events.
*/ */
function AndroidPresenter() {} this.AndroidPresenter = function AndroidPresenter() {}
AndroidPresenter.prototype = { AndroidPresenter.prototype = {
__proto__: Presenter.prototype, __proto__: Presenter.prototype,
@ -332,7 +332,7 @@ AndroidPresenter.prototype = {
* A speech presenter for direct TTS output * A speech presenter for direct TTS output
*/ */
function SpeechPresenter() {} this.SpeechPresenter = function SpeechPresenter() {}
SpeechPresenter.prototype = { SpeechPresenter.prototype = {
__proto__: Presenter.prototype, __proto__: Presenter.prototype,
@ -376,7 +376,7 @@ SpeechPresenter.prototype = {
* PresenterContext: An object that generates and caches context information * PresenterContext: An object that generates and caches context information
* for a given accessible and its relationship with another accessible. * for a given accessible and its relationship with another accessible.
*/ */
function PresenterContext(aAccessible, aOldAccessible) { this.PresenterContext = function PresenterContext(aAccessible, aOldAccessible) {
this._accessible = aAccessible; this._accessible = aAccessible;
this._oldAccessible = this._oldAccessible =
this._isDefunct(aOldAccessible) ? null : aOldAccessible; this._isDefunct(aOldAccessible) ? null : aOldAccessible;

6
accessible/src/jsat/TouchAdapter.jsm
View File

@ -9,7 +9,7 @@ const Ci = Components.interfaces;
const Cu = Components.utils; const Cu = Components.utils;
const Cr = Components.results; const Cr = Components.results;
var EXPORTED_SYMBOLS = ['TouchAdapter', 'AndroidTouchAdapter']; this.EXPORTED_SYMBOLS = ['TouchAdapter', 'AndroidTouchAdapter'];
Cu.import('resource://gre/modules/accessibility/Utils.jsm'); Cu.import('resource://gre/modules/accessibility/Utils.jsm');
@ -17,7 +17,7 @@ Cu.import('resource://gre/modules/accessibility/Utils.jsm');
// It is granular enough to feel natural, and it does not hammer the CPU. // It is granular enough to feel natural, and it does not hammer the CPU.
const EXPLORE_THROTTLE = 100; const EXPLORE_THROTTLE = 100;
var TouchAdapter = { this.TouchAdapter = {
// minimal swipe distance in inches // minimal swipe distance in inches
SWIPE_MIN_DISTANCE: 0.4, SWIPE_MIN_DISTANCE: 0.4,
@ -366,7 +366,7 @@ var Mouse2Touch = {
} }
}; };
var AndroidTouchAdapter = { this.AndroidTouchAdapter = {
attach: function AndroidTouchAdapter_attach(aWindow) { attach: function AndroidTouchAdapter_attach(aWindow) {
if (this.chromeWin) if (this.chromeWin)
return; return;

4
accessible/src/jsat/TraversalRules.jsm
View File

@ -9,7 +9,7 @@ const Ci = Components.interfaces;
const Cu = Components.utils; const Cu = Components.utils;
const Cr = Components.results; const Cr = Components.results;
var EXPORTED_SYMBOLS = ['TraversalRules']; this.EXPORTED_SYMBOLS = ['TraversalRules'];
Cu.import('resource://gre/modules/accessibility/Utils.jsm'); Cu.import('resource://gre/modules/accessibility/Utils.jsm');
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
@ -70,7 +70,7 @@ var gSimpleTraversalRoles =
// Used for traversing in to child OOP frames. // Used for traversing in to child OOP frames.
Ci.nsIAccessibleRole.ROLE_INTERNAL_FRAME]; Ci.nsIAccessibleRole.ROLE_INTERNAL_FRAME];
var TraversalRules = { this.TraversalRules = {
Simple: new BaseTraversalRule( Simple: new BaseTraversalRule(
gSimpleTraversalRoles, gSimpleTraversalRoles,
function Simple_match(aAccessible) { function Simple_match(aAccessible) {

6
accessible/src/jsat/Utils.jsm
View File

@ -10,9 +10,9 @@ const Ci = Components.interfaces;
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
var EXPORTED_SYMBOLS = ['Utils', 'Logger']; this.EXPORTED_SYMBOLS = ['Utils', 'Logger'];
var Utils = { this.Utils = {
_buildAppMap: { _buildAppMap: {
'{3c2e2abc-06d4-11e1-ac3b-374f68613e61}': 'b2g', '{3c2e2abc-06d4-11e1-ac3b-374f68613e61}': 'b2g',
'{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser', '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser',
@ -156,7 +156,7 @@ var Utils = {
} }
}; };
var Logger = { this.Logger = {
DEBUG: 0, DEBUG: 0,
INFO: 1, INFO: 1,
WARNING: 2, WARNING: 2,

4
accessible/src/jsat/UtteranceGenerator.jsm
View File

@ -18,7 +18,7 @@ var gStringBundle = Cc['@mozilla.org/intl/stringbundle;1'].
createBundle('chrome://global/locale/AccessFu.properties'); createBundle('chrome://global/locale/AccessFu.properties');
var EXPORTED_SYMBOLS = ['UtteranceGenerator']; this.EXPORTED_SYMBOLS = ['UtteranceGenerator'];
Cu.import('resource://gre/modules/accessibility/Utils.jsm'); Cu.import('resource://gre/modules/accessibility/Utils.jsm');
@ -38,7 +38,7 @@ Cu.import('resource://gre/modules/accessibility/Utils.jsm');
* clicked event. Speaking only 'clicked' makes sense. Speaking 'button' does * clicked event. Speaking only 'clicked' makes sense. Speaking 'button' does
* not. * not.
*/ */
var UtteranceGenerator = { this.UtteranceGenerator = {
gActionMap: { gActionMap: {
jump: 'jumpAction', jump: 'jumpAction',
press: 'pressAction', press: 'pressAction',

2
b2g/app/b2g.js
View File

@ -576,3 +576,5 @@ pref("network.activity.blipIntervalMilliseconds", 250);
// Send some sites a custom user-agent. // Send some sites a custom user-agent.
pref("general.useragent.override.facebook.com", "\(Mobile#(Android; Mobile"); pref("general.useragent.override.facebook.com", "\(Mobile#(Android; Mobile");
pref("general.useragent.override.youtube.com", "\(Mobile#(Android; Mobile"); pref("general.useragent.override.youtube.com", "\(Mobile#(Android; Mobile");
pref("jsloader.reuseGlobal", true);

2
b2g/components/ActivitiesGlue.js
View File

@ -67,5 +67,5 @@ ActivitiesDialog.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIActivityUIGlue, Ci.nsIRunnable]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIActivityUIGlue, Ci.nsIRunnable])
} }
const NSGetFactory = XPCOMUtils.generateNSGetFactory([ActivitiesDialog]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ActivitiesDialog]);

2
b2g/components/AlertsService.js
View File

@ -24,4 +24,4 @@ AlertsService.prototype = {
} }
}; };
const NSGetFactory = XPCOMUtils.generateNSGetFactory([AlertsService]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([AlertsService]);

2
b2g/components/ContentHandler.js
View File

@ -50,4 +50,4 @@ ContentHandler.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler])
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentHandler]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentHandler]);

2
b2g/components/ContentPermissionPrompt.js
View File

@ -145,4 +145,4 @@ ContentPermissionPrompt.prototype = {
//module initialization //module initialization
const NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPermissionPrompt]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPermissionPrompt]);

2
b2g/components/DirectoryProvider.js
View File

@ -77,4 +77,4 @@ DirectoryProvider.prototype = {
} }
}; };
const NSGetFactory = XPCOMUtils.generateNSGetFactory([DirectoryProvider]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DirectoryProvider]);

2
b2g/components/MailtoProtocolHandler.js
View File

@ -43,4 +43,4 @@ MailtoProtocolHandler.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
}; };
let NSGetFactory = XPCOMUtils.generateNSGetFactory([MailtoProtocolHandler]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MailtoProtocolHandler]);

2
b2g/components/MozKeyboard.js
View File

@ -136,5 +136,5 @@ MozKeyboard.prototype = {
} }
}; };
const NSGetFactory = XPCOMUtils.generateNSGetFactory([MozKeyboard]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MozKeyboard]);

2
b2g/components/PaymentGlue.js
View File

@ -169,4 +169,4 @@ PaymentUI.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIGlue]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIGlue])
} }
const NSGetFactory = XPCOMUtils.generateNSGetFactory([PaymentUI]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PaymentUI]);

2
b2g/components/ProcessGlobal.js
View File

@ -57,4 +57,4 @@ ProcessGlobal.prototype = {
}, },
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([ProcessGlobal]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ProcessGlobal]);

2
b2g/components/RecoveryService.js
View File

@ -90,4 +90,4 @@ RecoveryService.prototype = {
} }
}; };
const NSGetFactory = XPCOMUtils.generateNSGetFactory([RecoveryService]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([RecoveryService]);

2
b2g/components/SmsProtocolHandler.js
View File

@ -56,4 +56,4 @@ SmsProtocolHandler.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
}; };
let NSGetFactory = XPCOMUtils.generateNSGetFactory([SmsProtocolHandler]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SmsProtocolHandler]);

2
b2g/components/TelProtocolHandler.js
View File

@ -55,4 +55,4 @@ TelProtocolHandler.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
}; };
let NSGetFactory = XPCOMUtils.generateNSGetFactory([TelProtocolHandler]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelProtocolHandler]);

4
b2g/components/TelURIParser.jsm
View File

@ -4,12 +4,12 @@
"use strict"; "use strict";
let EXPORTED_SYMBOLS = ["TelURIParser"]; this.EXPORTED_SYMBOLS = ["TelURIParser"];
/** /**
* Singleton providing functionality for parsing tel: and sms: URIs * Singleton providing functionality for parsing tel: and sms: URIs
*/ */
let TelURIParser = { this.TelURIParser = {
parseURI: function(scheme, uri) { parseURI: function(scheme, uri) {
// Ignore MWI and USSD codes. See 794034. // Ignore MWI and USSD codes. See 794034.
if (uri.indexOf('*') != -1 || uri.indexOf('#') != -1) { if (uri.indexOf('*') != -1 || uri.indexOf('#') != -1) {

2
b2g/components/UpdatePrompt.js
View File

@ -411,4 +411,4 @@ UpdatePrompt.prototype = {
onStatus: function UP_onStatus(aRequest, aUpdate, aStatus, aStatusArg) { } onStatus: function UP_onStatus(aRequest, aUpdate, aStatus, aStatusArg) { }
}; };
const NSGetFactory = XPCOMUtils.generateNSGetFactory([UpdatePrompt]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([UpdatePrompt]);

2
b2g/components/YoutubeProtocolHandler.js
View File

@ -129,4 +129,4 @@ YoutubeProtocolHandler.prototype = {
} }
}; };
const NSGetFactory = XPCOMUtils.generateNSGetFactory([YoutubeProtocolHandler]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([YoutubeProtocolHandler]);

4
browser/components/distribution.js
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
EXPORTED_SYMBOLS = [ "DistributionCustomizer" ]; this.EXPORTED_SYMBOLS = [ "DistributionCustomizer" ];
const Ci = Components.interfaces; const Ci = Components.interfaces;
const Cc = Components.classes; const Cc = Components.classes;
@ -16,7 +16,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils", XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm"); "resource://gre/modules/PlacesUtils.jsm");
function DistributionCustomizer() { this.DistributionCustomizer = function DistributionCustomizer() {
let dirSvc = Cc["@mozilla.org/file/directory_service;1"]. let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
getService(Ci.nsIProperties); getService(Ci.nsIProperties);
let iniFile = dirSvc.get("XCurProcD", Ci.nsIFile); let iniFile = dirSvc.get("XCurProcD", Ci.nsIFile);

4
browser/components/downloads/src/DownloadsCommon.jsm
View File

@ -6,7 +6,7 @@
"use strict"; "use strict";
var EXPORTED_SYMBOLS = [ this.EXPORTED_SYMBOLS = [
"DownloadsCommon", "DownloadsCommon",
]; ];
@ -87,7 +87,7 @@ XPCOMUtils.defineLazyGetter(this, "DownloadsLocalFileCtor", function () {
* This object is exposed directly to the consumers of this JavaScript module, * This object is exposed directly to the consumers of this JavaScript module,
* and provides shared methods for all the instances of the user interface. * and provides shared methods for all the instances of the user interface.
*/ */
const DownloadsCommon = { this.DownloadsCommon = {
/** /**
* Returns an object whose keys are the string names from the downloads string * Returns an object whose keys are the string names from the downloads string
* bundle, and whose values are either the translated strings or functions * bundle, and whose values are either the translated strings or functions

2
browser/components/downloads/src/DownloadsStartup.js
View File

@ -273,4 +273,4 @@ DownloadsStartup.prototype = {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
//// Module //// Module
const NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadsStartup]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadsStartup]);

2
browser/components/downloads/src/DownloadsUI.js
View File

@ -104,4 +104,4 @@ DownloadsUI.prototype = {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
//// Module //// Module
const NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadsUI]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadsUI]);

2
browser/components/feeds/src/FeedConverter.js
View File

@ -579,4 +579,4 @@ var components = [FeedConverter,
PodCastProtocolHandler]; PodCastProtocolHandler];
const NSGetFactory = XPCOMUtils.generateNSGetFactory(components); this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

2
browser/components/feeds/src/FeedWriter.js
View File

@ -1378,4 +1378,4 @@ FeedWriter.prototype = {
Ci.nsINavHistoryObserver]) Ci.nsINavHistoryObserver])
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([FeedWriter]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FeedWriter]);

2
browser/components/feeds/src/WebContentConverter.js
View File

@ -899,4 +899,4 @@ WebContentConverterRegistrar.prototype = {
}] }]
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([WebContentConverterRegistrar]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([WebContentConverterRegistrar]);

2
browser/components/migration/src/ChromeProfileMigrator.js
View File

@ -340,4 +340,4 @@ ChromeProfileMigrator.prototype.classDescription = "Chrome Profile Migrator";
ChromeProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=chrome"; ChromeProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=chrome";
ChromeProfileMigrator.prototype.classID = Components.ID("{4cec1de4-1671-4fc3-a53e-6c539dc77a26}"); ChromeProfileMigrator.prototype.classID = Components.ID("{4cec1de4-1671-4fc3-a53e-6c539dc77a26}");
const NSGetFactory = XPCOMUtils.generateNSGetFactory([ChromeProfileMigrator]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ChromeProfileMigrator]);

2
browser/components/migration/src/FirefoxProfileMigrator.js
View File

@ -91,4 +91,4 @@ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox"; FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}"); FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

2
browser/components/migration/src/IEProfileMigrator.js
View File

@ -675,4 +675,4 @@ IEProfileMigrator.prototype.classDescription = "IE Profile Migrator";
IEProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=ie"; IEProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=ie";
IEProfileMigrator.prototype.classID = Components.ID("{3d2532e3-4932-4774-b7ba-968f5899d3a4}"); IEProfileMigrator.prototype.classID = Components.ID("{3d2532e3-4932-4774-b7ba-968f5899d3a4}");
const NSGetFactory = XPCOMUtils.generateNSGetFactory([IEProfileMigrator]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([IEProfileMigrator]);

6
browser/components/migration/src/MigrationUtils.jsm
View File

@ -4,7 +4,7 @@
"use strict"; "use strict";
let EXPORTED_SYMBOLS = ["MigrationUtils", "MigratorPrototype"]; this.EXPORTED_SYMBOLS = ["MigrationUtils", "MigratorPrototype"];
const Cu = Components.utils; const Cu = Components.utils;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -86,7 +86,7 @@ function getMigratorKeyForDefaultBrowser() {
* override |sourceHomePageURL| getter. * override |sourceHomePageURL| getter.
* 7. For startup-only migrators, override |startupOnlyMigrator|. * 7. For startup-only migrators, override |startupOnlyMigrator|.
*/ */
let MigratorPrototype = { this.MigratorPrototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIBrowserProfileMigrator]), QueryInterface: XPCOMUtils.generateQI([Ci.nsIBrowserProfileMigrator]),
/** /**
@ -323,7 +323,7 @@ let MigratorPrototype = {
} }
}; };
let MigrationUtils = Object.freeze({ this.MigrationUtils = Object.freeze({
resourceTypes: { resourceTypes: {
SETTINGS: Ci.nsIBrowserProfileMigrator.SETTINGS, SETTINGS: Ci.nsIBrowserProfileMigrator.SETTINGS,
COOKIES: Ci.nsIBrowserProfileMigrator.COOKIES, COOKIES: Ci.nsIBrowserProfileMigrator.COOKIES,

2
browser/components/migration/src/ProfileMigrator.js
View File

@ -18,4 +18,4 @@ ProfileMigrator.prototype = {
classID: Components.ID("6F8BB968-C14F-4D6F-9733-6C6737B35DCE") classID: Components.ID("6F8BB968-C14F-4D6F-9733-6C6737B35DCE")
}; };
let NSGetFactory = XPCOMUtils.generateNSGetFactory([ProfileMigrator]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ProfileMigrator]);

2
browser/components/migration/src/SafariProfileMigrator.js
View File

@ -677,4 +677,4 @@ SafariProfileMigrator.prototype.classDescription = "Safari Profile Migrator";
SafariProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=safari"; SafariProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=safari";
SafariProfileMigrator.prototype.classID = Components.ID("{4b609ecf-60b2-4655-9df4-dc149e474da1}"); SafariProfileMigrator.prototype.classID = Components.ID("{4b609ecf-60b2-4655-9df4-dc149e474da1}");
const NSGetFactory = XPCOMUtils.generateNSGetFactory([SafariProfileMigrator]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SafariProfileMigrator]);

2
browser/components/nsBrowserContentHandler.js
View File

@ -825,4 +825,4 @@ nsDefaultCommandLineHandler.prototype = {
}; };
var components = [nsBrowserContentHandler, nsDefaultCommandLineHandler]; var components = [nsBrowserContentHandler, nsDefaultCommandLineHandler];
var NSGetFactory = XPCOMUtils.generateNSGetFactory(components); this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

2
browser/components/nsBrowserGlue.js
View File

@ -1751,4 +1751,4 @@ ContentPermissionPrompt.prototype = {
}; };
var components = [BrowserGlue, ContentPermissionPrompt]; var components = [BrowserGlue, ContentPermissionPrompt];
var NSGetFactory = XPCOMUtils.generateNSGetFactory(components); this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

2
browser/components/places/src/PlacesProtocolHandler.js
View File

@ -46,4 +46,4 @@ PlacesProtocolHandler.prototype = {
classID: Components.ID("{6bcb9bde-9018-4443-a071-c32653469597}") classID: Components.ID("{6bcb9bde-9018-4443-a071-c32653469597}")
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([PlacesProtocolHandler]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PlacesProtocolHandler]);

4
browser/components/places/src/PlacesUIUtils.jsm
View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["PlacesUIUtils"]; this.EXPORTED_SYMBOLS = ["PlacesUIUtils"];
var Ci = Components.interfaces; var Ci = Components.interfaces;
var Cc = Components.classes; var Cc = Components.classes;
@ -21,7 +21,7 @@ XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
return PlacesUtils; return PlacesUtils;
}); });
var PlacesUIUtils = { this.PlacesUIUtils = {
ORGANIZER_LEFTPANE_VERSION: 7, ORGANIZER_LEFTPANE_VERSION: 7,
ORGANIZER_FOLDER_ANNO: "PlacesOrganizer/OrganizerFolder", ORGANIZER_FOLDER_ANNO: "PlacesOrganizer/OrganizerFolder",
ORGANIZER_QUERY_ANNO: "PlacesOrganizer/OrganizerQuery", ORGANIZER_QUERY_ANNO: "PlacesOrganizer/OrganizerQuery",

2
browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
View File

@ -591,4 +591,4 @@ PrivateBrowsingService.prototype = {
} }
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([PrivateBrowsingService]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PrivateBrowsingService]);

4
browser/components/sessionstore/src/DocumentUtils.jsm
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
EXPORTED_SYMBOLS = [ "DocumentUtils" ]; this.EXPORTED_SYMBOLS = [ "DocumentUtils" ];
const Cu = Components.utils; const Cu = Components.utils;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -10,7 +10,7 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/sessionstore/XPathGenerator.jsm"); Cu.import("resource:///modules/sessionstore/XPathGenerator.jsm");
let DocumentUtils = { this.DocumentUtils = {
/** /**
* Obtain form data for a DOMDocument instance. * Obtain form data for a DOMDocument instance.
* *

4
browser/components/sessionstore/src/SessionStorage.jsm
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
let EXPORTED_SYMBOLS = ["SessionStorage"]; this.EXPORTED_SYMBOLS = ["SessionStorage"];
const Cu = Components.utils; const Cu = Components.utils;
@ -12,7 +12,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "SessionStore", XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",
"resource:///modules/sessionstore/SessionStore.jsm"); "resource:///modules/sessionstore/SessionStore.jsm");
let SessionStorage = { this.SessionStorage = {
/** /**
* Updates all sessionStorage "super cookies" * Updates all sessionStorage "super cookies"
* @param aDocShell * @param aDocShell

4
browser/components/sessionstore/src/SessionStore.jsm
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
let EXPORTED_SYMBOLS = ["SessionStore"]; this.EXPORTED_SYMBOLS = ["SessionStore"];
const Cu = Components.utils; const Cu = Components.utils;
const Cc = Components.classes; const Cc = Components.classes;
@ -99,7 +99,7 @@ function debug(aMsg) {
Services.console.logStringMessage(aMsg); Services.console.logStringMessage(aMsg);
} }
let SessionStore = { this.SessionStore = {
get canRestoreLastSession() { get canRestoreLastSession() {
return SessionStoreInternal.canRestoreLastSession; return SessionStoreInternal.canRestoreLastSession;
}, },

4
browser/components/sessionstore/src/XPathGenerator.jsm
View File

@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
let EXPORTED_SYMBOLS = ["XPathGenerator"]; this.EXPORTED_SYMBOLS = ["XPathGenerator"];
let XPathGenerator = { this.XPathGenerator = {
// these two hashes should be kept in sync // these two hashes should be kept in sync
namespaceURIs: { "xhtml": "http://www.w3.org/1999/xhtml" }, namespaceURIs: { "xhtml": "http://www.w3.org/1999/xhtml" },
namespacePrefixes: { "http://www.w3.org/1999/xhtml": "xhtml" }, namespacePrefixes: { "http://www.w3.org/1999/xhtml": "xhtml" },

2
browser/components/sessionstore/src/nsSessionStartup.js
View File

@ -319,4 +319,4 @@ SessionStartup.prototype = {
classID: Components.ID("{ec7a6c20-e081-11da-8ad9-0800200c9a66}"), classID: Components.ID("{ec7a6c20-e081-11da-8ad9-0800200c9a66}"),
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStartup]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStartup]);

2
browser/components/sessionstore/src/nsSessionStore.js
View File

@ -34,4 +34,4 @@ SessionStoreService.prototype.classID =
SessionStoreService.prototype.QueryInterface = SessionStoreService.prototype.QueryInterface =
XPCOMUtils.generateQI([Ci.nsISessionStore]); XPCOMUtils.generateQI([Ci.nsISessionStore]);
let NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStoreService]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStoreService]);

2
browser/components/shell/src/nsSetDefaultBrowser.js
View File

@ -28,4 +28,4 @@ nsSetDefaultBrowser.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]), QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSetDefaultBrowser]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSetDefaultBrowser]);

2
browser/components/sidebar/nsSidebar.js
View File

@ -183,7 +183,7 @@ nsSidebar.prototype.classInfo = XPCOMUtils.generateCI({classID: SIDEBAR_CID,
nsSidebar.prototype.QueryInterface = XPCOMUtils.generateQI([nsISidebar, nsISidebarExternal]); nsSidebar.prototype.QueryInterface = XPCOMUtils.generateQI([nsISidebar, nsISidebarExternal]);
var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSidebar]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSidebar]);
/* static functions */ /* static functions */
if (DEBUG) if (DEBUG)

14
browser/components/tabview/modules/utils.jsm
View File

@ -7,7 +7,7 @@
// ********** // **********
// Title: utils.js // Title: utils.js
let EXPORTED_SYMBOLS = ["Point", "Rect", "Range", "Subscribable", "Utils", "MRUList"]; this.EXPORTED_SYMBOLS = ["Point", "Rect", "Range", "Subscribable", "Utils", "MRUList"];
// ######### // #########
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -23,7 +23,7 @@ Cu.import("resource://gre/modules/Services.jsm");
// If a is a Point, creates a copy of it. Otherwise, expects a to be x, // If a is a Point, creates a copy of it. Otherwise, expects a to be x,
// and creates a Point with it along with y. If either a or y are omitted, // and creates a Point with it along with y. If either a or y are omitted,
// 0 is used in their place. // 0 is used in their place.
function Point(a, y) { this.Point = function Point(a, y) {
if (Utils.isPoint(a)) { if (Utils.isPoint(a)) {
this.x = a.x; this.x = a.x;
this.y = a.y; this.y = a.y;
@ -60,7 +60,7 @@ Point.prototype = {
// Constructor: Rect // Constructor: Rect
// If a is a Rect, creates a copy of it. Otherwise, expects a to be left, // If a is a Rect, creates a copy of it. Otherwise, expects a to be left,
// and creates a Rect with it along with top, width, and height. // and creates a Rect with it along with top, width, and height.
function Rect(a, top, width, height) { this.Rect = function Rect(a, top, width, height) {
// Note: perhaps 'a' should really be called 'rectOrLeft' // Note: perhaps 'a' should really be called 'rectOrLeft'
if (Utils.isRect(a)) { if (Utils.isRect(a)) {
this.left = a.left; this.left = a.left;
@ -251,7 +251,7 @@ Rect.prototype = {
// //
// Constructor: Range // Constructor: Range
// Creates a Range with the given min and max // Creates a Range with the given min and max
function Range(min, max) { this.Range = function Range(min, max) {
if (Utils.isRange(min) && !max) { // if the one variable given is a range, copy it. if (Utils.isRange(min) && !max) { // if the one variable given is a range, copy it.
this.min = min.min; this.min = min.min;
this.max = min.max; this.max = min.max;
@ -357,7 +357,7 @@ Range.prototype = {
// ########## // ##########
// Class: Subscribable // Class: Subscribable
// A mix-in for allowing objects to collect subscribers for custom events. // A mix-in for allowing objects to collect subscribers for custom events.
function Subscribable() { this.Subscribable = function Subscribable() {
this.subscribers = null; this.subscribers = null;
}; };
@ -438,7 +438,7 @@ Subscribable.prototype = {
// ########## // ##########
// Class: Utils // Class: Utils
// Singelton with common utility functions. // Singelton with common utility functions.
let Utils = { this.Utils = {
// ---------- // ----------
// Function: toString // Function: toString
// Prints [Utils] for debug use // Prints [Utils] for debug use
@ -768,7 +768,7 @@ let Utils = {
// //
// Constructor: MRUList // Constructor: MRUList
// If a is an array of entries, creates a copy of it. // If a is an array of entries, creates a copy of it.
function MRUList(a) { this.MRUList = function MRUList(a) {
if (Array.isArray(a)) if (Array.isArray(a))
this._list = a.concat(); this._list = a.concat();
else else

6
browser/components/thumbnails/PageThumbs.jsm
View File

@ -4,7 +4,7 @@
"use strict"; "use strict";
let EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage"]; this.EXPORTED_SYMBOLS = ["PageThumbs", "PageThumbsStorage"];
const Cu = Components.utils; const Cu = Components.utils;
const Cc = Components.classes; const Cc = Components.classes;
@ -59,7 +59,7 @@ XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
* Singleton providing functionality for capturing web page thumbnails and for * Singleton providing functionality for capturing web page thumbnails and for
* accessing them if already cached. * accessing them if already cached.
*/ */
let PageThumbs = { this.PageThumbs = {
_initialized: false, _initialized: false,
/** /**
@ -278,7 +278,7 @@ let PageThumbs = {
}, },
}; };
let PageThumbsStorage = { this.PageThumbsStorage = {
getDirectory: function Storage_getDirectory(aCreate = true) { getDirectory: function Storage_getDirectory(aCreate = true) {
return FileUtils.getDir("ProfLD", [THUMBNAIL_DIRECTORY], aCreate); return FileUtils.getDir("ProfLD", [THUMBNAIL_DIRECTORY], aCreate);
}, },

2
browser/components/thumbnails/PageThumbsProtocol.js
View File

@ -88,7 +88,7 @@ Protocol.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler]) QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
}; };
let NSGetFactory = XPCOMUtils.generateNSGetFactory([Protocol]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Protocol]);
/** /**
* Parses a given URI and extracts all parameters relevant to this protocol. * Parses a given URI and extracts all parameters relevant to this protocol.

4
browser/devtools/commandline/CmdAddon.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ "Flags" ]; this.EXPORTED_SYMBOLS = [ "Flags" ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@ -15,7 +15,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
// We need to use an object in which to store any flags because a primitive // We need to use an object in which to store any flags because a primitive
// would remain undefined. // would remain undefined.
let Flags = { this.Flags = {
addonsLoaded: false addonsLoaded: false
}; };

2
browser/devtools/commandline/CmdBreak.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");

2
browser/devtools/commandline/CmdCalllog.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");

2
browser/devtools/commandline/CmdCalllogChrome.jsm
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;

4
browser/devtools/commandline/CmdCmd.jsm
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let EXPORTED_SYMBOLS = [ "CmdCommands" ]; this.EXPORTED_SYMBOLS = [ "CmdCommands" ];
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
@ -32,7 +32,7 @@ let commands = [];
/** /**
* Exported API * Exported API
*/ */
let CmdCommands = { this.CmdCommands = {
/** /**
* Called to look in a directory pointed at by the devtools.commands.dir pref * Called to look in a directory pointed at by the devtools.commands.dir pref
* for *.mozcmd files which are then loaded. * for *.mozcmd files which are then loaded.

2
browser/devtools/commandline/CmdConsole.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");

2
browser/devtools/commandline/CmdCookie.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");

2
browser/devtools/commandline/CmdDbg.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");

2
browser/devtools/commandline/CmdEcho.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

3
browser/devtools/commandline/CmdExport.jsm
View File

@ -3,7 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ];
this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

2
browser/devtools/commandline/CmdJsb.jsm
View File

@ -6,7 +6,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
const XMLHttpRequest = const XMLHttpRequest =
Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1"); Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1");
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

2
browser/devtools/commandline/CmdPagemod.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

2
browser/devtools/commandline/CmdRestart.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");

2
browser/devtools/commandline/CmdScreenshot.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");

2
browser/devtools/commandline/Commands.jsm
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
const Cu = Components.utils; const Cu = Components.utils;

4
browser/devtools/commandline/gcli.jsm
View File

@ -24,7 +24,7 @@
* For more information, ask Joe Walker <jwalker@mozilla.com> * For more information, ask Joe Walker <jwalker@mozilla.com>
*/ */
var EXPORTED_SYMBOLS = [ "gcli" ]; this.EXPORTED_SYMBOLS = [ "gcli" ];
Components.utils.import("resource://gre/modules/devtools/Require.jsm"); Components.utils.import("resource://gre/modules/devtools/Require.jsm");
Components.utils.import("resource://gre/modules/devtools/Console.jsm"); Components.utils.import("resource://gre/modules/devtools/Console.jsm");
@ -10479,4 +10479,4 @@ define("text!gcli/ui/tooltip.html", [], "\n" +
// Satisfy EXPORTED_SYMBOLS // Satisfy EXPORTED_SYMBOLS
const gcli = require('gcli/index'); this.gcli = require('gcli/index');

4
browser/devtools/commandline/test/helpers.js
View File

@ -54,7 +54,7 @@
* of GCLI and can be run as a test case. * of GCLI and can be run as a test case.
*/ */
var EXPORTED_SYMBOLS = [ 'helpers' ]; this.EXPORTED_SYMBOLS = [ 'helpers' ];
var test = { }; var test = { };
@ -503,7 +503,7 @@ DeveloperToolbarTest.closeAllTabs = function() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
var helpers = {}; this.helpers = {};
var assert = { ok: ok, is: is, log: info }; var assert = { ok: ok, is: is, log: info };

6
browser/devtools/debugger/DebuggerUI.jsm
View File

@ -25,7 +25,7 @@ XPCOMUtils.defineLazyModuleGetter(this,
XPCOMUtils.defineLazyModuleGetter(this, XPCOMUtils.defineLazyModuleGetter(this,
"FileUtils", "resource:///modules/FileUtils.jsm"); "FileUtils", "resource:///modules/FileUtils.jsm");
let EXPORTED_SYMBOLS = ["DebuggerUI"]; this.EXPORTED_SYMBOLS = ["DebuggerUI"];
/** /**
* Provides a simple mechanism of managing debugger instances. * Provides a simple mechanism of managing debugger instances.
@ -33,10 +33,10 @@ let EXPORTED_SYMBOLS = ["DebuggerUI"];
* @param nsIDOMWindow aWindow * @param nsIDOMWindow aWindow
* The chrome window for which the DebuggerUI instance is created. * The chrome window for which the DebuggerUI instance is created.
*/ */
function DebuggerUI(aWindow) { this.DebuggerUI = function DebuggerUI(aWindow) {
this.chromeWindow = aWindow; this.chromeWindow = aWindow;
this.listenToTabs(); this.listenToTabs();
} };
DebuggerUI.prototype = { DebuggerUI.prototype = {
/** /**

2
browser/devtools/highlighter/CmdInspect.jsm
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

4
browser/devtools/highlighter/highlighter.jsm
View File

@ -12,7 +12,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/devtools/LayoutHelpers.jsm"); Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
var EXPORTED_SYMBOLS = ["Highlighter"]; this.EXPORTED_SYMBOLS = ["Highlighter"];
const INSPECTOR_INVISIBLE_ELEMENTS = { const INSPECTOR_INVISIBLE_ELEMENTS = {
"head": true, "head": true,
@ -113,7 +113,7 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
* *
* @param object aWindow * @param object aWindow
*/ */
function Highlighter(aWindow) this.Highlighter = function Highlighter(aWindow)
{ {
this.chromeWin = aWindow; this.chromeWin = aWindow;
this.tabbrowser = aWindow.gBrowser; this.tabbrowser = aWindow.gBrowser;

4
browser/devtools/highlighter/inspector.jsm
View File

@ -9,7 +9,7 @@ const Cu = Components.utils;
const Ci = Components.interfaces; const Ci = Components.interfaces;
const Cr = Components.results; const Cr = Components.results;
var EXPORTED_SYMBOLS = ["InspectorUI"]; this.EXPORTED_SYMBOLS = ["InspectorUI"];
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@ -411,7 +411,7 @@ Inspector.prototype = {
* @param nsIDOMWindow aWindow * @param nsIDOMWindow aWindow
* The chrome window for which the Inspector instance is created. * The chrome window for which the Inspector instance is created.
*/ */
function InspectorUI(aWindow) this.InspectorUI = function InspectorUI(aWindow)
{ {
// Let style inspector tools register themselves. // Let style inspector tools register themselves.
let tmp = {}; let tmp = {};

4
browser/devtools/highlighter/test/helpers.js
View File

@ -54,7 +54,7 @@
* of GCLI and can be run as a test case. * of GCLI and can be run as a test case.
*/ */
var EXPORTED_SYMBOLS = [ 'helpers' ]; this.EXPORTED_SYMBOLS = [ 'helpers' ];
var test = { }; var test = { };
@ -496,7 +496,7 @@ DeveloperToolbarTest.closeAllTabs = function() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
var helpers = {}; this.helpers = {};
helpers._display = undefined; helpers._display = undefined;

4
browser/devtools/layoutview/LayoutView.jsm
View File

@ -12,9 +12,9 @@ Cu.import("resource:///modules/inspector.jsm");
Cu.import("resource:///modules/devtools/LayoutHelpers.jsm"); Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
Cu.import("resource:///modules/devtools/CssLogic.jsm"); Cu.import("resource:///modules/devtools/CssLogic.jsm");
var EXPORTED_SYMBOLS = ["LayoutView"]; this.EXPORTED_SYMBOLS = ["LayoutView"];
function LayoutView(aOptions) this.LayoutView = function LayoutView(aOptions)
{ {
this.chromeDoc = aOptions.document; this.chromeDoc = aOptions.document;
this.inspector = aOptions.inspector; this.inspector = aOptions.inspector;

4
browser/devtools/markupview/MarkupView.jsm
View File

@ -13,7 +13,7 @@ const PAGE_SIZE = 10;
const PREVIEW_AREA = 700; const PREVIEW_AREA = 700;
var EXPORTED_SYMBOLS = ["MarkupView"]; this.EXPORTED_SYMBOLS = ["MarkupView"];
Cu.import("resource:///modules/devtools/LayoutHelpers.jsm"); Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
Cu.import("resource:///modules/devtools/CssRuleView.jsm"); Cu.import("resource:///modules/devtools/CssRuleView.jsm");
@ -39,7 +39,7 @@ Cu.import("resource://gre/modules/Services.jsm");
* @param iframe aFrame * @param iframe aFrame
* An iframe in which the caller has kindly loaded markup-view.xhtml. * An iframe in which the caller has kindly loaded markup-view.xhtml.
*/ */
function MarkupView(aInspector, aFrame) this.MarkupView = function MarkupView(aInspector, aFrame)
{ {
this._inspector = aInspector; this._inspector = aInspector;
this._frame = aFrame; this._frame = aFrame;

2
browser/devtools/responsivedesign/CmdResize.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

4
browser/devtools/responsivedesign/responsivedesign.jsm
View File

@ -12,7 +12,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/devtools/FloatingScrollbars.jsm"); Cu.import("resource:///modules/devtools/FloatingScrollbars.jsm");
Cu.import("resource:///modules/devtools/EventEmitter.jsm"); Cu.import("resource:///modules/devtools/EventEmitter.jsm");
var EXPORTED_SYMBOLS = ["ResponsiveUIManager"]; this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"];
const MIN_WIDTH = 50; const MIN_WIDTH = 50;
const MIN_HEIGHT = 50; const MIN_HEIGHT = 50;
@ -20,7 +20,7 @@ const MIN_HEIGHT = 50;
const MAX_WIDTH = 10000; const MAX_WIDTH = 10000;
const MAX_HEIGHT = 10000; const MAX_HEIGHT = 10000;
let ResponsiveUIManager = { this.ResponsiveUIManager = {
/** /**
* Check if the a tab is in a responsive mode. * Check if the a tab is in a responsive mode.
* Leave the responsive mode if active, * Leave the responsive mode if active,

4
browser/devtools/responsivedesign/test/helpers.js
View File

@ -54,7 +54,7 @@
* of GCLI and can be run as a test case. * of GCLI and can be run as a test case.
*/ */
var EXPORTED_SYMBOLS = [ 'helpers' ]; this.EXPORTED_SYMBOLS = [ 'helpers' ];
var test = { }; var test = { };
@ -496,7 +496,7 @@ DeveloperToolbarTest.closeAllTabs = function() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
var helpers = {}; this.helpers = {};
helpers._display = undefined; helpers._display = undefined;

4
browser/devtools/scratchpad/scratchpad-manager.jsm
View File

@ -5,7 +5,7 @@
"use strict"; "use strict";
var EXPORTED_SYMBOLS = ["ScratchpadManager"]; this.EXPORTED_SYMBOLS = ["ScratchpadManager"];
const Cc = Components.classes; const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -21,7 +21,7 @@ Cu.import("resource://gre/modules/Services.jsm");
* of open scratchpads for session restore. There's only one ScratchpadManager in * of open scratchpads for session restore. There's only one ScratchpadManager in
* the life of the browser. * the life of the browser.
*/ */
var ScratchpadManager = { this.ScratchpadManager = {
_nextUid: 1, _nextUid: 1,
_scratchpads: [], _scratchpads: [],

10
browser/devtools/shared/Browser.jsm
View File

@ -11,14 +11,14 @@
* forwards to dump(); * forwards to dump();
*/ */
const EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ]; this.EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ];
/** /**
* Expose Node/HTMLElement objects. This allows us to use the Node constants * Expose Node/HTMLElement objects. This allows us to use the Node constants
* without resorting to hardcoded numbers * without resorting to hardcoded numbers
*/ */
const Node = Components.interfaces.nsIDOMNode; this.Node = Components.interfaces.nsIDOMNode;
const HTMLElement = Components.interfaces.nsIDOMHTMLElement; this.HTMLElement = Components.interfaces.nsIDOMHTMLElement;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
@ -66,7 +66,7 @@ TimerCallback.prototype.notify = function(timer) {
* @return the ID of the timeout, which can be used later with * @return the ID of the timeout, which can be used later with
* window.clearTimeout. * window.clearTimeout.
*/ */
const setTimeout = function setTimeout(callback, delay) { this.setTimeout = function setTimeout(callback, delay) {
const timer = Components.classes["@mozilla.org/timer;1"] const timer = Components.classes["@mozilla.org/timer;1"]
.createInstance(Components.interfaces.nsITimer); .createInstance(Components.interfaces.nsITimer);
@ -83,7 +83,7 @@ const setTimeout = function setTimeout(callback, delay) {
* @param timerID the ID of the timeout you wish to clear, as returned by * @param timerID the ID of the timeout you wish to clear, as returned by
* window.setTimeout(). * window.setTimeout().
*/ */
const clearTimeout = function clearTimeout(timerID) { this.clearTimeout = function clearTimeout(timerID) {
let timer = timers[timerID]; let timer = timers[timerID];
if (timer) { if (timer) {
timer.cancel(); timer.cancel();

4
browser/devtools/shared/DOMHelpers.jsm
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const EXPORTED_SYMBOLS = ["DOMHelpers"]; this.EXPORTED_SYMBOLS = ["DOMHelpers"];
/** /**
* DOMHelpers * DOMHelpers
@ -12,7 +12,7 @@ const EXPORTED_SYMBOLS = ["DOMHelpers"];
* @param nsIDOMWindow aWindow * @param nsIDOMWindow aWindow
* The content window, owning the document to traverse. * The content window, owning the document to traverse.
*/ */
function DOMHelpers(aWindow) { this.DOMHelpers = function DOMHelpers(aWindow) {
this.window = aWindow; this.window = aWindow;
}; };

4
browser/devtools/shared/DeveloperToolbar.jsm
View File

@ -4,7 +4,7 @@
"use strict"; "use strict";
const EXPORTED_SYMBOLS = [ "DeveloperToolbar" ]; this.EXPORTED_SYMBOLS = [ "DeveloperToolbar" ];
const NS_XHTML = "http://www.w3.org/1999/xhtml"; const NS_XHTML = "http://www.w3.org/1999/xhtml";
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@ -46,7 +46,7 @@ XPCOMUtils.defineLazyGetter(this, "isLinux", function () {
* @param aChromeWindow The browser window to which this toolbar is attached * @param aChromeWindow The browser window to which this toolbar is attached
* @param aToolbarElement See browser.xul:<toolbar id="developer-toolbar"> * @param aToolbarElement See browser.xul:<toolbar id="developer-toolbar">
*/ */
function DeveloperToolbar(aChromeWindow, aToolbarElement) this.DeveloperToolbar = function DeveloperToolbar(aChromeWindow, aToolbarElement)
{ {
this._chromeWindow = aChromeWindow; this._chromeWindow = aChromeWindow;

6
browser/devtools/shared/EventEmitter.jsm
View File

@ -1,6 +1,8 @@
var EXPORTED_SYMBOLS = ["EventEmitter"]; // XXXkhuey this should have a license header.
function EventEmitter() { this.EXPORTED_SYMBOLS = ["EventEmitter"];
this.EventEmitter = function EventEmitter() {
} }
EventEmitter.prototype = { EventEmitter.prototype = {

6
browser/devtools/shared/FloatingScrollbars.jsm
View File

@ -6,7 +6,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
const EXPORTED_SYMBOLS = [ "switchToFloatingScrollbars", "switchToNativeScrollbars" ]; this.EXPORTED_SYMBOLS = [ "switchToFloatingScrollbars", "switchToNativeScrollbars" ];
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
@ -20,7 +20,7 @@ let trackedTabs = new WeakMap();
* @param aTab the targeted tab. * @param aTab the targeted tab.
* *
*/ */
function switchToFloatingScrollbars(aTab) { this.switchToFloatingScrollbars = function switchToFloatingScrollbars(aTab) {
let mgr = trackedTabs.get(aTab); let mgr = trackedTabs.get(aTab);
if (!mgr) { if (!mgr) {
mgr = new ScrollbarManager(aTab); mgr = new ScrollbarManager(aTab);
@ -34,7 +34,7 @@ function switchToFloatingScrollbars(aTab) {
* @param aTab the targeted tab. * @param aTab the targeted tab.
* *
*/ */
function switchToNativeScrollbars(aTab) { this.switchToNativeScrollbars = function switchToNativeScrollbars(aTab) {
let mgr = trackedTabs.get(aTab); let mgr = trackedTabs.get(aTab);
if (mgr) { if (mgr) {
mgr.reset(); mgr.reset();

4
browser/devtools/shared/Jsbeautify.jsm
View File

@ -56,9 +56,9 @@
*/ */
let EXPORTED_SYMBOLS = ["js_beautify"]; this.EXPORTED_SYMBOLS = ["js_beautify"];
function js_beautify(js_source_text, options) { this.js_beautify = function js_beautify(js_source_text, options) {
var input, output, token_text, last_type, last_text, last_last_text, last_word, flags, flag_store, indent_string; var input, output, token_text, last_type, last_text, last_last_text, last_word, flags, flag_store, indent_string;
var whitespace, wordchar, punct, parser_pos, line_starters, digits; var whitespace, wordchar, punct, parser_pos, line_starters, digits;

4
browser/devtools/shared/LayoutHelpers.jsm
View File

@ -18,9 +18,9 @@ XPCOMUtils.defineLazyGetter(this, "PlatformKeys", function() {
"chrome://global-platform/locale/platformKeys.properties"); "chrome://global-platform/locale/platformKeys.properties");
}); });
var EXPORTED_SYMBOLS = ["LayoutHelpers"]; this.EXPORTED_SYMBOLS = ["LayoutHelpers"];
LayoutHelpers = { this.LayoutHelpers = LayoutHelpers = {
/** /**
* Compute the position and the dimensions for the visible portion * Compute the position and the dimensions for the visible portion

4
browser/devtools/shared/SplitView.jsm
View File

@ -5,7 +5,7 @@
"use strict"; "use strict";
const EXPORTED_SYMBOLS = ["SplitView"]; this.EXPORTED_SYMBOLS = ["SplitView"];
/* this must be kept in sync with CSS (ie. splitview.css) */ /* this must be kept in sync with CSS (ie. splitview.css) */
const LANDSCAPE_MEDIA_QUERY = "(min-width: 551px)"; const LANDSCAPE_MEDIA_QUERY = "(min-width: 551px)";
@ -26,7 +26,7 @@ const BINDING_USERDATA = "splitview-binding";
* @param DOMElement aRoot * @param DOMElement aRoot
* @see appendItem * @see appendItem
*/ */
function SplitView(aRoot) this.SplitView = function SplitView(aRoot)
{ {
this._root = aRoot; this._root = aRoot;
this._controller = aRoot.querySelector(".splitview-controller"); this._controller = aRoot.querySelector(".splitview-controller");

6
browser/devtools/shared/Templater.jsm
View File

@ -15,7 +15,7 @@
*/ */
var EXPORTED_SYMBOLS = [ "Templater", "template" ]; this.EXPORTED_SYMBOLS = [ "Templater", "template" ];
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
const Node = Components.interfaces.nsIDOMNode; const Node = Components.interfaces.nsIDOMNode;
@ -44,7 +44,7 @@ const Node = Components.interfaces.nsIDOMNode;
* convert null/undefined to ''. By setting blankNullUndefined:true, this * convert null/undefined to ''. By setting blankNullUndefined:true, this
* conversion is handled by DOMTemplate * conversion is handled by DOMTemplate
*/ */
function template(node, data, options) { this.template = function template(node, data, options) {
var template = new Templater(options || {}); var template = new Templater(options || {});
template.processNode(node, data); template.processNode(node, data);
return template; return template;
@ -54,7 +54,7 @@ function template(node, data, options) {
* Construct a Templater object. Use template() in preference to this ctor. * Construct a Templater object. Use template() in preference to this ctor.
* @deprecated Use template(node, data, options); * @deprecated Use template(node, data, options);
*/ */
function Templater(options) { this.Templater = function Templater(options) {
if (options == null) { if (options == null) {
options = { allowEval: true }; options = { allowEval: true };
} }

4
browser/devtools/shared/Undo.jsm
View File

@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const Cu = Components.utils; const Cu = Components.utils;
var EXPORTED_SYMBOLS=["UndoStack"]; this.EXPORTED_SYMBOLS = ["UndoStack"];
/** /**
* A simple undo stack manager. * A simple undo stack manager.
@ -19,7 +19,7 @@ var EXPORTED_SYMBOLS=["UndoStack"];
* @param integer aMaxUndo Maximum number of undo steps. * @param integer aMaxUndo Maximum number of undo steps.
* defaults to 50. * defaults to 50.
*/ */
function UndoStack(aMaxUndo) this.UndoStack = function UndoStack(aMaxUndo)
{ {
this.maxUndo = aMaxUndo || 50; this.maxUndo = aMaxUndo || 50;
this._stack = []; this._stack = [];

4
browser/devtools/shared/test/helpers.js
View File

@ -54,7 +54,7 @@
* of GCLI and can be run as a test case. * of GCLI and can be run as a test case.
*/ */
var EXPORTED_SYMBOLS = [ 'helpers' ]; this.EXPORTED_SYMBOLS = [ 'helpers' ];
var test = { }; var test = { };
@ -496,7 +496,7 @@ DeveloperToolbarTest.closeAllTabs = function() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
var helpers = {}; this.helpers = {};
helpers._display = undefined; helpers._display = undefined;

4
browser/devtools/sourceeditor/source-editor-orion.jsm
View File

@ -140,7 +140,7 @@ if (Services.appinfo.OS == "WINNT" ||
}); });
} }
var EXPORTED_SYMBOLS = ["SourceEditor"]; this.EXPORTED_SYMBOLS = ["SourceEditor"];
/** /**
* The SourceEditor object constructor. The SourceEditor component allows you to * The SourceEditor object constructor. The SourceEditor component allows you to
@ -151,7 +151,7 @@ var EXPORTED_SYMBOLS = ["SourceEditor"];
* *
* @constructor * @constructor
*/ */
function SourceEditor() { this.SourceEditor = function SourceEditor() {
// Update the SourceEditor defaults from user preferences. // Update the SourceEditor defaults from user preferences.
SourceEditor.DEFAULTS.tabSize = SourceEditor.DEFAULTS.tabSize =

4
browser/devtools/sourceeditor/source-editor-ui.jsm
View File

@ -9,12 +9,12 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["SourceEditorUI"]; this.EXPORTED_SYMBOLS = ["SourceEditorUI"];
/** /**
* The Source Editor component user interface. * The Source Editor component user interface.
*/ */
function SourceEditorUI(aEditor) this.SourceEditorUI = function SourceEditorUI(aEditor)
{ {
this.editor = aEditor; this.editor = aEditor;
this._onDirtyChanged = this._onDirtyChanged.bind(this); this._onDirtyChanged = this._onDirtyChanged.bind(this);

4
browser/devtools/sourceeditor/source-editor.jsm
View File

@ -34,8 +34,8 @@ try {
} }
// Export the SourceEditor. // Export the SourceEditor.
var SourceEditor = obj.SourceEditor; this.SourceEditor = obj.SourceEditor;
var EXPORTED_SYMBOLS = ["SourceEditor"]; this.EXPORTED_SYMBOLS = ["SourceEditor"];
// Add the constants used by all SourceEditors. // Add the constants used by all SourceEditors.

2
browser/devtools/styleeditor/CmdEdit.jsm
View File

@ -4,7 +4,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
let EXPORTED_SYMBOLS = [ ]; this.EXPORTED_SYMBOLS = [ ];
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/devtools/gcli.jsm"); Cu.import("resource:///modules/devtools/gcli.jsm");

8
browser/devtools/styleeditor/StyleEditor.jsm
View File

@ -5,7 +5,7 @@
"use strict"; "use strict";
const EXPORTED_SYMBOLS = ["StyleEditor", "StyleEditorFlags", "StyleEditorManager"]; this.EXPORTED_SYMBOLS = ["StyleEditor", "StyleEditorFlags", "StyleEditorManager"];
const Cc = Components.classes; const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -65,7 +65,7 @@ const TRANSITIONS_ENABLED = Services.prefs.getBoolPref(TRANSITIONS_PREF);
* @see inputElement * @see inputElement
* @see StyleEditorChrome * @see StyleEditorChrome
*/ */
function StyleEditor(aDocument, aStyleSheet) this.StyleEditor = function StyleEditor(aDocument, aStyleSheet)
{ {
assert(aDocument, "Argument 'aDocument' is required."); assert(aDocument, "Argument 'aDocument' is required.");
@ -1143,7 +1143,7 @@ StyleEditor.prototype = {
* *
* @see StyleEditor.setFlag * @see StyleEditor.setFlag
*/ */
let StyleEditorFlags = { this.StyleEditorFlags = {
DISABLED: "disabled", DISABLED: "disabled",
ERROR: "error", ERROR: "error",
IMPORTED: "imported", IMPORTED: "imported",
@ -1282,7 +1282,7 @@ function setupBracketCompletion(aSourceEditor)
* Manage the different editors instances. * Manage the different editors instances.
*/ */
function StyleEditorManager(aWindow) { this.StyleEditorManager = function StyleEditorManager(aWindow) {
this.chromeWindow = aWindow; this.chromeWindow = aWindow;
this.listenToTabs(); this.listenToTabs();
this.editors = new WeakMap(); this.editors = new WeakMap();

4
browser/devtools/styleeditor/StyleEditorChrome.jsm
View File

@ -5,7 +5,7 @@
"use strict"; "use strict";
const EXPORTED_SYMBOLS = ["StyleEditorChrome"]; this.EXPORTED_SYMBOLS = ["StyleEditorChrome"];
const Cc = Components.classes; const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -32,7 +32,7 @@ const STYLE_EDITOR_TEMPLATE = "stylesheet";
* @param DOMWindow aContentWindow * @param DOMWindow aContentWindow
* Content DOMWindow to attach to this chrome. * Content DOMWindow to attach to this chrome.
*/ */
function StyleEditorChrome(aRoot, aContentWindow) this.StyleEditorChrome = function StyleEditorChrome(aRoot, aContentWindow)
{ {
assert(aRoot, "Argument 'aRoot' is required to initialize StyleEditorChrome."); assert(aRoot, "Argument 'aRoot' is required to initialize StyleEditorChrome.");

16
browser/devtools/styleeditor/StyleEditorUtil.jsm
View File

@ -5,11 +5,11 @@
"use strict"; "use strict";
const EXPORTED_SYMBOLS = [ this.EXPORTED_SYMBOLS = [
"_", "_",
"assert", "assert",
"attr", "attr", // XXXkhuey unused?
"getCurrentBrowserTabContentWindow", "getCurrentBrowserTabContentWindow", // XXXkhuey unused?
"log", "log",
"text", "text",
"wire" "wire"
@ -35,7 +35,7 @@ const gStringBundle = Services.strings.createBundle(PROPERTIES_URL);
* Optional arguments to format in the string. * Optional arguments to format in the string.
* @return string * @return string
*/ */
function _(aName) this._ = function _(aName)
{ {
if (arguments.length == 1) { if (arguments.length == 1) {
@ -53,7 +53,7 @@ function _(aName)
* Optional message. * Optional message.
* @return aExpression * @return aExpression
*/ */
function assert(aExpression, aMessage) this.assert = function assert(aExpression, aMessage)
{ {
if (!!!(aExpression)) { if (!!!(aExpression)) {
let msg = aMessage ? "ASSERTION FAILURE:" + aMessage : "ASSERTION FAILURE"; let msg = aMessage ? "ASSERTION FAILURE:" + aMessage : "ASSERTION FAILURE";
@ -76,7 +76,7 @@ function assert(aExpression, aMessage)
* Text content of matching element or null if there were no element * Text content of matching element or null if there were no element
* matching aSelector. * matching aSelector.
*/ */
function text(aRoot, aSelector, aText) this.text = function text(aRoot, aSelector, aText)
{ {
let element = aRoot.querySelector(aSelector); let element = aRoot.querySelector(aSelector);
if (!element) { if (!element) {
@ -113,7 +113,7 @@ function forEach(aObject, aCallback)
* One or multiple arguments to log. * One or multiple arguments to log.
* If multiple arguments are given, they will be joined by " " in the log. * If multiple arguments are given, they will be joined by " " in the log.
*/ */
function log() this.log = function log()
{ {
console.logStringMessage(Array.prototype.slice.call(arguments).join(" ")); console.logStringMessage(Array.prototype.slice.call(arguments).join(" "));
} }
@ -136,7 +136,7 @@ function log()
* If aDescriptor is a function, the argument is equivalent to : * If aDescriptor is a function, the argument is equivalent to :
* {events: {'click': aDescriptor}} * {events: {'click': aDescriptor}}
*/ */
function wire(aRoot, aSelectorOrElement, aDescriptor) this.wire = function wire(aRoot, aSelectorOrElement, aDescriptor)
{ {
let matches; let matches;
if (typeof(aSelectorOrElement) == "string") { // selector if (typeof(aSelectorOrElement) == "string") { // selector

4
browser/devtools/styleeditor/test/helpers.js
View File

@ -54,7 +54,7 @@
* of GCLI and can be run as a test case. * of GCLI and can be run as a test case.
*/ */
var EXPORTED_SYMBOLS = [ 'helpers' ]; this.EXPORTED_SYMBOLS = [ 'helpers' ];
var test = { }; var test = { };
@ -496,7 +496,7 @@ DeveloperToolbarTest.closeAllTabs = function() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
var helpers = {}; this.helpers = {};
helpers._display = undefined; helpers._display = undefined;

6
browser/devtools/styleinspector/CssHtmlTree.jsm
View File

@ -18,7 +18,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/devtools/CssLogic.jsm"); Cu.import("resource:///modules/devtools/CssLogic.jsm");
Cu.import("resource:///modules/devtools/Templater.jsm"); Cu.import("resource:///modules/devtools/Templater.jsm");
var EXPORTED_SYMBOLS = ["CssHtmlTree", "PropertyView"]; this.EXPORTED_SYMBOLS = ["CssHtmlTree", "PropertyView"];
/** /**
* Helper for long-running processes that should yield occasionally to * Helper for long-running processes that should yield occasionally to
@ -116,7 +116,7 @@ UpdateProcess.prototype = {
* @params {StyleInspector} aStyleInspector The owner of this CssHtmlTree * @params {StyleInspector} aStyleInspector The owner of this CssHtmlTree
* @constructor * @constructor
*/ */
function CssHtmlTree(aStyleInspector) this.CssHtmlTree = function CssHtmlTree(aStyleInspector)
{ {
this.styleWin = aStyleInspector.iframe; this.styleWin = aStyleInspector.iframe;
this.styleInspector = aStyleInspector; this.styleInspector = aStyleInspector;
@ -719,7 +719,7 @@ CssHtmlTree.prototype = {
* @param {string} aName the CSS property name for which this PropertyView * @param {string} aName the CSS property name for which this PropertyView
* instance will render the rules. * instance will render the rules.
*/ */
function PropertyView(aTree, aName) this.PropertyView = function PropertyView(aTree, aName)
{ {
this.tree = aTree; this.tree = aTree;
this.name = aName; this.name = aName;

Some files were not shown because too many files have changed in this diff Show More