From 9e5b52b450637f587c3a50c54fad555032976d50 Mon Sep 17 00:00:00 2001 From: Fedor Date: Fri, 3 Apr 2020 20:54:01 +0300 Subject: [PATCH] Remove named function syntax from internal *.js files. --- .../basilisk/base/content/browser-ctrlTab.js | 50 ++-- .../basilisk/base/content/browser-fullZoom.js | 44 +-- .../base/content/browser-gestureSupport.js | 80 ++--- .../basilisk/base/content/browser-places.js | 110 +++---- .../basilisk/base/content/browser-plugins.js | 4 +- .../basilisk/base/content/browser-syncui.js | 48 +-- .../content/browser-tabsintitlebar-stub.js | 2 +- .../base/content/browser-tabsintitlebar.js | 2 +- .../base/content/browser-thumbnails.js | 18 +- application/basilisk/base/content/browser.js | 14 +- .../basilisk/base/content/newtab/cells.js | 6 +- .../basilisk/base/content/newtab/drag.js | 10 +- .../base/content/newtab/dragDataHelper.js | 2 +- .../basilisk/base/content/newtab/drop.js | 16 +- .../base/content/newtab/dropPreview.js | 8 +- .../base/content/newtab/dropTargetShim.js | 2 +- .../basilisk/base/content/newtab/grid.js | 18 +- .../basilisk/base/content/newtab/page.js | 12 +- .../basilisk/base/content/newtab/sites.js | 30 +- .../base/content/newtab/transformations.js | 26 +- .../basilisk/base/content/newtab/undo.js | 12 +- .../basilisk/base/content/newtab/updater.js | 14 +- .../basilisk/base/content/nsContextMenu.js | 44 +-- .../basilisk/base/content/sanitizeDialog.js | 18 +- .../basilisk/components/distribution.js | 8 +- .../components/feeds/content/subscribe.js | 6 +- .../migration/ChromeProfileMigrator.js | 6 +- .../components/migration/IEProfileMigrator.js | 8 +- .../components/migration/MSMigrationUtils.jsm | 2 +- .../components/migration/MigrationUtils.jsm | 18 +- .../migration/SafariProfileMigrator.js | 26 +- .../components/nsBrowserContentHandler.js | 14 +- .../basilisk/components/nsBrowserGlue.js | 42 +-- .../components/places/PlacesUIUtils.jsm | 44 +-- .../places/content/bookmarkProperties.js | 20 +- .../places/content/browserPlacesViews.js | 98 +++---- .../components/places/content/controller.js | 68 ++--- .../places/content/editBookmarkOverlay.js | 2 +- .../places/content/moveBookmarks.js | 4 +- .../components/places/content/places.js | 88 +++--- .../components/places/content/sidebarUtils.js | 8 +- .../components/places/content/treeView.js | 90 +++--- .../preferences/applicationManager.js | 10 +- .../components/preferences/cookies.js | 4 +- .../preferences/in-content/privacy.js | 12 +- .../preferences/in-content/search.js | 20 +- .../components/preferences/selectBookmark.js | 8 +- .../search/service/nsSearchService.js | 146 ++++----- .../components/sessionstore/SessionStore.jsm | 200 ++++++------- .../sessionstore/nsSessionStartup.js | 8 +- .../components/shell/nsSetDefaultBrowser.js | 2 +- .../basilisk/components/sync/addDevice.js | 20 +- .../basilisk/components/sync/genericChange.js | 14 +- application/basilisk/components/sync/quota.js | 24 +- application/basilisk/components/sync/setup.js | 24 +- application/basilisk/components/sync/utils.js | 4 +- .../basilisk/modules/NetworkPrioritizer.jsm | 24 +- application/basilisk/modules/RecentWindow.jsm | 2 +- .../basilisk/modules/WindowsJumpLists.jsm | 50 ++-- .../palemoon/base/content/browser-fullZoom.js | 44 +-- .../base/content/browser-gestureSupport.js | 86 +++--- .../palemoon/base/content/browser-places.js | 106 +++---- .../palemoon/base/content/browser-plugins.js | 22 +- .../palemoon/base/content/browser-syncui.js | 44 +-- .../base/content/browser-tabPreviews.js | 90 +++--- .../base/content/browser-thumbnails.js | 20 +- application/palemoon/base/content/browser.js | 24 +- .../palemoon/base/content/nsContextMenu.js | 48 +-- .../palemoon/base/content/sanitizeDialog.js | 22 +- .../palemoon/components/distribution.js | 12 +- .../components/downloads/DownloadsCommon.jsm | 108 +++---- .../components/downloads/DownloadsLogger.jsm | 6 +- .../components/downloads/DownloadsStartup.js | 4 +- .../components/downloads/DownloadsUI.js | 6 +- .../content/allDownloadsViewOverlay.js | 64 ++-- .../content/contentAreaDownloadsView.js | 2 +- .../components/downloads/content/downloads.js | 100 +++---- .../components/downloads/content/indicator.js | 34 +-- .../components/feeds/FeedConverter.js | 38 +-- .../palemoon/components/feeds/FeedWriter.js | 68 ++--- .../components/feeds/WebContentConverter.js | 80 ++--- .../components/feeds/content/subscribe.js | 6 +- .../components/fuel/fuelApplication.js | 82 +++--- .../palemoon/components/newtab/cells.js | 6 +- .../palemoon/components/newtab/drag.js | 10 +- .../components/newtab/dragDataHelper.js | 2 +- .../palemoon/components/newtab/drop.js | 16 +- .../palemoon/components/newtab/dropPreview.js | 16 +- .../components/newtab/dropTargetShim.js | 2 +- .../palemoon/components/newtab/grid.js | 14 +- .../palemoon/components/newtab/page.js | 12 +- .../palemoon/components/newtab/sites.js | 30 +- .../components/newtab/transformations.js | 30 +- .../palemoon/components/newtab/undo.js | 12 +- .../palemoon/components/newtab/updater.js | 14 +- .../palemoon/components/nsAboutRedirector.js | 2 +- .../components/nsBrowserContentHandler.js | 14 +- .../palemoon/components/nsBrowserGlue.js | 68 ++--- .../components/pageinfo/permissions.js | 14 +- .../components/places/PlacesUIUtils.jsm | 66 ++--- .../places/content/bookmarkProperties.js | 46 +-- .../places/content/browserPlacesViews.js | 128 ++++---- .../components/places/content/controller.js | 92 +++--- .../places/content/editBookmarkOverlay.js | 72 ++--- .../places/content/moveBookmarks.js | 4 +- .../components/places/content/places.js | 104 +++---- .../components/places/content/sidebarUtils.js | 8 +- .../components/places/content/treeView.js | 108 +++---- .../components/preferences/advanced.js | 2 +- .../preferences/applicationManager.js | 10 +- .../components/preferences/cookies.js | 4 +- .../components/preferences/privacy.js | 12 +- .../components/preferences/selectBookmark.js | 8 +- .../search/content/engineManager.js | 50 ++-- .../components/sessionstore/DocumentUtils.jsm | 6 +- .../sessionstore/SessionStorage.jsm | 12 +- .../components/sessionstore/SessionStore.jsm | 276 +++++++++--------- .../sessionstore/XPathGenerator.jsm | 10 +- .../components/sessionstore/_SessionFile.jsm | 30 +- .../sessionstore/nsSessionStartup.js | 12 +- .../components/shell/nsSetDefaultBrowser.js | 2 +- .../palemoon/components/sync/addDevice.js | 22 +- .../palemoon/components/sync/genericChange.js | 14 +- application/palemoon/components/sync/quota.js | 26 +- application/palemoon/components/sync/setup.js | 20 +- application/palemoon/components/sync/utils.js | 4 +- .../modules/BrowserNewTabPreloader.jsm | 22 +- .../palemoon/modules/NetworkPrioritizer.jsm | 24 +- .../palemoon/modules/PopupNotifications.jsm | 46 +-- application/palemoon/modules/RecentWindow.jsm | 2 +- .../palemoon/modules/WindowsJumpLists.jsm | 52 ++-- .../palemoon/modules/openLocationLastURL.jsm | 2 +- 132 files changed, 2194 insertions(+), 2194 deletions(-) diff --git a/application/basilisk/base/content/browser-ctrlTab.js b/application/basilisk/base/content/browser-ctrlTab.js index c761ea095..c4b87acc7 100644 --- a/application/basilisk/base/content/browser-ctrlTab.js +++ b/application/basilisk/base/content/browser-ctrlTab.js @@ -6,7 +6,7 @@ * Tab previews utility, produces thumbnails */ var tabPreviews = { - init: function tabPreviews_init() { + init: function() { if (this._selectedTab) return; this._selectedTab = gBrowser.selectedTab; @@ -21,7 +21,7 @@ var tabPreviews = { this.aspectRatio = height.value / width.value; }, - get: function tabPreviews_get(aTab) { + get: function(aTab) { let uri = aTab.linkedBrowser.currentURI.spec; if (aTab.__thumbnail_lastURI && @@ -42,7 +42,7 @@ var tabPreviews = { return this.capture(aTab, !aTab.hasAttribute("busy")); }, - capture: function tabPreviews_capture(aTab, aShouldCache) { + capture: function(aTab, aShouldCache) { let browser = aTab.linkedBrowser; let uri = browser.currentURI.spec; let canvas = PageThumbs.createCanvas(window); @@ -67,7 +67,7 @@ var tabPreviews = { return canvas; }, - handleEvent: function tabPreviews_handleEvent(event) { + handleEvent: function(event) { switch (event.type) { case "TabSelect": if (this._selectedTab && @@ -193,7 +193,7 @@ var ctrlTab = { return this._recentlyUsedTabs; }, - init: function ctrlTab_init() { + init: function() { if (!this._recentlyUsedTabs) { tabPreviews.init(); @@ -202,13 +202,13 @@ var ctrlTab = { } }, - uninit: function ctrlTab_uninit() { + uninit: function() { this._recentlyUsedTabs = null; this._init(false); }, prefName: "browser.ctrlTab.previews", - readPref: function ctrlTab_readPref() { + readPref: function() { var enable = gPrefService.getBoolPref(this.prefName) && (!gPrefService.prefHasUserValue("browser.ctrlTab.disallowForScreenReaders") || @@ -223,7 +223,7 @@ var ctrlTab = { this.readPref(); }, - updatePreviews: function ctrlTab_updatePreviews() { + updatePreviews: function() { for (let i = 0; i < this.previews.length; i++) this.updatePreview(this.previews[i], this.tabList[i]); @@ -233,7 +233,7 @@ var ctrlTab = { this.showAllButton.hidden = !allTabs.canOpen; }, - updatePreview: function ctrlTab_updatePreview(aPreview, aTab) { + updatePreview: function(aPreview, aTab) { if (aPreview == this.showAllButton) return; @@ -267,7 +267,7 @@ var ctrlTab = { } }, - advanceFocus: function ctrlTab_advanceFocus(aForward) { + advanceFocus: function(aForward) { let selectedIndex = Array.indexOf(this.previews, this.selected); do { selectedIndex += aForward ? 1 : -1; @@ -291,12 +291,12 @@ var ctrlTab = { } }, - _mouseOverFocus: function ctrlTab_mouseOverFocus(aPreview) { + _mouseOverFocus: function(aPreview) { if (this._trackMouseOver) aPreview.focus(); }, - pick: function ctrlTab_pick(aPreview) { + pick: function(aPreview) { if (!this.tabCount) return; @@ -308,17 +308,17 @@ var ctrlTab = { this.close(select._tab); }, - showAllTabs: function ctrlTab_showAllTabs(aPreview) { + showAllTabs: function(aPreview) { this.close(); document.getElementById("Browser:ShowAllTabs").doCommand(); }, - remove: function ctrlTab_remove(aPreview) { + remove: function(aPreview) { if (aPreview._tab) gBrowser.removeTab(aPreview._tab); }, - attachTab: function ctrlTab_attachTab(aTab, aPos) { + attachTab: function(aTab, aPos) { if (aTab.closing) return; @@ -330,13 +330,13 @@ var ctrlTab = { this._recentlyUsedTabs.push(aTab); }, - detachTab: function ctrlTab_detachTab(aTab) { + detachTab: function(aTab) { var i = this._recentlyUsedTabs.indexOf(aTab); if (i >= 0) this._recentlyUsedTabs.splice(i, 1); }, - open: function ctrlTab_open() { + open: function() { if (this.isOpen) return; @@ -353,7 +353,7 @@ var ctrlTab = { }, 200, this); }, - _openPanel: function ctrlTab_openPanel() { + _openPanel: function() { tabPreviewPanelHelper.opening(this); this.panel.width = Math.min(screen.availWidth * .99, @@ -364,7 +364,7 @@ var ctrlTab = { false); }, - close: function ctrlTab_close(aTabToSelect) { + close: function(aTabToSelect) { if (!this.isOpen) return; @@ -381,7 +381,7 @@ var ctrlTab = { this.panel.hidePopup(); }, - setupGUI: function ctrlTab_setupGUI() { + setupGUI: function() { this.selected.focus(); this._selectedIndex = -1; @@ -394,7 +394,7 @@ var ctrlTab = { }, 0, this); }, - suspendGUI: function ctrlTab_suspendGUI() { + suspendGUI: function() { document.removeEventListener("keyup", this, true); for (let preview of this.previews) { @@ -447,7 +447,7 @@ var ctrlTab = { } }, - removeClosingTabFromUI: function ctrlTab_removeClosingTabFromUI(aTab) { + removeClosingTabFromUI: function(aTab) { if (this.tabCount == 2) { this.close(); return; @@ -468,7 +468,7 @@ var ctrlTab = { } }, - handleEvent: function ctrlTab_handleEvent(event) { + handleEvent: function(event) { switch (event.type) { case "SSWindowRestored": this._initRecentlyUsedTabs(); @@ -528,7 +528,7 @@ var ctrlTab = { .sort((tab1, tab2) => tab2.lastAccessed - tab1.lastAccessed); }, - _init: function ctrlTab__init(enable) { + _init: function(enable) { var toggleEventListener = enable ? "addEventListener" : "removeEventListener"; window[toggleEventListener]("SSWindowRestored", this, false); @@ -575,7 +575,7 @@ var allTabs = { return isElementVisible(this.toolbarButton); }, - open: function allTabs_open() { + open: function() { if (this.canOpen) { // Without setTimeout, the menupopup won't stay open when invoking // "View > Show All Tabs" and the menu bar auto-hides. diff --git a/application/basilisk/base/content/browser-fullZoom.js b/application/basilisk/base/content/browser-fullZoom.js index 890cd8440..7137cdb54 100644 --- a/application/basilisk/base/content/browser-fullZoom.js +++ b/application/basilisk/base/content/browser-fullZoom.js @@ -38,7 +38,7 @@ var FullZoom = { // Initialization & Destruction - init: function FullZoom_init() { + init: function() { gBrowser.addEventListener("ZoomChangeUsingMouseWheel", this); // Register ourselves with the service so we know when our pref changes. @@ -66,7 +66,7 @@ var FullZoom = { this._initialLocations = null; }, - destroy: function FullZoom_destroy() { + destroy: function() { gPrefService.removeObserver("browser.zoom.", this); this._cps2.removeObserverForName(this.name, this); gBrowser.removeEventListener("ZoomChangeUsingMouseWheel", this); @@ -77,7 +77,7 @@ var FullZoom = { // nsIDOMEventListener - handleEvent: function FullZoom_handleEvent(event) { + handleEvent: function(event) { switch (event.type) { case "ZoomChangeUsingMouseWheel": let browser = this._getTargetedBrowser(event); @@ -108,11 +108,11 @@ var FullZoom = { // nsIContentPrefObserver - onContentPrefSet: function FullZoom_onContentPrefSet(aGroup, aName, aValue, aIsPrivate) { + onContentPrefSet: function(aGroup, aName, aValue, aIsPrivate) { this._onContentPrefChanged(aGroup, aValue, aIsPrivate); }, - onContentPrefRemoved: function FullZoom_onContentPrefRemoved(aGroup, aName, aIsPrivate) { + onContentPrefRemoved: function(aGroup, aName, aIsPrivate) { this._onContentPrefChanged(aGroup, undefined, aIsPrivate); }, @@ -124,7 +124,7 @@ var FullZoom = { * @param aValue The new value of the changed preference. Pass undefined to * indicate the preference's removal. */ - _onContentPrefChanged: function FullZoom__onContentPrefChanged(aGroup, aValue, aIsPrivate) { + _onContentPrefChanged: function(aGroup, aValue, aIsPrivate) { if (this._isNextContentPrefChangeInternal) { // Ignore changes that FullZoom itself makes. This works because the // content pref service calls callbacks before notifying observers, and it @@ -175,7 +175,7 @@ var FullZoom = { * @param aBrowser * (optional) browser object displaying the document */ - onLocationChange: function FullZoom_onLocationChange(aURI, aIsTabSwitch, aBrowser) { + onLocationChange: function(aURI, aIsTabSwitch, aBrowser) { let browser = aBrowser || gBrowser.selectedBrowser; // If we haven't been initialized yet but receive an onLocationChange @@ -237,7 +237,7 @@ var FullZoom = { // update state of zoom type menu item - updateMenu: function FullZoom_updateMenu() { + updateMenu: function() { var menuItem = document.getElementById("toggle_zoom"); menuItem.setAttribute("checked", !ZoomManager.useFullZoom); @@ -248,7 +248,7 @@ var FullZoom = { /** * Reduces the zoom level of the page in the current browser. */ - reduce: function FullZoom_reduce() { + reduce: function() { ZoomManager.reduce(); let browser = gBrowser.selectedBrowser; this._ignorePendingZoomAccesses(browser); @@ -258,7 +258,7 @@ var FullZoom = { /** * Enlarges the zoom level of the page in the current browser. */ - enlarge: function FullZoom_enlarge() { + enlarge: function() { ZoomManager.enlarge(); let browser = gBrowser.selectedBrowser; this._ignorePendingZoomAccesses(browser); @@ -281,7 +281,7 @@ var FullZoom = { * * @return A promise which resolves when the zoom reset has been applied. */ - reset: function FullZoom_reset(browser = gBrowser.selectedBrowser) { + reset: function(browser = gBrowser.selectedBrowser) { let token = this._getBrowserToken(browser); let result = this._getGlobalValue(browser).then(value => { if (token.isCurrent) { @@ -317,7 +317,7 @@ var FullZoom = { * @param aBrowser The zoom is set in this browser. Required. * @param aCallback If given, it's asynchronously called when complete. */ - _applyPrefToZoom: function FullZoom__applyPrefToZoom(aValue, aBrowser, aCallback) { + _applyPrefToZoom: function(aValue, aBrowser, aCallback) { if (!this.siteSpecific || gInPrintPreviewMode) { this._executeSoon(aCallback); return; @@ -354,7 +354,7 @@ var FullZoom = { * * @param browser The zoom of this browser will be saved. Required. */ - _applyZoomToPref: function FullZoom__applyZoomToPref(browser) { + _applyZoomToPref: function(browser) { Services.obs.notifyObservers(browser, "browser-fullZoom:zoomChange", ""); if (!this.siteSpecific || gInPrintPreviewMode || @@ -375,7 +375,7 @@ var FullZoom = { * * @param browser The zoom of this browser will be removed. Required. */ - _removePref: function FullZoom__removePref(browser) { + _removePref: function(browser) { Services.obs.notifyObservers(browser, "browser-fullZoom:zoomReset", ""); if (browser.isSyntheticDocument) return; @@ -401,7 +401,7 @@ var FullZoom = { * @param browser The token of this browser will be returned. * @return An object with an "isCurrent" getter. */ - _getBrowserToken: function FullZoom__getBrowserToken(browser) { + _getBrowserToken: function(browser) { let map = this._browserTokenMap; if (!map.has(browser)) map.set(browser, 0); @@ -423,7 +423,7 @@ var FullZoom = { * @param event The ZoomChangeUsingMouseWheel event. * @return The associated browser element, if one exists, otherwise null. */ - _getTargetedBrowser: function FullZoom__getTargetedBrowser(event) { + _getTargetedBrowser: function(event) { let target = event.originalTarget; // With remote content browsers, the event's target is the browser @@ -449,12 +449,12 @@ var FullZoom = { * * @param browser Pending accesses in this browser will be ignored. */ - _ignorePendingZoomAccesses: function FullZoom__ignorePendingZoomAccesses(browser) { + _ignorePendingZoomAccesses: function(browser) { let map = this._browserTokenMap; map.set(browser, (map.get(browser) || 0) + 1); }, - _ensureValid: function FullZoom__ensureValid(aValue) { + _ensureValid: function(aValue) { // Note that undefined is a valid value for aValue that indicates a known- // not-to-exist value. if (isNaN(aValue)) @@ -476,7 +476,7 @@ var FullZoom = { * @returns Promise * Resolves to the preference value when done. */ - _getGlobalValue: function FullZoom__getGlobalValue(browser) { + _getGlobalValue: function(browser) { // * !("_globalValue" in this) => global value not yet cached. // * this._globalValue === undefined => global value known not to exist. // * Otherwise, this._globalValue is a number, the global value. @@ -502,7 +502,7 @@ var FullZoom = { * @param Browser The Browser whose load context will be returned. * @return The nsILoadContext of the given Browser. */ - _loadContextFromBrowser: function FullZoom__loadContextFromBrowser(browser) { + _loadContextFromBrowser: function(browser) { return browser.loadContext; }, @@ -512,13 +512,13 @@ var FullZoom = { * The notification is always asynchronous so that observers are guaranteed a * consistent behavior. */ - _notifyOnLocationChange: function FullZoom__notifyOnLocationChange(browser) { + _notifyOnLocationChange: function(browser) { this._executeSoon(function () { Services.obs.notifyObservers(browser, "browser-fullZoom:location-change", ""); }); }, - _executeSoon: function FullZoom__executeSoon(callback) { + _executeSoon: function(callback) { if (!callback) return; Services.tm.mainThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL); diff --git a/application/basilisk/base/content/browser-gestureSupport.js b/application/basilisk/base/content/browser-gestureSupport.js index 6c21a6ad5..9ca8e097e 100644 --- a/application/basilisk/base/content/browser-gestureSupport.js +++ b/application/basilisk/base/content/browser-gestureSupport.js @@ -24,7 +24,7 @@ var gGestureSupport = { * @param aAddListener * True to add/init listeners and false to remove/uninit */ - init: function GS_init(aAddListener) { + init: function(aAddListener) { const gestureEvents = ["SwipeGestureMayStart", "SwipeGestureStart", "SwipeGestureUpdate", "SwipeGestureEnd", "SwipeGesture", "MagnifyGestureStart", "MagnifyGestureUpdate", "MagnifyGesture", @@ -47,7 +47,7 @@ var gGestureSupport = { * @param aEvent * The gesture event to handle */ - handleEvent: function GS_handleEvent(aEvent) { + handleEvent: function(aEvent) { if (!Services.prefs.getBoolPref( "dom.debug.propagate_gesture_events_through_content")) { aEvent.stopPropagation(); @@ -123,7 +123,7 @@ var gGestureSupport = { * @param aDec * Command to trigger for decreasing motion (without gesture name) */ - _setupGesture: function GS__setupGesture(aEvent, aGesture, aPref, aInc, aDec) { + _setupGesture: function(aEvent, aGesture, aPref, aInc, aDec) { // Try to load user-set values from preferences for (let [pref, def] of Object.entries(aPref)) aPref[pref] = this._getPref(aGesture + "." + pref, def); @@ -168,7 +168,7 @@ var gGestureSupport = { * The swipe gesture event. * @return true if the swipe event may navigate the history, false othwerwise. */ - _swipeNavigatesHistory: function GS__swipeNavigatesHistory(aEvent) { + _swipeNavigatesHistory: function(aEvent) { return this._getCommand(aEvent, ["swipe", "left"]) == "Browser:BackOrBackDuplicate" && this._getCommand(aEvent, ["swipe", "right"]) @@ -184,7 +184,7 @@ var gGestureSupport = { * @return true if we're willing to start a swipe for this event, false * otherwise. */ - _shouldDoSwipeGesture: function GS__shouldDoSwipeGesture(aEvent) { + _shouldDoSwipeGesture: function(aEvent) { if (!this._swipeNavigatesHistory(aEvent)) { return false; } @@ -232,14 +232,14 @@ var gGestureSupport = { * @return true if swipe gestures could successfully be set up, false * othwerwise. */ - _setupSwipeGesture: function GS__setupSwipeGesture() { + _setupSwipeGesture: function() { gHistorySwipeAnimation.startAnimation(false); - this._doUpdate = function GS__doUpdate(aEvent) { + this._doUpdate = function(aEvent) { gHistorySwipeAnimation.updateAnimation(aEvent.delta); }; - this._doEnd = function GS__doEnd(aEvent) { + this._doEnd = function(aEvent) { gHistorySwipeAnimation.swipeEndEventReceived(); this._doUpdate = function (aEvent) {}; @@ -255,7 +255,7 @@ var gGestureSupport = { * Source array containing any number of elements * @yield Array that is a subset of the input array from full set to empty */ - _power: function* GS__power(aArray) { + _power: function* (aArray) { // Create a bitmask based on the length of the array let num = 1 << aArray.length; while (--num >= 0) { @@ -279,7 +279,7 @@ var gGestureSupport = { * @return Name of the executed command. Returns null if no command is * found. */ - _doAction: function GS__doAction(aEvent, aGesture) { + _doAction: function(aEvent, aGesture) { let command = this._getCommand(aEvent, aGesture); return command && this._doCommand(aEvent, command); }, @@ -293,7 +293,7 @@ var gGestureSupport = { * @param aGesture * Array of gesture name parts (to be joined by periods) */ - _getCommand: function GS__getCommand(aEvent, aGesture) { + _getCommand: function(aEvent, aGesture) { // Create an array of pressed keys in a fixed order so that a command for // "meta" is preferred over "ctrl" when both buttons are pressed (and a // command for both don't exist) @@ -327,7 +327,7 @@ var gGestureSupport = { * @param aCommand * Name of the command found for the event's keys and gesture. */ - _doCommand: function GS__doCommand(aEvent, aCommand) { + _doCommand: function(aEvent, aCommand) { let node = document.getElementById(aCommand); if (node) { if (node.getAttribute("disabled") != "true") { @@ -367,7 +367,7 @@ var gGestureSupport = { * @param aEvent * The swipe event to handle */ - onSwipe: function GS_onSwipe(aEvent) { + onSwipe: function(aEvent) { // Figure out which one (and only one) direction was triggered for (let dir of ["UP", "RIGHT", "DOWN", "LEFT"]) { if (aEvent.direction == aEvent["DIRECTION_" + dir]) { @@ -385,7 +385,7 @@ var gGestureSupport = { * @param aDir * The direction for the swipe event */ - processSwipeEvent: function GS_processSwipeEvent(aEvent, aDir) { + processSwipeEvent: function(aEvent, aDir) { this._doAction(aEvent, ["swipe", aDir.toLowerCase()]); }, @@ -419,7 +419,7 @@ var gGestureSupport = { * @param aDef * Default value if the preference doesn't exist */ - _getPref: function GS__getPref(aPref, aDef) { + _getPref: function(aPref, aDef) { // Preferences branch under which all gestures preferences are stored const branch = "browser.gesture."; @@ -582,7 +582,7 @@ var gHistorySwipeAnimation = { * Initializes the support for history swipe animations, if it is supported * by the platform/configuration. */ - init: function HSA_init() { + init: function() { if (!this._isSupported()) return; @@ -612,7 +612,7 @@ var gHistorySwipeAnimation = { /** * Uninitializes the support for history swipe animations. */ - uninit: function HSA_uninit() { + uninit: function() { gBrowser.removeEventListener("pagehide", this, false); gBrowser.removeEventListener("pageshow", this, false); gBrowser.removeEventListener("popstate", this, false); @@ -630,7 +630,7 @@ var gHistorySwipeAnimation = { * @param aIsVerticalSwipe * Whether we're dealing with a vertical swipe or not. */ - startAnimation: function HSA_startAnimation(aIsVerticalSwipe) { + startAnimation: function(aIsVerticalSwipe) { this._direction = aIsVerticalSwipe ? "vertical" : "horizontal"; if (this.isAnimationRunning()) { @@ -672,7 +672,7 @@ var gHistorySwipeAnimation = { /** * Stops the swipe animation. */ - stopAnimation: function HSA_stopAnimation() { + stopAnimation: function() { gHistorySwipeAnimation._removeBoxes(); this._historyIndex = this._getCurrentHistoryIndex(); }, @@ -684,7 +684,7 @@ var gHistorySwipeAnimation = { * A floating point value that represents the progress of the * swipe gesture. */ - updateAnimation: function HSA_updateAnimation(aVal) { + updateAnimation: function(aVal) { if (!this.isAnimationRunning()) { return; } @@ -741,7 +741,7 @@ var gHistorySwipeAnimation = { * @param aEvent * An event to process. */ - handleEvent: function HSA_handleEvent(aEvent) { + handleEvent: function(aEvent) { let browser = gBrowser.selectedBrowser; switch (aEvent.type) { case "TabClose": @@ -780,7 +780,7 @@ var gHistorySwipeAnimation = { * * @return true if the animation is currently running, false otherwise. */ - isAnimationRunning: function HSA_isAnimationRunning() { + isAnimationRunning: function() { return !!this._container; }, @@ -792,7 +792,7 @@ var gHistorySwipeAnimation = { * @param aDir * The direction for the swipe event */ - processSwipeEvent: function HSA_processSwipeEvent(aEvent, aDir) { + processSwipeEvent: function(aEvent, aDir) { if (aDir == "RIGHT") this._historyIndex += this.isLTR ? 1 : -1; else if (aDir == "LEFT") @@ -807,7 +807,7 @@ var gHistorySwipeAnimation = { * * @return true if there is a previous page in history, false otherwise. */ - canGoBack: function HSA_canGoBack() { + canGoBack: function() { if (this.isAnimationRunning()) return this._doesIndexExistInHistory(this._historyIndex - 1); return gBrowser.webNavigation.canGoBack; @@ -818,7 +818,7 @@ var gHistorySwipeAnimation = { * * @return true if there is a next page in history, false otherwise. */ - canGoForward: function HSA_canGoForward() { + canGoForward: function() { if (this.isAnimationRunning()) return this._doesIndexExistInHistory(this._historyIndex + 1); return gBrowser.webNavigation.canGoForward; @@ -829,7 +829,7 @@ var gHistorySwipeAnimation = { * event and that we should navigate to the page that the user swiped to, if * any. This will also result in the animation overlay to be torn down. */ - swipeEndEventReceived: function HSA_swipeEndEventReceived() { + swipeEndEventReceived: function() { // Update the session history before continuing. let updateSessionHistory = sessionHistory => { if (this._lastSwipeDir != "" && this._historyIndex != this._startingIndex) @@ -847,7 +847,7 @@ var gHistorySwipeAnimation = { * The index to check for availability for in the history. * @return true if the index exists in the browser history, false otherwise. */ - _doesIndexExistInHistory: function HSA__doesIndexExistInHistory(aIndex) { + _doesIndexExistInHistory: function(aIndex) { try { return SessionStore.getSessionHistory(gBrowser.selectedTab).entries[aIndex] != null; } @@ -860,7 +860,7 @@ var gHistorySwipeAnimation = { * Navigates to the index in history that is currently being tracked by * |this|. */ - _navigateToHistoryIndex: function HSA__navigateToHistoryIndex() { + _navigateToHistoryIndex: function() { if (this._doesIndexExistInHistory(this._historyIndex)) gBrowser.webNavigation.gotoIndex(this._historyIndex); else @@ -873,7 +873,7 @@ var gHistorySwipeAnimation = { * * return true if supported, false otherwise. */ - _isSupported: function HSA__isSupported() { + _isSupported: function() { return window.matchMedia("(-moz-swipe-animation-enabled)").matches; }, @@ -882,7 +882,7 @@ var gHistorySwipeAnimation = { * progress when a new one is initiated). This will swap out the snapshots * used in the previous animation with the appropriate new ones. */ - _handleFastSwiping: function HSA__handleFastSwiping() { + _handleFastSwiping: function() { this._installCurrentPageSnapshot(null); this._installPrevAndNextSnapshots(); }, @@ -890,7 +890,7 @@ var gHistorySwipeAnimation = { /** * Adds the boxes that contain the snapshots used during the swipe animation. */ - _addBoxes: function HSA__addBoxes() { + _addBoxes: function() { let browserStack = document.getAnonymousElementByAttribute(gBrowser.getNotificationBox(), "class", "browserStack"); @@ -918,7 +918,7 @@ var gHistorySwipeAnimation = { /** * Removes the boxes. */ - _removeBoxes: function HSA__removeBoxes() { + _removeBoxes: function() { this._curBox = null; this._prevBox = null; this._nextBox = null; @@ -938,7 +938,7 @@ var gHistorySwipeAnimation = { * The name of the tag to create the element for. * @return the newly created element. */ - _createElement: function HSA__createElement(aID, aTagName) { + _createElement: function(aID, aTagName) { let XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; let element = document.createElementNS(XULNS, aTagName); element.id = aID; @@ -953,7 +953,7 @@ var gHistorySwipeAnimation = { * @param aPosition * The position (in X coordinates) to move the box element to. */ - _positionBox: function HSA__positionBox(aBox, aPosition) { + _positionBox: function(aBox, aPosition) { let transform = ""; if (this._direction == "vertical") @@ -970,14 +970,14 @@ var gHistorySwipeAnimation = { * * @return true if we're ready to take snapshots, false otherwise. */ - _readyToTakeSnapshots: function HSA__readyToTakeSnapshots() { + _readyToTakeSnapshots: function() { return (this._maxSnapshots >= 1 && this._getCurrentHistoryIndex() >= 0); }, /** * Takes a snapshot of the page the browser is currently on. */ - _takeSnapshot: function HSA__takeSnapshot() { + _takeSnapshot: function() { if (!this._readyToTakeSnapshots()) { return; } @@ -1011,7 +1011,7 @@ var gHistorySwipeAnimation = { * Retrieves the maximum number of snapshots that should be kept in memory. * This limit is a global limit and is valid across all open tabs. */ - _getMaxSnapshots: function HSA__getMaxSnapshots() { + _getMaxSnapshots: function() { return gPrefService.getIntPref("browser.snapshots.limit"); }, @@ -1083,7 +1083,7 @@ var gHistorySwipeAnimation = { * @param aBrowser * The browser the new snapshot was taken in. */ - _removeTrackedSnapshot: function HSA__removeTrackedSnapshot(aIndex, aBrowser) { + _removeTrackedSnapshot: function(aIndex, aBrowser) { let arr = this._trackedSnapshots; let requiresExactIndexMatch = aIndex >= 0; for (let i = 0; i < arr.length; i++) { @@ -1133,7 +1133,7 @@ var gHistorySwipeAnimation = { * couldn't complete before this method was called. * @return A new Image object representing the converted blob. */ - _convertToImg: function HSA__convertToImg(aBlob) { + _convertToImg: function(aBlob) { if (!aBlob) return null; @@ -1165,7 +1165,7 @@ var gHistorySwipeAnimation = { * @param aBox * The box element that uses aSnapshot as background. */ - _scaleSnapshot: function HSA__scaleSnapshot(aSnapshot, aScale, aBox) { + _scaleSnapshot: function(aSnapshot, aScale, aBox) { if (aSnapshot && aScale != 1 && aBox) { if (aSnapshot instanceof HTMLCanvasElement) { aBox.style.backgroundSize = diff --git a/application/basilisk/base/content/browser-places.js b/application/basilisk/base/content/browser-places.js index 87734140f..a7f33b10c 100644 --- a/application/basilisk/base/content/browser-places.js +++ b/application/basilisk/base/content/browser-places.js @@ -44,7 +44,7 @@ var StarUI = { ["cmd_close", "cmd_closeWindow"].map(id => this._element(id)); }, - _blockCommands: function SU__blockCommands() { + _blockCommands: function() { this._blockedCommands.forEach(function (elt) { // make sure not to permanently disable this item (see bug 409155) if (elt.hasAttribute("wasDisabled")) @@ -58,7 +58,7 @@ var StarUI = { }); }, - _restoreCommandsState: function SU__restoreCommandsState() { + _restoreCommandsState: function() { this._blockedCommands.forEach(function (elt) { if (elt.getAttribute("wasDisabled") != "true") elt.removeAttribute("disabled"); @@ -331,13 +331,13 @@ var StarUI = { } }, - quitEditMode: function SU_quitEditMode() { + quitEditMode: function() { this._element("editBookmarkPanelContent").hidden = true; this._element("editBookmarkPanelBottomButtons").hidden = true; gEditItemOverlay.uninitPanel(true); }, - removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() { + removeBookmarkButtonCommand: function() { this._uriForRemoval = PlacesUtils.bookmarks.getBookmarkURI(this._itemId); this.panel.hidePopup(); }, @@ -558,7 +558,7 @@ var PlacesCommandHook = { /** * Adds a bookmark to the page loaded in the current tab. */ - bookmarkCurrentPage: function PCH_bookmarkCurrentPage(aShowEditUI, aParent) { + bookmarkCurrentPage: function(aShowEditUI, aParent) { this.bookmarkPage(gBrowser.selectedBrowser, aParent, aShowEditUI); }, @@ -625,7 +625,7 @@ var PlacesCommandHook = { * Adds a folder with bookmarks to all of the currently open tabs in this * window. */ - bookmarkCurrentPages: function PCH_bookmarkCurrentPages() { + bookmarkCurrentPages: function() { let pages = this.uniqueCurrentPages; if (pages.length > 1) { PlacesUIUtils.showBookmarkDialog({ action: "add" @@ -692,7 +692,7 @@ var PlacesCommandHook = { * are: History, AllBookmarks, BookmarksMenu, BookmarksToolbar, * UnfiledBookmarks, Tags and Downloads. */ - showPlacesOrganizer: function PCH_showPlacesOrganizer(aLeftPaneRoot) { + showPlacesOrganizer: function(aLeftPaneRoot) { var organizer = Services.wm.getMostRecentWindow("Places:Organizer"); // Due to bug 528706, getMostRecentWindow can return closed windows. if (!organizer || organizer.closed) { @@ -731,7 +731,7 @@ HistoryMenu.prototype = { return SessionStore.getClosedTabCount(window); }, - toggleRecentlyClosedTabs: function HM_toggleRecentlyClosedTabs() { + toggleRecentlyClosedTabs: function() { // enable/disable the Recently Closed Tabs sub menu var undoMenu = this._rootElt.getElementsByClassName("recentlyClosedTabsMenu")[0]; @@ -745,7 +745,7 @@ HistoryMenu.prototype = { /** * Populate when the history menu is opened */ - populateUndoSubmenu: function PHM_populateUndoSubmenu() { + populateUndoSubmenu: function() { var undoMenu = this._rootElt.getElementsByClassName("recentlyClosedTabsMenu")[0]; var undoPopup = undoMenu.firstChild; @@ -767,7 +767,7 @@ HistoryMenu.prototype = { undoPopup.appendChild(tabsFragment); }, - toggleRecentlyClosedWindows: function PHM_toggleRecentlyClosedWindows() { + toggleRecentlyClosedWindows: function() { // enable/disable the Recently Closed Windows sub menu var undoMenu = this._rootElt.getElementsByClassName("recentlyClosedWindowsMenu")[0]; @@ -781,7 +781,7 @@ HistoryMenu.prototype = { /** * Populate when the history menu is opened */ - populateUndoWindowSubmenu: function PHM_populateUndoWindowSubmenu() { + populateUndoWindowSubmenu: function() { let undoMenu = this._rootElt.getElementsByClassName("recentlyClosedWindowsMenu")[0]; let undoPopup = undoMenu.firstChild; @@ -803,7 +803,7 @@ HistoryMenu.prototype = { undoPopup.appendChild(windowsFragment); }, - toggleTabsFromOtherComputers: function PHM_toggleTabsFromOtherComputers() { + toggleTabsFromOtherComputers: function() { // This is a no-op if MOZ_SERVICES_SYNC isn't defined #ifdef MOZ_SERVICES_SYNC // Enable/disable the Tabs From Other Computers menu. Some of the menus handled @@ -829,7 +829,7 @@ HistoryMenu.prototype = { #endif }, - _onPopupShowing: function HM__onPopupShowing(aEvent) { + _onPopupShowing: function(aEvent) { PlacesMenu.prototype._onPopupShowing.apply(this, arguments); // Don't handle events for submenus. @@ -841,7 +841,7 @@ HistoryMenu.prototype = { this.toggleTabsFromOtherComputers(); }, - _onCommand: function HM__onCommand(aEvent) { + _onCommand: function(aEvent) { let placesNode = aEvent.target._placesNode; if (placesNode) { if (!PrivateBrowsingUtils.isWindowPrivate(window)) @@ -866,7 +866,7 @@ var BookmarksEventHandler = { * @param aView * The places view which aEvent should be associated with. */ - onClick: function BEH_onClick(aEvent, aView) { + onClick: function(aEvent, aView) { // Only handle middle-click or left-click with modifiers. let modifKey; if (AppConstants.platform == "macosx") { @@ -915,13 +915,13 @@ var BookmarksEventHandler = { * @param aView * The places view which aEvent should be associated with. */ - onCommand: function BEH_onCommand(aEvent, aView) { + onCommand: function(aEvent, aView) { var target = aEvent.originalTarget; if (target._placesNode) PlacesUIUtils.openNodeWithEvent(target._placesNode, aEvent, aView); }, - fillInBHTooltip: function BEH_fillInBHTooltip(aDocument, aEvent) { + fillInBHTooltip: function(aDocument, aEvent) { var node; var cropped = false; var targetURI; @@ -991,7 +991,7 @@ var PlacesMenuDNDHandler = { * @param event * The DragEnter event that spawned the opening. */ - onDragEnter: function PMDH_onDragEnter(event) { + onDragEnter: function(event) { // Opening menus in a Places popup is handled by the view itself. if (!this._isStaticContainer(event.target)) return; @@ -1022,7 +1022,7 @@ var PlacesMenuDNDHandler = { /** * Handles dragleave on the element. */ - onDragLeave: function PMDH_onDragLeave(event) { + onDragLeave: function(event) { // Handle menu-button separate targets. if (event.relatedTarget === event.currentTarget || (event.relatedTarget && @@ -1063,7 +1063,7 @@ var PlacesMenuDNDHandler = { * @returns true if the element is a container element (menu or *` menu-toolbarbutton), false otherwise. */ - _isStaticContainer: function PMDH__isContainer(node) { + _isStaticContainer: function(node) { let isMenu = node.localName == "menu" || (node.localName == "toolbarbutton" && (node.getAttribute("type") == "menu" || @@ -1079,7 +1079,7 @@ var PlacesMenuDNDHandler = { * @param event * The DragOver event. */ - onDragOver: function PMDH_onDragOver(event) { + onDragOver: function(event) { let ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId, PlacesUtils.bookmarks.DEFAULT_INDEX, Components.interfaces.nsITreeView.DROP_ON); @@ -1094,7 +1094,7 @@ var PlacesMenuDNDHandler = { * @param event * The Drop event. */ - onDrop: function PMDH_onDrop(event) { + onDrop: function(event) { // Put the item at the end of bookmark menu. let ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId, PlacesUtils.bookmarks.DEFAULT_INDEX, @@ -1120,7 +1120,7 @@ var PlacesToolbarHelper = { return document.getElementById("bookmarks-toolbar-placeholder"); }, - init: function PTH_init(forceToolbarOverflowCheck) { + init: function(forceToolbarOverflowCheck) { let viewElt = this._viewElt; if (!viewElt || viewElt._placesView) return; @@ -1148,11 +1148,11 @@ var PlacesToolbarHelper = { this._setupPlaceholder(); }, - uninit: function PTH_uninit() { + uninit: function() { CustomizableUI.removeListener(this); }, - customizeStart: function PTH_customizeStart() { + customizeStart: function() { try { let viewElt = this._viewElt; if (viewElt && viewElt._placesView) @@ -1163,11 +1163,11 @@ var PlacesToolbarHelper = { this._shouldWrap = this._getShouldWrap(); }, - customizeChange: function PTH_customizeChange() { + customizeChange: function() { this._setupPlaceholder(); }, - _setupPlaceholder: function PTH_setupPlaceholder() { + _setupPlaceholder: function() { let placeholder = this._placeholder; if (!placeholder) { return; @@ -1184,12 +1184,12 @@ var PlacesToolbarHelper = { } }, - customizeDone: function PTH_customizeDone() { + customizeDone: function() { this._isCustomizing = false; this.init(true); }, - _getShouldWrap: function PTH_getShouldWrap() { + _getShouldWrap: function() { let placement = CustomizableUI.getPlacementOfWidget("personal-bookmarks"); let area = placement && placement.area; let areaType = area && CustomizableUI.getAreaType(area); @@ -1351,11 +1351,11 @@ var BookmarkingUI = { * reasons. */ _popupNeedsUpdate: true, - onToolbarVisibilityChange: function BUI_onToolbarVisibilityChange() { + onToolbarVisibilityChange: function() { this._popupNeedsUpdate = true; }, - onPopupShowing: function BUI_onPopupShowing(event) { + onPopupShowing: function(event) { // Don't handle events for submenus. if (event.target != event.currentTarget) return; @@ -1554,12 +1554,12 @@ var BookmarkingUI = { Services.prefs.setBoolPref(this.RECENTLY_BOOKMARKED_PREF, false); }, - _updateCustomizationState: function BUI__updateCustomizationState() { + _updateCustomizationState: function() { let placement = CustomizableUI.getPlacementOfWidget(this.BOOKMARK_BUTTON_ID); this._currentAreaType = placement && CustomizableUI.getAreaType(placement.area); }, - _uninitView: function BUI__uninitView() { + _uninitView: function() { // When an element with a placesView attached is removed and re-inserted, // XBL reapplies the binding causing any kind of issues and possible leaks, // so kill current view and let popupshowing generate a new one. @@ -1581,38 +1581,38 @@ var BookmarkingUI = { } }, - onCustomizeStart: function BUI_customizeStart(aWindow) { + onCustomizeStart: function(aWindow) { if (aWindow == window) { this._uninitView(); this._isCustomizing = true; } }, - onWidgetAdded: function BUI_widgetAdded(aWidgetId) { + onWidgetAdded: function(aWidgetId) { if (aWidgetId == this.BOOKMARK_BUTTON_ID) { this._onWidgetWasMoved(); } }, - onWidgetRemoved: function BUI_widgetRemoved(aWidgetId) { + onWidgetRemoved: function(aWidgetId) { if (aWidgetId == this.BOOKMARK_BUTTON_ID) { this._onWidgetWasMoved(); } }, - onWidgetReset: function BUI_widgetReset(aNode, aContainer) { + onWidgetReset: function(aNode, aContainer) { if (aNode == this.button) { this._onWidgetWasMoved(); } }, - onWidgetUndoMove: function BUI_undoWidgetUndoMove(aNode, aContainer) { + onWidgetUndoMove: function(aNode, aContainer) { if (aNode == this.button) { this._onWidgetWasMoved(); } }, - _onWidgetWasMoved: function BUI_widgetWasMoved() { + _onWidgetWasMoved: function() { let usedToUpdateStarState = this._shouldUpdateStarState(); this._updateCustomizationState(); if (!usedToUpdateStarState && this._shouldUpdateStarState()) { @@ -1627,7 +1627,7 @@ var BookmarkingUI = { } }, - onCustomizeEnd: function BUI_customizeEnd(aWindow) { + onCustomizeEnd: function(aWindow) { if (aWindow == window) { this._isCustomizing = false; this.onToolbarVisibilityChange(); @@ -1641,7 +1641,7 @@ var BookmarkingUI = { _hasBookmarksObserver: false, _itemIds: [], - uninit: function BUI_uninit() { + uninit: function() { this._updateBookmarkPageMenuItem(true); CustomizableUI.removeListener(this); @@ -1657,14 +1657,14 @@ var BookmarkingUI = { } }, - onLocationChange: function BUI_onLocationChange() { + onLocationChange: function() { if (this._uri && gBrowser.currentURI.equals(this._uri)) { return; } this.updateStarState(); }, - updateStarState: function BUI_updateStarState() { + updateStarState: function() { // Reset tracked values. this._uri = gBrowser.currentURI; this._itemIds = []; @@ -1704,7 +1704,7 @@ var BookmarkingUI = { }); }, - _updateStar: function BUI__updateStar() { + _updateStar: function() { if (!this._shouldUpdateStarState()) { if (this.broadcaster.hasAttribute("starred")) { this.broadcaster.removeAttribute("starred"); @@ -1733,7 +1733,7 @@ var BookmarkingUI = { * forceReset is passed when we're destroyed and the label should go back * to the default (Bookmark This Page) for OS X. */ - _updateBookmarkPageMenuItem: function BUI__updateBookmarkPageMenuItem(forceReset) { + _updateBookmarkPageMenuItem: function(forceReset) { let isStarred = !forceReset && this._itemIds.length > 0; let label = isStarred ? "editlabel" : "bookmarklabel"; if (this.broadcaster) { @@ -1741,7 +1741,7 @@ var BookmarkingUI = { } }, - onMainMenuPopupShowing: function BUI_onMainMenuPopupShowing(event) { + onMainMenuPopupShowing: function(event) { // Don't handle events for submenus. if (event.target != event.currentTarget) return; @@ -1751,7 +1751,7 @@ var BookmarkingUI = { this._initRecentBookmarks(document.getElementById("menu_recentBookmarks")); }, - _showBookmarkedNotification: function BUI_showBookmarkedNotification() { + _showBookmarkedNotification: function() { function getCenteringTransformForRects(rectToPosition, referenceRect) { let topDiff = referenceRect.top - rectToPosition.top; let leftDiff = referenceRect.left - rectToPosition.left; @@ -1824,7 +1824,7 @@ var BookmarkingUI = { CustomizableUI.AREA_PANEL); }, - onCommand: function BUI_onCommand(aEvent) { + onCommand: function(aEvent) { if (aEvent.target != aEvent.currentTarget) { return; } @@ -1855,7 +1855,7 @@ var BookmarkingUI = { this._updateBookmarkPageMenuItem(); }, - handleEvent: function BUI_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "ViewShowing": this.onPanelMenuViewShowing(aEvent); @@ -1866,7 +1866,7 @@ var BookmarkingUI = { } }, - onPanelMenuViewShowing: function BUI_onViewShowing(aEvent) { + onPanelMenuViewShowing: function(aEvent) { this._updateBookmarkPageMenuItem(); // Update checked status of the toolbar toggle. let viewToolbar = document.getElementById("panelMenu_viewBookmarksToolbar"); @@ -1891,13 +1891,13 @@ var BookmarkingUI = { aEvent.target.removeEventListener("ViewShowing", this); }, - onPanelMenuViewHiding: function BUI_onViewHiding(aEvent) { + onPanelMenuViewHiding: function(aEvent) { this._panelMenuView.uninit(); delete this._panelMenuView; aEvent.target.removeEventListener("ViewHiding", this); }, - onPanelMenuViewCommand: function BUI_onPanelMenuViewCommand(aEvent, aView) { + onPanelMenuViewCommand: function(aEvent, aView) { let target = aEvent.originalTarget; if (!target._placesNode) return; @@ -1909,7 +1909,7 @@ var BookmarkingUI = { }, // nsINavBookmarkObserver - onItemAdded: function BUI_onItemAdded(aItemId, aParentId, aIndex, aItemType, + onItemAdded: function(aItemId, aParentId, aIndex, aItemType, aURI) { if (aURI && aURI.equals(this._uri)) { // If a new bookmark has been added to the tracked uri, register it. @@ -1923,7 +1923,7 @@ var BookmarkingUI = { } }, - onItemRemoved: function BUI_onItemRemoved(aItemId) { + onItemRemoved: function(aItemId) { let index = this._itemIds.indexOf(aItemId); // If one of the tracked bookmarks has been removed, unregister it. if (index != -1) { @@ -1935,7 +1935,7 @@ var BookmarkingUI = { } }, - onItemChanged: function BUI_onItemChanged(aItemId, aProperty, + onItemChanged: function(aItemId, aProperty, aIsAnnotationProperty, aNewValue) { if (aProperty == "uri") { let index = this._itemIds.indexOf(aItemId); diff --git a/application/basilisk/base/content/browser-plugins.js b/application/basilisk/base/content/browser-plugins.js index c1bc65860..d8ed768af 100644 --- a/application/basilisk/base/content/browser-plugins.js +++ b/application/basilisk/base/content/browser-plugins.js @@ -95,7 +95,7 @@ var gPluginHandler = { openUILinkIn(url, "tab"); }, - submitReport: function submitReport(runID, keyVals, submitURLOptIn) { + submitReport: function(runID, keyVals, submitURLOptIn) { /*** STUB ***/ return; }, @@ -110,7 +110,7 @@ var gPluginHandler = { openHelpLink("plugin-crashed", false); }, - _clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) { + _clickToPlayNotificationEventCallback: function(event) { if (event == "showing") { Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_SHOWN") .add(!this.options.primaryPlugin); diff --git a/application/basilisk/base/content/browser-syncui.js b/application/basilisk/base/content/browser-syncui.js index 86f6f48f1..945a1022a 100644 --- a/application/basilisk/base/content/browser-syncui.js +++ b/application/basilisk/base/content/browser-syncui.js @@ -20,7 +20,7 @@ var gSyncUI = { _unloaded: false, - init: function SUI_init() { + init: function() { // Proceed to set up the UI if Sync has already started up. // Otherwise we'll do it when Sync is firing up. let xps = Components.classes["@mozilla.org/weave/service;1"] @@ -48,7 +48,7 @@ var gSyncUI = { }, false); }, - initUI: function SUI_initUI() { + initUI: function() { // If this is a browser window? if (gBrowser) { this._obs.push("weave:notification:added"); @@ -64,7 +64,7 @@ var gSyncUI = { this.updateUI(); }, - initNotifications: function SUI_initNotifications() { + initNotifications: function() { const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; let notificationbox = document.createElementNS(XULNS, "notificationbox"); notificationbox.id = "sync-notifications"; @@ -82,13 +82,13 @@ var gSyncUI = { _wasDelayed: false, - _needsSetup: function SUI__needsSetup() { + _needsSetup: function() { let firstSync = Services.prefs.getCharPref("services.sync.firstSync", ""); return Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED || firstSync == "notReady"; }, - updateUI: function SUI_updateUI() { + updateUI: function() { let needsSetup = this._needsSetup(); document.getElementById("sync-setup-state").hidden = !needsSetup; document.getElementById("sync-syncnow-state").hidden = needsSetup; @@ -116,7 +116,7 @@ var gSyncUI = { // Functions called by observers - onActivityStart: function SUI_onActivityStart() { + onActivityStart: function() { if (!gBrowser) return; @@ -128,7 +128,7 @@ var gSyncUI = { button.setAttribute("label", this._stringBundle.GetStringFromName("syncing2.label")); }, - onSyncDelay: function SUI_onSyncDelay() { + onSyncDelay: function() { // basically, we want to just inform users that stuff is going to take a while let title = this._stringBundle.GetStringFromName("error.sync.no_node_found.title"); let description = this._stringBundle.GetStringFromName("error.sync.no_node_found"); @@ -143,17 +143,17 @@ var gSyncUI = { this._wasDelayed = true; }, - onLoginFinish: function SUI_onLoginFinish() { + onLoginFinish: function() { // Clear out any login failure notifications let title = this._stringBundle.GetStringFromName("error.login.title"); this.clearError(title); }, - onSetupComplete: function SUI_onSetupComplete() { + onSetupComplete: function() { this.onLoginFinish(); }, - onLoginError: function SUI_onLoginError() { + onLoginError: function() { // if login fails, any other notifications are essentially moot Weave.Notifications.removeAll(); @@ -191,15 +191,15 @@ var gSyncUI = { this.updateUI(); }, - onLogout: function SUI_onLogout() { + onLogout: function() { this.updateUI(); }, - onStartOver: function SUI_onStartOver() { + onStartOver: function() { this.clearError(); }, - onQuotaNotice: function onQuotaNotice(subject, data) { + onQuotaNotice: function(subject, data) { let title = this._stringBundle.GetStringFromName("warning.sync.quota.label"); let description = this._stringBundle.GetStringFromName("warning.sync.quota.description"); let buttons = []; @@ -220,11 +220,11 @@ var gSyncUI = { }, // Commands - doSync: function SUI_doSync() { + doSync: function() { setTimeout(function() Weave.Service.errorHandler.syncAndReportErrors(), 0); }, - handleToolbarButton: function SUI_handleStatusbarButton() { + handleToolbarButton: function() { if (this._needsSetup()) this.openSetup(); else @@ -244,7 +244,7 @@ var gSyncUI = { * "reset" -- reset sync */ - openSetup: function SUI_openSetup(wizardType) { + openSetup: function(wizardType) { let win = Services.wm.getMostRecentWindow("Weave:AccountSetup"); if (win) win.focus(); @@ -255,7 +255,7 @@ var gSyncUI = { } }, - openAddDevice: function () { + openAddDevice: function() { if (!Weave.Utils.ensureMPUnlocked()) return; @@ -267,7 +267,7 @@ var gSyncUI = { "syncAddDevice", "centerscreen,chrome,resizable=no"); }, - openQuotaDialog: function SUI_openQuotaDialog() { + openQuotaDialog: function() { let win = Services.wm.getMostRecentWindow("Sync:ViewQuota"); if (win) win.focus(); @@ -277,13 +277,13 @@ var gSyncUI = { "centerscreen,chrome,dialog,modal"); }, - openPrefs: function SUI_openPrefs() { + openPrefs: function () { openPreferences("paneSync"); }, // Helpers - _updateLastSyncTime: function SUI__updateLastSyncTime() { + _updateLastSyncTime: function() { if (!gBrowser) return; @@ -305,12 +305,12 @@ var gSyncUI = { syncButton.setAttribute("tooltiptext", lastSyncLabel); }, - clearError: function SUI_clearError(errorString) { + clearError: function(errorString) { Weave.Notifications.removeAll(errorString); this.updateUI(); }, - onSyncFinish: function SUI_onSyncFinish() { + onSyncFinish: function() { let title = this._stringBundle.GetStringFromName("error.sync.title"); // Clear out sync failures on a successful sync @@ -323,7 +323,7 @@ var gSyncUI = { } }, - onSyncError: function SUI_onSyncError() { + onSyncError: function() { let title = this._stringBundle.GetStringFromName("error.sync.title"); if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) { @@ -404,7 +404,7 @@ var gSyncUI = { this.updateUI(); }, - observe: function SUI_observe(subject, topic, data) { + observe: function(subject, topic, data) { if (this._unloaded) { Cu.reportError("SyncUI observer called after unload: " + topic); return; diff --git a/application/basilisk/base/content/browser-tabsintitlebar-stub.js b/application/basilisk/base/content/browser-tabsintitlebar-stub.js index 1e45b17dd..82f62bfba 100644 --- a/application/basilisk/base/content/browser-tabsintitlebar-stub.js +++ b/application/basilisk/base/content/browser-tabsintitlebar-stub.js @@ -10,7 +10,7 @@ var TabsInTitlebar = { init: function () {}, uninit: function () {}, allowedBy: function (condition, allow) {}, - updateAppearance: function updateAppearance(aForce) {}, + updateAppearance: function(aForce) {}, get enabled() { return document.documentElement.getAttribute("tabsintitlebar") == "true"; }, diff --git a/application/basilisk/base/content/browser-tabsintitlebar.js b/application/basilisk/base/content/browser-tabsintitlebar.js index 5c0d94514..1bb348b5a 100644 --- a/application/basilisk/base/content/browser-tabsintitlebar.js +++ b/application/basilisk/base/content/browser-tabsintitlebar.js @@ -61,7 +61,7 @@ var TabsInTitlebar = { } }, - updateAppearance: function updateAppearance(aForce) { + updateAppearance: function(aForce) { this._update(aForce); }, diff --git a/application/basilisk/base/content/browser-thumbnails.js b/application/basilisk/base/content/browser-thumbnails.js index ebefb193e..4e536ad6b 100644 --- a/application/basilisk/base/content/browser-thumbnails.js +++ b/application/basilisk/base/content/browser-thumbnails.js @@ -28,7 +28,7 @@ var gBrowserThumbnails = { */ _tabEvents: ["TabClose", "TabSelect"], - init: function Thumbnails_init() { + init: function() { PageThumbs.addExpirationFilter(this); gBrowser.addTabsProgressListener(this); Services.prefs.addObserver(this.PREF_DISK_CACHE_SSL, this, false); @@ -43,7 +43,7 @@ var gBrowserThumbnails = { this._timeouts = new WeakMap(); }, - uninit: function Thumbnails_uninit() { + uninit: function() { PageThumbs.removeExpirationFilter(this); gBrowser.removeTabsProgressListener(this); Services.prefs.removeObserver(this.PREF_DISK_CACHE_SSL, this); @@ -53,7 +53,7 @@ var gBrowserThumbnails = { }, this); }, - handleEvent: function Thumbnails_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "scroll": let browser = aEvent.currentTarget; @@ -70,7 +70,7 @@ var gBrowserThumbnails = { } }, - observe: function Thumbnails_observe() { + observe: function() { this._sslDiskCacheEnabled = Services.prefs.getBoolPref(this.PREF_DISK_CACHE_SSL); }, @@ -83,14 +83,14 @@ var gBrowserThumbnails = { /** * State change progress listener for all tabs. */ - onStateChange: function Thumbnails_onStateChange(aBrowser, aWebProgress, + onStateChange: function(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) { if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP && aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) this._delayedCapture(aBrowser); }, - _capture: function Thumbnails_capture(aBrowser) { + _capture: function(aBrowser) { // Only capture about:newtab top sites. if (this._topSiteURLs.indexOf(aBrowser.currentURI.spec) == -1) return; @@ -101,7 +101,7 @@ var gBrowserThumbnails = { }); }, - _delayedCapture: function Thumbnails_delayedCapture(aBrowser) { + _delayedCapture: function(aBrowser) { if (this._timeouts.has(aBrowser)) clearTimeout(this._timeouts.get(aBrowser)); else @@ -115,7 +115,7 @@ var gBrowserThumbnails = { this._timeouts.set(aBrowser, timeout); }, - _shouldCapture: function Thumbnails_shouldCapture(aBrowser, aCallback) { + _shouldCapture: function(aBrowser, aCallback) { // Capture only if it's the currently selected tab. if (aBrowser != gBrowser.selectedBrowser) { aCallback(false); @@ -132,7 +132,7 @@ var gBrowserThumbnails = { }, []); }, - _clearTimeout: function Thumbnails_clearTimeout(aBrowser) { + _clearTimeout: function(aBrowser) { if (this._timeouts.has(aBrowser)) { aBrowser.removeEventListener("scroll", this, false); clearTimeout(this._timeouts.get(aBrowser)); diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js index d53787e94..077292692 100644 --- a/application/basilisk/base/content/browser.js +++ b/application/basilisk/base/content/browser.js @@ -3327,7 +3327,7 @@ const BrowserSearch = { * the default engine's search form otherwise. For Mac, opens a new window * or focuses an existing window, if necessary. */ - webSearch: function BrowserSearch_webSearch() { + webSearch: function() { if (window.location.href != getBrowserURL()) { var win = getTopWin(); if (win) { @@ -3438,7 +3438,7 @@ const BrowserSearch = { * @return string Name of the search engine used to perform a search or null * if a search was not performed. */ - loadSearch: function BrowserSearch_search(searchText, useNewTab, purpose) { + loadSearch: function(searchText, useNewTab, purpose) { let engine = BrowserSearch._loadSearch(searchText, useNewTab, purpose); if (!engine) { return null; @@ -3476,7 +3476,7 @@ const BrowserSearch = { return formatURL("browser.search.searchEnginesURL", true); }, - loadAddEngines: function BrowserSearch_loadAddEngines() { + loadAddEngines: function() { var newWindowPref = gPrefService.getIntPref("browser.link.open_newwindow"); var where = newWindowPref == 3 ? "tab" : "window"; openUILinkIn(this.searchEnginesURL, where); @@ -4271,7 +4271,7 @@ var XULBrowserWindow = { }, // simulate all change notifications after switching tabs - onUpdateCurrentBrowser: function XWB_onUpdateCurrentBrowser(aStateFlags, aStatus, aMessage, aTotalProgress) { + onUpdateCurrentBrowser: function(aStateFlags, aStatus, aMessage, aTotalProgress) { if (FullZoom.updateBackgroundTabs) FullZoom.onLocationChange(gBrowser.currentURI, true); var nsIWebProgressListener = Components.interfaces.nsIWebProgressListener; @@ -4634,7 +4634,7 @@ nsBrowserAccess.prototype = { return newWindow; }, - openURIInFrame: function browser_openURIInFrame(aURI, aParams, aWhere, aFlags) { + openURIInFrame: function(aURI, aParams, aWhere, aFlags) { if (aWhere != Ci.nsIBrowserDOMWindow.OPEN_NEWTAB) { dump("Error: openURIInFrame can only open in new tabs"); return null; @@ -7158,7 +7158,7 @@ function getNavToolbox() { } var gPrivateBrowsingUI = { - init: function PBUI_init() { + init: function() { // Do nothing for normal windows if (!PrivateBrowsingUtils.isWindowPrivate(window)) { return; @@ -7396,7 +7396,7 @@ var TabContextMenu = { } }); }, - updateContextMenu: function updateContextMenu(aPopupMenu) { + updateContextMenu: function(aPopupMenu) { this.contextTab = aPopupMenu.triggerNode.localName == "tab" ? aPopupMenu.triggerNode : gBrowser.selectedTab; let disabled = gBrowser.tabs.length == 1; diff --git a/application/basilisk/base/content/newtab/cells.js b/application/basilisk/base/content/newtab/cells.js index 47d4ef52d..272aeabd0 100644 --- a/application/basilisk/base/content/newtab/cells.js +++ b/application/basilisk/base/content/newtab/cells.js @@ -81,7 +81,7 @@ Cell.prototype = { * Checks whether the cell contains a pinned site. * @return Whether the cell contains a pinned site. */ - containsPinnedSite: function Cell_containsPinnedSite() { + containsPinnedSite: function() { let site = this.site; return site && site.isPinned(); }, @@ -90,14 +90,14 @@ Cell.prototype = { * Checks whether the cell contains a site (is empty). * @return Whether the cell is empty. */ - isEmpty: function Cell_isEmpty() { + isEmpty: function() { return !this.site; }, /** * Handles all cell events. */ - handleEvent: function Cell_handleEvent(aEvent) { + handleEvent: function(aEvent) { // We're not responding to external drag/drop events // when our parent window is in private browsing mode. if (inPrivateBrowsingMode() && !gDrag.draggedSite) diff --git a/application/basilisk/base/content/newtab/drag.js b/application/basilisk/base/content/newtab/drag.js index e3928ebd0..566e3755f 100644 --- a/application/basilisk/base/content/newtab/drag.js +++ b/application/basilisk/base/content/newtab/drag.js @@ -33,7 +33,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'dragstart' event. */ - start: function Drag_start(aSite, aEvent) { + start: function(aSite, aEvent) { this._draggedSite = aSite; // Mark nodes as being dragged. @@ -66,7 +66,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'drag' event. */ - drag: function Drag_drag(aSite, aEvent) { + drag: function(aSite, aEvent) { // Get the viewport size. let {clientWidth, clientHeight} = document.documentElement; @@ -90,7 +90,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'dragend' event. */ - end: function Drag_end(aSite, aEvent) { + end: function(aSite, aEvent) { let nodes = gGrid.node.querySelectorAll("[dragged]") for (let i = 0; i < nodes.length; i++) nodes[i].removeAttribute("dragged"); @@ -106,7 +106,7 @@ var gDrag = { * @param aEvent The drag event to check. * @return Whether we should handle this drag and drop operation. */ - isValid: function Drag_isValid(aEvent) { + isValid: function(aEvent) { let link = gDragDataHelper.getLinkFromDragEvent(aEvent); // Check that the drag data is non-empty. @@ -125,7 +125,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'dragstart' event. */ - _setDragData: function Drag_setDragData(aSite, aEvent) { + _setDragData: function(aSite, aEvent) { let {url, title} = aSite; let dt = aEvent.dataTransfer; diff --git a/application/basilisk/base/content/newtab/dragDataHelper.js b/application/basilisk/base/content/newtab/dragDataHelper.js index 675ff2671..e92b9bb1c 100644 --- a/application/basilisk/base/content/newtab/dragDataHelper.js +++ b/application/basilisk/base/content/newtab/dragDataHelper.js @@ -9,7 +9,7 @@ var gDragDataHelper = { return "text/x-moz-url"; }, - getLinkFromDragEvent: function DragDataHelper_getLinkFromDragEvent(aEvent) { + getLinkFromDragEvent: function(aEvent) { let dt = aEvent.dataTransfer; if (!dt || !dt.types.includes(this.mimeType)) { return null; diff --git a/application/basilisk/base/content/newtab/drop.js b/application/basilisk/base/content/newtab/drop.js index 748652455..da194c5ea 100644 --- a/application/basilisk/base/content/newtab/drop.js +++ b/application/basilisk/base/content/newtab/drop.js @@ -21,7 +21,7 @@ var gDrop = { * Handles the 'dragenter' event. * @param aCell The drop target cell. */ - enter: function Drop_enter(aCell) { + enter: function(aCell) { this._delayedRearrange(aCell); }, @@ -30,7 +30,7 @@ var gDrop = { * @param aCell The drop target cell. * @param aEvent The 'dragexit' event. */ - exit: function Drop_exit(aCell, aEvent) { + exit: function(aCell, aEvent) { if (aEvent.dataTransfer && !aEvent.dataTransfer.mozUserCancelled) { this._delayedRearrange(); } else { @@ -45,7 +45,7 @@ var gDrop = { * @param aCell The drop target cell. * @param aEvent The 'dragexit' event. */ - drop: function Drop_drop(aCell, aEvent) { + drop: function(aCell, aEvent) { // The cell that is the drop target could contain a pinned site. We need // to find out where that site has gone and re-pin it there. if (aCell.containsPinnedSite()) @@ -64,7 +64,7 @@ var gDrop = { * Re-pins all pinned sites in their (new) positions. * @param aCell The drop target cell. */ - _repinSitesAfterDrop: function Drop_repinSitesAfterDrop(aCell) { + _repinSitesAfterDrop: function(aCell) { let sites = gDropPreview.rearrange(aCell); // Filter out pinned sites. @@ -81,7 +81,7 @@ var gDrop = { * @param aCell The drop target cell. * @param aEvent The 'dragexit' event. */ - _pinDraggedSite: function Drop_pinDraggedSite(aCell, aEvent) { + _pinDraggedSite: function(aCell, aEvent) { let index = aCell.index; let draggedSite = gDrag.draggedSite; @@ -105,7 +105,7 @@ var gDrop = { * Time a rearrange with a little delay. * @param aCell The drop target cell. */ - _delayedRearrange: function Drop_delayedRearrange(aCell) { + _delayedRearrange: function(aCell) { // The last drop target didn't change so there's no need to re-arrange. if (this._lastDropTarget == aCell) return; @@ -127,7 +127,7 @@ var gDrop = { /** * Cancels a timed rearrange, if any. */ - _cancelDelayedArrange: function Drop_cancelDelayedArrange() { + _cancelDelayedArrange: function() { if (this._rearrangeTimeout) { clearTimeout(this._rearrangeTimeout); this._rearrangeTimeout = null; @@ -138,7 +138,7 @@ var gDrop = { * Rearrange all sites in the grid depending on the current drop target. * @param aCell The drop target cell. */ - _rearrange: function Drop_rearrange(aCell) { + _rearrange: function(aCell) { let sites = gGrid.sites; // We need to rearrange the grid only if there's a current drop target. diff --git a/application/basilisk/base/content/newtab/dropPreview.js b/application/basilisk/base/content/newtab/dropPreview.js index fd7587a35..e9fdfd584 100644 --- a/application/basilisk/base/content/newtab/dropPreview.js +++ b/application/basilisk/base/content/newtab/dropPreview.js @@ -16,7 +16,7 @@ var gDropPreview = { * @param aCell The drop target cell. * @return The re-arranged array of sites. */ - rearrange: function DropPreview_rearrange(aCell) { + rearrange: function(aCell) { let sites = gGrid.sites; // Insert the dragged site into the current grid. @@ -34,7 +34,7 @@ var gDropPreview = { * @param aSites The array of sites to insert into. * @param aCell The drop target cell. */ - _insertDraggedSite: function DropPreview_insertDraggedSite(aSites, aCell) { + _insertDraggedSite: function(aSites, aCell) { let dropIndex = aCell.index; let draggedSite = gDrag.draggedSite; @@ -85,7 +85,7 @@ var gDropPreview = { * @param aCell The drop target cell. * @return The filtered array of sites. */ - _filterPinnedSites: function DropPreview_filterPinnedSites(aSites, aCell) { + _filterPinnedSites: function(aSites, aCell) { let draggedSite = gDrag.draggedSite; // When dropping on a cell that contains a pinned site make sure that all @@ -109,7 +109,7 @@ var gDropPreview = { * @param aCell The drop target cell. * @return The range of pinned cells. */ - _getPinnedRange: function DropPreview_getPinnedRange(aCell) { + _getPinnedRange: function(aCell) { let dropIndex = aCell.index; let range = {start: dropIndex, end: dropIndex}; diff --git a/application/basilisk/base/content/newtab/dropTargetShim.js b/application/basilisk/base/content/newtab/dropTargetShim.js index 57a97fa00..4e8300a9c 100644 --- a/application/basilisk/base/content/newtab/dropTargetShim.js +++ b/application/basilisk/base/content/newtab/dropTargetShim.js @@ -204,7 +204,7 @@ var gDropTargetShim = { * Gets the positions of all cell nodes. * @return The (cached) cell positions. */ - _getCellPositions: function DropTargetShim_getCellPositions() { + _getCellPositions: function() { if (this._cellPositions) return this._cellPositions; diff --git a/application/basilisk/base/content/newtab/grid.js b/application/basilisk/base/content/newtab/grid.js index 726150a6c..e2a70b4ca 100644 --- a/application/basilisk/base/content/newtab/grid.js +++ b/application/basilisk/base/content/newtab/grid.js @@ -47,7 +47,7 @@ var gGrid = { * Initializes the grid. * @param aSelector The query selector of the grid. */ - init: function Grid_init() { + init: function() { this._node = document.getElementById("newtab-grid"); this._gridDefaultContent = this._node.lastChild; this._createSiteFragment(); @@ -77,7 +77,7 @@ var gGrid = { * @param aCell The cell that will contain the new site. * @return The newly created site. */ - createSite: function Grid_createSite(aLink, aCell) { + createSite: function(aLink, aCell) { let node = aCell.node; node.appendChild(this._siteFragment.cloneNode(true)); return new Site(node.firstElementChild, aLink); @@ -86,7 +86,7 @@ var gGrid = { /** * Handles all grid events. */ - handleEvent: function Grid_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "load": case "resize": @@ -98,14 +98,14 @@ var gGrid = { /** * Locks the grid to block all pointer events. */ - lock: function Grid_lock() { + lock: function() { this.node.setAttribute("locked", "true"); }, /** * Unlocks the grid to allow all pointer events. */ - unlock: function Grid_unlock() { + unlock: function() { this.node.removeAttribute("locked"); }, @@ -158,7 +158,7 @@ var gGrid = { * Calculate the height for a number of rows up to the maximum rows * @param rows Number of rows defaulting to the max */ - _computeHeight: function Grid_computeHeight(aRows) { + _computeHeight: function(aRows) { let {gridRows} = gGridPrefs; aRows = aRows === undefined ? gridRows : Math.min(gridRows, aRows); return aRows * this._cellHeight + GRID_BOTTOM_EXTRA; @@ -167,7 +167,7 @@ var gGrid = { /** * Creates the DOM fragment that is re-used when creating sites. */ - _createSiteFragment: function Grid_createSiteFragment() { + _createSiteFragment: function() { let site = document.createElementNS(HTML_NAMESPACE, "div"); site.classList.add("newtab-site"); site.setAttribute("draggable", "true"); @@ -192,7 +192,7 @@ var gGrid = { * Test a tile at a given position for being pinned or history * @param position Position in sites array */ - _isHistoricalTile: function Grid_isHistoricalTile(aPos) { + _isHistoricalTile: function(aPos) { let site = this.sites[aPos]; return site && (site.isPinned() || site.link && site.link.type == "history"); }, @@ -200,7 +200,7 @@ var gGrid = { /** * Make sure the correct number of rows and columns are visible */ - _resizeGrid: function Grid_resizeGrid() { + _resizeGrid: function() { // If we're somehow called before the page has finished loading, // let's bail out to avoid caching zero heights and widths. // We'll be called again when DOMContentLoaded fires. diff --git a/application/basilisk/base/content/newtab/page.js b/application/basilisk/base/content/newtab/page.js index e88420776..95f6f6ee7 100644 --- a/application/basilisk/base/content/newtab/page.js +++ b/application/basilisk/base/content/newtab/page.js @@ -15,7 +15,7 @@ var gPage = { /** * Initializes the page. */ - init: function Page_init() { + init: function() { // Add ourselves to the list of pages to receive notifications. gAllPages.register(this); @@ -38,7 +38,7 @@ var gPage = { /** * Listens for notifications specific to this page. */ - observe: function Page_observe(aSubject, aTopic, aData) { + observe: function(aSubject, aTopic, aData) { if (aTopic == "nsPref:changed") { let enabled = gAllPages.enabled; @@ -96,7 +96,7 @@ var gPage = { * Internally initializes the page. This runs only when/if the feature * is/gets enabled. */ - _init: function Page_init() { + _init: function() { if (this._initialized) return; @@ -133,7 +133,7 @@ var gPage = { * Updates the 'page-disabled' attributes of the respective DOM nodes. * @param aValue Whether the New Tab Page is enabled or not. */ - _updateAttributes: function Page_updateAttributes(aValue) { + _updateAttributes: function(aValue) { // Set the nodes' states. let nodeSelector = "#newtab-grid, #newtab-search-container"; for (let node of document.querySelectorAll(nodeSelector)) { @@ -156,14 +156,14 @@ var gPage = { /** * Handles unload event */ - _handleUnloadEvent: function Page_handleUnloadEvent() { + _handleUnloadEvent: function() { gAllPages.unregister(this); }, /** * Handles all page events. */ - handleEvent: function Page_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "load": this.onPageVisibleAndLoaded(); diff --git a/application/basilisk/base/content/newtab/sites.js b/application/basilisk/base/content/newtab/sites.js index 36c0e78a7..5efe14fd0 100644 --- a/application/basilisk/base/content/newtab/sites.js +++ b/application/basilisk/base/content/newtab/sites.js @@ -55,7 +55,7 @@ Site.prototype = { * @param aIndex The pinned index (optional). * @return true if link changed type after pin */ - pin: function Site_pin(aIndex) { + pin: function(aIndex) { if (typeof aIndex == "undefined") aIndex = this.cell.index; @@ -71,7 +71,7 @@ Site.prototype = { /** * Unpins the site and calls the given callback when done. */ - unpin: function Site_unpin() { + unpin: function() { if (this.isPinned()) { this._updateAttributes(false); gPinnedLinks.unpin(this._link); @@ -83,7 +83,7 @@ Site.prototype = { * Checks whether this site is pinned. * @return Whether this site is pinned. */ - isPinned: function Site_isPinned() { + isPinned: function() { return gPinnedLinks.isPinned(this._link); }, @@ -91,7 +91,7 @@ Site.prototype = { * Blocks the site (removes it from the grid) and calls the given callback * when done. */ - block: function Site_block() { + block: function() { if (!gBlockedLinks.isBlocked(this._link)) { gUndoDialog.show(this); gBlockedLinks.block(this._link); @@ -104,7 +104,7 @@ Site.prototype = { * @param aSelector The query selector. * @return The DOM node we found. */ - _querySelector: function Site_querySelector(aSelector) { + _querySelector: function(aSelector) { return this.node.querySelector(aSelector); }, @@ -139,7 +139,7 @@ Site.prototype = { /** * Checks for and modifies link at campaign end time */ - _checkLinkEndTime: function Site_checkLinkEndTime() { + _checkLinkEndTime: function() { if (this.link.endTime && this.link.endTime < Date.now()) { let oldUrl = this.url; // chop off the path part from url @@ -155,7 +155,7 @@ Site.prototype = { /** * Renders the site's data (fills the HTML fragment). */ - _render: function Site_render() { + _render: function() { // first check for end time, as it may modify the link this._checkLinkEndTime(); // setup display variables @@ -188,7 +188,7 @@ Site.prototype = { * Since the newtab may be preloaded long before it's displayed, * check for changed conditions and re-render if needed */ - onFirstVisible: function Site_onFirstVisible() { + onFirstVisible: function() { if (this.link.endTime && this.link.endTime < Date.now()) { // site needs to change landing url and background image this._render(); @@ -202,7 +202,7 @@ Site.prototype = { * Captures the site's thumbnail in the background, but only if there's no * existing thumbnail and the page allows background captures. */ - captureIfMissing: function Site_captureIfMissing() { + captureIfMissing: function() { if (!document.hidden && !this.link.imageURI) { BackgroundPageThumbs.captureIfMissing(this.url); } @@ -211,7 +211,7 @@ Site.prototype = { /** * Refreshes the thumbnail for the site. */ - refreshThumbnail: function Site_refreshThumbnail() { + refreshThumbnail: function() { let link = this.link; let thumbnail = this._querySelector(".newtab-thumbnail.thumbnail"); @@ -248,7 +248,7 @@ Site.prototype = { /** * Adds event handlers for the site and its buttons. */ - _addEventHandlers: function Site_addEventHandlers() { + _addEventHandlers: function() { // Register drag-and-drop event handlers. this._node.addEventListener("dragstart", this, false); this._node.addEventListener("dragend", this, false); @@ -258,7 +258,7 @@ Site.prototype = { /** * Speculatively opens a connection to the current site. */ - _speculativeConnect: function Site_speculativeConnect() { + _speculativeConnect: function() { let sc = Services.io.QueryInterface(Ci.nsISpeculativeConnect); let uri = Services.io.newURI(this.url, null, null); try { @@ -271,7 +271,7 @@ Site.prototype = { /** * Record interaction with site using telemetry. */ - _recordSiteClicked: function Site_recordSiteClicked(aIndex) { + _recordSiteClicked: function(aIndex) { if (Services.prefs.prefHasUserValue("browser.newtabpage.rows") || Services.prefs.prefHasUserValue("browser.newtabpage.columns") || aIndex > 8) { @@ -286,7 +286,7 @@ Site.prototype = { /** * Handles site click events. */ - onClick: function Site_onClick(aEvent) { + onClick: function(aEvent) { let action; let pinned = this.isPinned(); let tileIndex = this.cell.index; @@ -325,7 +325,7 @@ Site.prototype = { /** * Handles all site events. */ - handleEvent: function Site_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "mouseover": this._node.removeEventListener("mouseover", this, false); diff --git a/application/basilisk/base/content/newtab/transformations.js b/application/basilisk/base/content/newtab/transformations.js index f7db0ad84..a9e99b513 100644 --- a/application/basilisk/base/content/newtab/transformations.js +++ b/application/basilisk/base/content/newtab/transformations.js @@ -33,7 +33,7 @@ var gTransformation = { * @param aNode The DOM node. * @return A Rect instance with the position. */ - getNodePosition: function Transformation_getNodePosition(aNode) { + getNodePosition: function(aNode) { let {left, top, width, height} = aNode.getBoundingClientRect(); return new Rect(left + scrollX, top + scrollY, width, height); }, @@ -43,7 +43,7 @@ var gTransformation = { * @param aNode The node to fade. * @param aCallback The callback to call when finished. */ - fadeNodeIn: function Transformation_fadeNodeIn(aNode, aCallback) { + fadeNodeIn: function(aNode, aCallback) { this._setNodeOpacity(aNode, 1, function () { // Clear the style property. aNode.style.opacity = ""; @@ -58,7 +58,7 @@ var gTransformation = { * @param aNode The node to fade. * @param aCallback The callback to call when finished. */ - fadeNodeOut: function Transformation_fadeNodeOut(aNode, aCallback) { + fadeNodeOut: function(aNode, aCallback) { this._setNodeOpacity(aNode, 0, aCallback); }, @@ -67,7 +67,7 @@ var gTransformation = { * @param aSite The site to fade. * @param aCallback The callback to call when finished. */ - showSite: function Transformation_showSite(aSite, aCallback) { + showSite: function(aSite, aCallback) { this.fadeNodeIn(aSite.node, aCallback); }, @@ -76,7 +76,7 @@ var gTransformation = { * @param aSite The site to fade. * @param aCallback The callback to call when finished. */ - hideSite: function Transformation_hideSite(aSite, aCallback) { + hideSite: function(aSite, aCallback) { this.fadeNodeOut(aSite.node, aCallback); }, @@ -85,7 +85,7 @@ var gTransformation = { * @param aSite The site to re-position. * @param aPosition The desired position for the given site. */ - setSitePosition: function Transformation_setSitePosition(aSite, aPosition) { + setSitePosition: function(aSite, aPosition) { let style = aSite.node.style; let {top, left} = aPosition; @@ -97,7 +97,7 @@ var gTransformation = { * Freezes a site in its current position by positioning it absolute. * @param aSite The site to freeze. */ - freezeSitePosition: function Transformation_freezeSitePosition(aSite) { + freezeSitePosition: function(aSite) { if (this._isFrozen(aSite)) return; @@ -114,7 +114,7 @@ var gTransformation = { * Unfreezes a site by removing its absolute positioning. * @param aSite The site to unfreeze. */ - unfreezeSitePosition: function Transformation_unfreezeSitePosition(aSite) { + unfreezeSitePosition: function(aSite) { if (!this._isFrozen(aSite)) return; @@ -131,7 +131,7 @@ var gTransformation = { * unfreeze - unfreeze the site after sliding * callback - the callback to call when finished */ - slideSiteTo: function Transformation_slideSiteTo(aSite, aTarget, aOptions) { + slideSiteTo: function(aSite, aTarget, aOptions) { let currentPosition = this.getNodePosition(aSite.node); let targetPosition = this.getNodePosition(aTarget.node) let callback = aOptions && aOptions.callback; @@ -168,7 +168,7 @@ var gTransformation = { * unfreeze - unfreeze the site after rearranging * callback - the callback to call when finished */ - rearrangeSites: function Transformation_rearrangeSites(aSites, aOptions) { + rearrangeSites: function(aSites, aOptions) { let batch = []; let cells = gGrid.cells; let callback = aOptions && aOptions.callback; @@ -222,7 +222,7 @@ var gTransformation = { * @param aNode The node to get the opacity value from. * @return The node's opacity value. */ - _getNodeOpacity: function Transformation_getNodeOpacity(aNode) { + _getNodeOpacity: function(aNode) { let cstyle = window.getComputedStyle(aNode, null); return cstyle.getPropertyValue("opacity"); }, @@ -254,7 +254,7 @@ var gTransformation = { * @param aIndex The target cell's index. * @param aOptions Options that are directly passed to slideSiteTo(). */ - _moveSite: function Transformation_moveSite(aSite, aIndex, aOptions) { + _moveSite: function(aSite, aIndex, aOptions) { this.freezeSitePosition(aSite); this.slideSiteTo(aSite, gGrid.cells[aIndex], aOptions); }, @@ -264,7 +264,7 @@ var gTransformation = { * @param aSite The site to check. * @return Whether the given site is frozen. */ - _isFrozen: function Transformation_isFrozen(aSite) { + _isFrozen: function(aSite) { return aSite.node.hasAttribute("frozen"); } }; diff --git a/application/basilisk/base/content/newtab/undo.js b/application/basilisk/base/content/newtab/undo.js index b856914d2..9abcabf0f 100644 --- a/application/basilisk/base/content/newtab/undo.js +++ b/application/basilisk/base/content/newtab/undo.js @@ -22,7 +22,7 @@ var gUndoDialog = { /** * Initializes the undo dialog. */ - init: function UndoDialog_init() { + init: function() { this._undoContainer = document.getElementById("newtab-undo-container"); this._undoContainer.addEventListener("click", this, false); this._undoButton = document.getElementById("newtab-undo-button"); @@ -34,7 +34,7 @@ var gUndoDialog = { * Shows the undo dialog. * @param aSite The site that just got removed. */ - show: function UndoDialog_show(aSite) { + show: function(aSite) { if (this._undoData) clearTimeout(this._undoData.timeout); @@ -54,7 +54,7 @@ var gUndoDialog = { /** * Hides the undo dialog. */ - hide: function UndoDialog_hide() { + hide: function() { if (!this._undoData) return; @@ -70,7 +70,7 @@ var gUndoDialog = { * The undo dialog event handler. * @param aEvent The event to handle. */ - handleEvent: function UndoDialog_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.target.id) { case "newtab-undo-button": this._undo(); @@ -87,7 +87,7 @@ var gUndoDialog = { /** * Undo the last blocked site. */ - _undo: function UndoDialog_undo() { + _undo: function() { if (!this._undoData) return; @@ -105,7 +105,7 @@ var gUndoDialog = { /** * Undo all blocked sites. */ - _undoAll: function UndoDialog_undoAll() { + _undoAll: function() { NewTabUtils.undoAll(function() { gUpdater.updateGrid(); this.hide(); diff --git a/application/basilisk/base/content/newtab/updater.js b/application/basilisk/base/content/newtab/updater.js index 2bab74d70..e40213c54 100644 --- a/application/basilisk/base/content/newtab/updater.js +++ b/application/basilisk/base/content/newtab/updater.js @@ -14,7 +14,7 @@ var gUpdater = { * This removes old, moves existing and creates new sites to fill gaps. * @param aCallback The callback to call when finished. */ - updateGrid: function Updater_updateGrid(aCallback) { + updateGrid: function(aCallback) { let links = gLinks.getLinks().slice(0, gGrid.cells.length); // Find all sites that remain in the grid. @@ -50,7 +50,7 @@ var gUpdater = { * @param aLinks The array of links to find sites for. * @return Array of sites mapped to the given links (can contain null values). */ - _findRemainingSites: function Updater_findRemainingSites(aLinks) { + _findRemainingSites: function(aLinks) { let map = {}; // Create a map to easily retrieve the site for a given URL. @@ -69,7 +69,7 @@ var gUpdater = { * Freezes the given sites' positions. * @param aSites The array of sites to freeze. */ - _freezeSitePositions: function Updater_freezeSitePositions(aSites) { + _freezeSitePositions: function(aSites) { aSites.forEach(function (aSite) { if (aSite) gTransformation.freezeSitePosition(aSite); @@ -80,7 +80,7 @@ var gUpdater = { * Moves the given sites' DOM nodes to their new positions. * @param aSites The array of sites to move. */ - _moveSiteNodes: function Updater_moveSiteNodes(aSites) { + _moveSiteNodes: function(aSites) { let cells = gGrid.cells; // Truncate the given array of sites to not have more sites than cells. @@ -112,7 +112,7 @@ var gUpdater = { * @param aSites The array of sites to re-arrange. * @param aCallback The callback to call when finished. */ - _rearrangeSites: function Updater_rearrangeSites(aSites, aCallback) { + _rearrangeSites: function(aSites, aCallback) { let options = {callback: aCallback, unfreeze: true}; gTransformation.rearrangeSites(aSites, options); }, @@ -123,7 +123,7 @@ var gUpdater = { * @param aSites The array of sites remaining in the grid. * @param aCallback The callback to call when finished. */ - _removeLegacySites: function Updater_removeLegacySites(aSites, aCallback) { + _removeLegacySites: function(aSites, aCallback) { let batch = []; // Delete sites that were removed from the grid. @@ -152,7 +152,7 @@ var gUpdater = { * @param aLinks The array of links. * @param aCallback The callback to call when finished. */ - _fillEmptyCells: function Updater_fillEmptyCells(aLinks, aCallback) { + _fillEmptyCells: function(aLinks, aCallback) { let {cells, sites} = gGrid; // Find empty cells and fill them. diff --git a/application/basilisk/base/content/nsContextMenu.js b/application/basilisk/base/content/nsContextMenu.js index 675b1e431..afd592a07 100644 --- a/application/basilisk/base/content/nsContextMenu.js +++ b/application/basilisk/base/content/nsContextMenu.js @@ -24,7 +24,7 @@ function nsContextMenu(aXulMenu, aIsShift) { // Prototype for nsContextMenu "class." nsContextMenu.prototype = { - initMenu: function CM_initMenu(aXulMenu, aIsShift) { + initMenu: function(aXulMenu, aIsShift) { // Get contextual info. this.setTarget(document.popupNode, document.popupRangeParent, document.popupRangeOffset); @@ -86,7 +86,7 @@ nsContextMenu.prototype = { this.initItems(); }, - hiding: function CM_hiding() { + hiding: function() { gContextMenuContentData = null; InlineSpellCheckerUI.clearSuggestionsFromMenu(); InlineSpellCheckerUI.clearDictionaryListFromMenu(); @@ -99,7 +99,7 @@ nsContextMenu.prototype = { } }, - initItems: function CM_initItems() { + initItems: function() { this.initPageMenuSeparator(); this.initOpenItems(); this.initNavigationItems(); @@ -114,11 +114,11 @@ nsContextMenu.prototype = { this.initPasswordManagerItems(); }, - initPageMenuSeparator: function CM_initPageMenuSeparator() { + initPageMenuSeparator: function() { this.showItem("page-menu-separator", this.hasPageMenu); }, - initOpenItems: function CM_initOpenItems() { + initOpenItems: function() { var isMailtoInternal = false; if (this.onMailtoLink) { var mailtoHandler = Cc["@mozilla.org/uriloader/external-protocol-service;1"]. @@ -149,7 +149,7 @@ nsContextMenu.prototype = { this.showItem("context-sep-open", shouldShow); }, - initNavigationItems: function CM_initNavigationItems() { + initNavigationItems: function() { var shouldShow = !(this.isContentSelected || this.onLink || this.onImage || this.onCanvas || this.onVideo || this.onAudio || this.onTextInput); @@ -170,7 +170,7 @@ nsContextMenu.prototype = { //this.setItemAttrFromNode( "context-stop", "disabled", "canStop" ); }, - initLeaveDOMFullScreenItems: function CM_initLeaveFullScreenItem() { + initLeaveDOMFullScreenItems: function() { // only show the option if the user is in DOM fullscreen var shouldShow = (this.target.ownerDocument.fullscreenElement != null); this.showItem("context-leave-dom-fullscreen", shouldShow); @@ -180,7 +180,7 @@ nsContextMenu.prototype = { this.showItem("context-media-sep-commands", true); }, - initSaveItems: function CM_initSaveItems() { + initSaveItems: function() { var shouldShow = !(this.onTextInput || this.onLink || this.isContentSelected || this.onImage || this.onCanvas || this.onVideo || this.onAudio); @@ -205,7 +205,7 @@ nsContextMenu.prototype = { this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL || mediaIsBlob); }, - initViewItems: function CM_initViewItems() { + initViewItems: function() { // View source is always OK, unless in directory listing. this.showItem("context-viewpartialsource-selection", this.isContentSelected); @@ -268,7 +268,7 @@ nsContextMenu.prototype = { this.showItem("context-viewimagedesc", this.onImage && this.imageDescURL !== ""); }, - initMiscItems: function CM_initMiscItems() { + initMiscItems: function() { // Use "Bookmark This Link" if on a link. let bookmarkPage = document.getElementById("context-bookmarkpage"); this.showItem(bookmarkPage, @@ -1214,7 +1214,7 @@ nsContextMenu.prototype = { saveAsListener.prototype = { extListener: null, - onStartRequest: function saveLinkAs_onStartRequest(aRequest, aContext) { + onStartRequest: function(aRequest, aContext) { // if the timer fired, the error status will have been caused by that, // and we'll be restarting in onStopRequest, so no reason to notify @@ -1255,7 +1255,7 @@ nsContextMenu.prototype = { this.extListener.onStartRequest(aRequest, aContext); }, - onStopRequest: function saveLinkAs_onStopRequest(aRequest, aContext, + onStopRequest: function(aRequest, aContext, aStatusCode) { if (aStatusCode == NS_ERROR_SAVE_LINK_AS_TIMEOUT) { // do it the old fashioned way, which will pick the best filename @@ -1267,7 +1267,7 @@ nsContextMenu.prototype = { this.extListener.onStopRequest(aRequest, aContext, aStatusCode); }, - onDataAvailable: function saveLinkAs_onDataAvailable(aRequest, aContext, + onDataAvailable: function(aRequest, aContext, aInputStream, aOffset, aCount) { this.extListener.onDataAvailable(aRequest, aContext, aInputStream, @@ -1277,7 +1277,7 @@ nsContextMenu.prototype = { function callbacks() {} callbacks.prototype = { - getInterface: function sLA_callbacks_getInterface(aIID) { + getInterface: function(aIID) { if (aIID.equals(Ci.nsIAuthPrompt) || aIID.equals(Ci.nsIAuthPrompt2)) { // If the channel demands authentication prompt, we must cancel it // because the save-as-timer would expire and cancel the channel @@ -1296,7 +1296,7 @@ nsContextMenu.prototype = { // we give up waiting for the filename. function timerCallback() {} timerCallback.prototype = { - notify: function sLA_timer_notify(aTimer) { + notify: function(aTimer) { channel.cancel(NS_ERROR_SAVE_LINK_AS_TIMEOUT); return; } @@ -1617,16 +1617,16 @@ nsContextMenu.prototype = { openUILinkIn(uri, where); }, - bookmarkThisPage: function CM_bookmarkThisPage() { + bookmarkThisPage: function() { window.top.PlacesCommandHook.bookmarkPage(this.browser, PlacesUtils.bookmarksMenuFolderId, true); }, - bookmarkLink: function CM_bookmarkLink() { + bookmarkLink: function() { window.top.PlacesCommandHook.bookmarkLink(PlacesUtils.bookmarksMenuFolderId, this.linkURL, this.linkTextStr); }, - addBookmarkForFrame: function CM_addBookmarkForFrame() { + addBookmarkForFrame: function() { let uri = gContextMenuContentData.documentURIObject; let mm = this.browser.messageManager; @@ -1644,19 +1644,19 @@ nsContextMenu.prototype = { mm.sendAsyncMessage("ContextMenu:BookmarkFrame", null, { target: this.target }); }, - savePageAs: function CM_savePageAs() { + savePageAs: function() { saveBrowser(this.browser); }, - printFrame: function CM_printFrame() { + printFrame: function() { PrintUtils.printWindow(this.frameOuterWindowID, this.browser); }, - switchPageDirection: function CM_switchPageDirection() { + switchPageDirection: function() { this.browser.messageManager.sendAsyncMessage("SwitchDocumentDirection"); }, - mediaCommand : function CM_mediaCommand(command, data) { + mediaCommand : function(command, data) { let mm = this.browser.messageManager; let win = this.browser.ownerGlobal; let windowUtils = win.QueryInterface(Ci.nsIInterfaceRequestor) diff --git a/application/basilisk/base/content/sanitizeDialog.js b/application/basilisk/base/content/sanitizeDialog.js index 279f1efd6..71c425e70 100644 --- a/application/basilisk/base/content/sanitizeDialog.js +++ b/application/basilisk/base/content/sanitizeDialog.js @@ -568,7 +568,7 @@ var gContiguousSelectionTreeHelper = { * view * @return The new view */ - setTree: function CSTH_setTree(aTreeElement, aProtoTreeView) + setTree: function(aTreeElement, aProtoTreeView) { this._tree = aTreeElement; var newView = this._makeTreeView(aProtoTreeView || aTreeElement.view); @@ -583,7 +583,7 @@ var gContiguousSelectionTreeHelper = { * * @return The row index of the grippy */ - getGrippyRow: function CSTH_getGrippyRow() + getGrippyRow: function() { var sel = this.tree.view.selection; var rangeCount = sel.getRangeCount(); @@ -605,7 +605,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed dragover event */ - ondragover: function CSTH_ondragover(aEvent) + ondragover: function(aEvent) { // Without this when dragging on Windows the mouse cursor is a "no" sign. // This makes it a drop symbol. @@ -632,7 +632,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed dragstart event */ - ondragstart: function CSTH_ondragstart(aEvent) + ondragstart: function(aEvent) { var tbo = this.tree.treeBoxObject; var clickedRow = tbo.getRowAt(aEvent.clientX, aEvent.clientY); @@ -667,7 +667,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed keypress event */ - onkeypress: function CSTH_onkeypress(aEvent) + onkeypress: function(aEvent) { var grippyRow = this.getGrippyRow(); var tbo = this.tree.treeBoxObject; @@ -728,7 +728,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed mousedown event */ - onmousedown: function CSTH_onmousedown(aEvent) + onmousedown: function(aEvent) { var tbo = this.tree.treeBoxObject; var clickedRow = tbo.getRowAt(aEvent.clientX, aEvent.clientY); @@ -750,7 +750,7 @@ var gContiguousSelectionTreeHelper = { * @param aEndRow * The range [0, aEndRow] will be selected. */ - rangedSelect: function CSTH_rangedSelect(aEndRow) + rangedSelect: function(aEndRow) { var tbo = this.tree.treeBoxObject; if (aEndRow < 0) @@ -763,7 +763,7 @@ var gContiguousSelectionTreeHelper = { /** * Scrolls the tree so that the grippy row is in the center of the view. */ - scrollToGrippy: function CSTH_scrollToGrippy() + scrollToGrippy: function() { var rowCount = this.tree.view.rowCount; var tbo = this.tree.treeBoxObject; @@ -796,7 +796,7 @@ var gContiguousSelectionTreeHelper = { * @param aProtoTreeView * Used as the new view's prototype if specified */ - _makeTreeView: function CSTH__makeTreeView(aProtoTreeView) + _makeTreeView: function(aProtoTreeView) { var view = aProtoTreeView; var that = this; diff --git a/application/basilisk/components/distribution.js b/application/basilisk/components/distribution.js index c30e4dcfe..85996d4f6 100644 --- a/application/basilisk/components/distribution.js +++ b/application/basilisk/components/distribution.js @@ -88,7 +88,7 @@ DistributionCustomizer.prototype = { return this._ioSvc; }, - _makeURI: function DIST__makeURI(spec) { + _makeURI: function(spec) { return this._ioSvc.newURI(spec, null, null); }, @@ -234,7 +234,7 @@ DistributionCustomizer.prototype = { _newProfile: false, _customizationsApplied: false, - applyCustomizations: function DIST_applyCustomizations() { + applyCustomizations: function() { this._customizationsApplied = true; if (!Services.prefs.prefHasUserValue("browser.migration.version")) @@ -296,7 +296,7 @@ DistributionCustomizer.prototype = { }), _prefDefaultsApplied: false, - applyPrefDefaults: function DIST_applyPrefDefaults() { + applyPrefDefaults: function() { this._prefDefaultsApplied = true; if (!this._ini) return this._checkCustomizationComplete(); @@ -435,7 +435,7 @@ DistributionCustomizer.prototype = { return this._checkCustomizationComplete(); }, - _checkCustomizationComplete: function DIST__checkCustomizationComplete() { + _checkCustomizationComplete: function() { const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; if (this._newProfile) { diff --git a/application/basilisk/components/feeds/content/subscribe.js b/application/basilisk/components/feeds/content/subscribe.js index 05a564bf1..6332649a2 100644 --- a/application/basilisk/components/feeds/content/subscribe.js +++ b/application/basilisk/components/feeds/content/subscribe.js @@ -11,15 +11,15 @@ var SubscribeHandler = { */ _feedWriter: null, - init: function SH_init() { + init: function() { this._feedWriter = new BrowserFeedWriter(); }, - writeContent: function SH_writeContent() { + writeContent: function() { this._feedWriter.writeContent(); }, - uninit: function SH_uninit() { + uninit: function() { this._feedWriter.close(); } }; diff --git a/application/basilisk/components/migration/ChromeProfileMigrator.js b/application/basilisk/components/migration/ChromeProfileMigrator.js index ec0c8d444..f78687ebf 100644 --- a/application/basilisk/components/migration/ChromeProfileMigrator.js +++ b/application/basilisk/components/migration/ChromeProfileMigrator.js @@ -167,7 +167,7 @@ ChromeProfileMigrator.prototype.getLastUsedDate = }; Object.defineProperty(ChromeProfileMigrator.prototype, "sourceProfiles", { - get: function Chrome_sourceProfiles() { + get: function() { if ("__sourceProfiles" in this) return this.__sourceProfiles; @@ -220,7 +220,7 @@ Object.defineProperty(ChromeProfileMigrator.prototype, "sourceProfiles", { }); Object.defineProperty(ChromeProfileMigrator.prototype, "sourceHomePageURL", { - get: function Chrome_sourceHomePageURL() { + get: function() { let prefsFile = this._chromeUserDataFolder.clone(); prefsFile.append("Preferences"); if (prefsFile.exists()) { @@ -243,7 +243,7 @@ Object.defineProperty(ChromeProfileMigrator.prototype, "sourceHomePageURL", { }); Object.defineProperty(ChromeProfileMigrator.prototype, "sourceLocked", { - get: function Chrome_sourceLocked() { + get: function() { // There is an exclusive lock on some SQLite databases. Assume they are locked for now. return true; }, diff --git a/application/basilisk/components/migration/IEProfileMigrator.js b/application/basilisk/components/migration/IEProfileMigrator.js index ac055686c..53c1323db 100644 --- a/application/basilisk/components/migration/IEProfileMigrator.js +++ b/application/basilisk/components/migration/IEProfileMigrator.js @@ -44,7 +44,7 @@ History.prototype = { return true; }, - migrate: function H_migrate(aCallback) { + migrate: function(aCallback) { let places = []; let typedURLs = MSMigrationUtils.getTypedURLs("Software\\Microsoft\\Internet Explorer"); let historyEnumerator = Cc["@mozilla.org/profile/migrator/iehistoryenumerator;1"]. @@ -349,7 +349,7 @@ Settings.prototype = { return true; }, - migrate: function S_migrate(aCallback) { + migrate: function(aCallback) { // Converts from yes/no to a boolean. let yesNoToBoolean = v => v == "yes"; @@ -437,7 +437,7 @@ Settings.prototype = { * @param [optional] aTransformFn * Conversion function from the Registry format to the pref format. */ - _set: function S__set(aPath, aKey, aPref, aTransformFn) { + _set: function(aPath, aKey, aPref, aTransformFn) { let value = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, aPath, aKey); // Don't import settings that have never been flipped. @@ -509,7 +509,7 @@ IEProfileMigrator.prototype.getLastUsedDate = function IE_getLastUsedDate() { }; Object.defineProperty(IEProfileMigrator.prototype, "sourceHomePageURL", { - get: function IE_get_sourceHomePageURL() { + get: function() { let defaultStartPage = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE, kMainKey, "Default_Page_URL"); let startPage = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, diff --git a/application/basilisk/components/migration/MSMigrationUtils.jsm b/application/basilisk/components/migration/MSMigrationUtils.jsm index 1e0250b06..fe3603f8c 100644 --- a/application/basilisk/components/migration/MSMigrationUtils.jsm +++ b/application/basilisk/components/migration/MSMigrationUtils.jsm @@ -363,7 +363,7 @@ Bookmarks.prototype = { return this.__toolbarFolderName; }, - migrate: function B_migrate(aCallback) { + migrate: function(aCallback) { return Task.spawn(function* () { // Import to the bookmarks menu. let folderGuid = PlacesUtils.bookmarks.menuGuid; diff --git a/application/basilisk/components/migration/MigrationUtils.jsm b/application/basilisk/components/migration/MigrationUtils.jsm index ccae006fe..9425cce2a 100644 --- a/application/basilisk/components/migration/MigrationUtils.jsm +++ b/application/basilisk/components/migration/MigrationUtils.jsm @@ -148,7 +148,7 @@ this.MigratorPrototype = { * aProfile is a value returned by the sourceProfiles getter (see * above). */ - getResources: function MP_getResources(/* aProfile */) { + getResources: function(/* aProfile */) { throw new Error("getResources must be overridden"); }, @@ -203,7 +203,7 @@ this.MigratorPrototype = { * * @see nsIBrowserProfileMigrator */ - getMigrateData: function MP_getMigrateData(aProfile) { + getMigrateData: function(aProfile) { let resources = this._getMaybeCachedResources(aProfile); if (!resources) { return []; @@ -212,7 +212,7 @@ this.MigratorPrototype = { return types.reduce((a, b) => { a |= b; return a }, 0); }, - getBrowserKey: function MP_getBrowserKey() { + getBrowserKey: function() { return this.contractID.match(/\=([^\=]+)$/)[1]; }, @@ -222,7 +222,7 @@ this.MigratorPrototype = { * * @see nsIBrowserProfileMigrator */ - migrate: function MP_migrate(aItems, aStartup, aProfile) { + migrate: function(aItems, aStartup, aProfile) { let resources = this._getMaybeCachedResources(aProfile); if (resources.length == 0) throw new Error("migrate called for a non-existent source"); @@ -426,7 +426,7 @@ this.MigratorPrototype = { }, /** * PRIVATE STUFF - DO NOT OVERRIDE ***/ - _getMaybeCachedResources: function PMB__getMaybeCachedResources(aProfile) { + _getMaybeCachedResources: function(aProfile) { let profileKey = aProfile ? aProfile.id : ""; if (this._resourcesByProfile) { if (profileKey in this._resourcesByProfile) @@ -487,7 +487,7 @@ this.MigrationUtils = Object.freeze({ * the callback function passed to |migrate|. * @return the wrapped function. */ - wrapMigrateFunction: function MU_wrapMigrateFunction(aFunction, aCallback) { + wrapMigrateFunction: function(aFunction, aCallback) { return function() { let success = false; try { @@ -520,7 +520,7 @@ this.MigrationUtils = Object.freeze({ * * @see nsIStringBundle */ - getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) { + getLocalizedString: function(aKey, aReplacements) { aKey = aKey.replace(/_(canary|chromium)$/, "_chrome"); const OVERRIDES = { @@ -678,7 +678,7 @@ this.MigrationUtils = Object.freeze({ * @return profile migrator implementing nsIBrowserProfileMigrator, if it can * import any data, null otherwise. */ - getMigrator: function MU_getMigrator(aKey) { + getMigrator: function(aKey) { let migrator = null; if (this._migrators.has(aKey)) { migrator = this._migrators.get(aKey); @@ -1071,7 +1071,7 @@ this.MigrationUtils = Object.freeze({ /** * Cleans up references to migrators and nsIProfileInstance instances. */ - finishMigration: function MU_finishMigration() { + finishMigration: function() { gMigrators = null; gProfileStartup = null; gMigrationBundle = null; diff --git a/application/basilisk/components/migration/SafariProfileMigrator.js b/application/basilisk/components/migration/SafariProfileMigrator.js index 6a2dbfcb1..7ba0bcf71 100644 --- a/application/basilisk/components/migration/SafariProfileMigrator.js +++ b/application/basilisk/components/migration/SafariProfileMigrator.js @@ -33,7 +33,7 @@ function Bookmarks(aBookmarksFile) { Bookmarks.prototype = { type: MigrationUtils.resourceTypes.BOOKMARKS, - migrate: function B_migrate(aCallback) { + migrate: function(aCallback) { return Task.spawn(function* () { let dict = yield new Promise(resolve => PropertyListUtils.read(this._file, resolve) @@ -188,7 +188,7 @@ History.prototype = { // Helper method for converting the visit date property to a PRTime value. // The visit date is stored as a string, so it's not read as a Date // object by PropertyListUtils. - _parseCocoaDate: function H___parseCocoaDate(aCocoaDateStr) { + _parseCocoaDate: function(aCocoaDateStr) { let asDouble = parseFloat(aCocoaDateStr); if (!isNaN(asDouble)) { // reference date of NSDate. @@ -199,7 +199,7 @@ History.prototype = { return 0; }, - migrate: function H_migrate(aCallback) { + migrate: function(aCallback) { PropertyListUtils.read(this._file, function migrateHistory(aDict) { try { if (!aDict) @@ -270,7 +270,7 @@ MainPreferencesPropertyList.prototype = { /** * @see PropertyListUtils.read */ - read: function MPPL_read(aCallback) { + read: function(aCallback) { if ("_dict" in this) { aCallback(this._dict); return; @@ -296,7 +296,7 @@ MainPreferencesPropertyList.prototype = { // Workaround for nsIBrowserProfileMigrator.sourceHomePageURL until // it's replaced with an async method. - _readSync: function MPPL__readSync() { + _readSync: function() { if ("_dict" in this) return this._dict; @@ -319,7 +319,7 @@ function Preferences(aMainPreferencesPropertyListInstance) { Preferences.prototype = { type: MigrationUtils.resourceTypes.SETTINGS, - migrate: function MPR_migrate(aCallback) { + migrate: function(aCallback) { this._mainPreferencesPropertyList.read(aDict => { Task.spawn(function* () { if (!aDict) @@ -370,7 +370,7 @@ Preferences.prototype = { * at all. * @return whether or not aMozPref was set. */ - _set: function MPR_set(aSafariKey, aMozPref, aConvertFunction) { + _set: function(aSafariKey, aMozPref, aConvertFunction) { if (this._dict.has(aSafariKey)) { let safariVal = this._dict.get(aSafariKey); let mozVal = aConvertFunction !== undefined ? @@ -417,7 +417,7 @@ Preferences.prototype = { // we set it for all languages. // As for the font type of the default font (serif/sans-serif), the default // type for the given language is used (set in font.default.LANGGROUP). - _migrateFontSettings: function MPR__migrateFontSettings() { + _migrateFontSettings: function() { // If "Never use font sizes smaller than [ ] is set", migrate it for all // languages. if (this._dict.has("WebKitMinimumFontSize")) { @@ -453,7 +453,7 @@ Preferences.prototype = { }, // Get the language group for the system locale. - _getLocaleLangGroup: function MPR__getLocaleLangGroup() { + _getLocaleLangGroup: function() { let locale = Services.locale.getLocaleComponentForUserAgent(); // See nsLanguageAtomService::GetLanguageGroup @@ -506,7 +506,7 @@ function SearchStrings(aMainPreferencesPropertyListInstance) { SearchStrings.prototype = { type: MigrationUtils.resourceTypes.OTHERDATA, - migrate: function SS_migrate(aCallback) { + migrate: function(aCallback) { this._mainPreferencesPropertyList.read(MigrationUtils.wrapMigrateFunction( function migrateSearchStrings(aDict) { if (!aDict) @@ -534,7 +534,7 @@ function WebFoundationCookieBehavior(aWebFoundationFile) { WebFoundationCookieBehavior.prototype = { type: MigrationUtils.resourceTypes.SETTINGS, - migrate: function WFPL_migrate(aCallback) { + migrate: function(aCallback) { PropertyListUtils.read(this._file, MigrationUtils.wrapMigrateFunction( function migrateCookieBehavior(aDict) { if (!aDict) @@ -614,7 +614,7 @@ SafariProfileMigrator.prototype.getLastUsedDate = function SM_getLastUsedDate() }; Object.defineProperty(SafariProfileMigrator.prototype, "mainPreferencesPropertyList", { - get: function get_mainPreferencesPropertyList() { + get: function() { if (this._mainPreferencesPropertyList === undefined) { let file = FileUtils.getDir("UsrPrfs", [], false); if (file.exists()) { @@ -633,7 +633,7 @@ Object.defineProperty(SafariProfileMigrator.prototype, "mainPreferencesPropertyL }); Object.defineProperty(SafariProfileMigrator.prototype, "sourceHomePageURL", { - get: function get_sourceHomePageURL() { + get: function() { if (this.mainPreferencesPropertyList) { let dict = this.mainPreferencesPropertyList._readSync(); if (dict.has("HomePage")) diff --git a/application/basilisk/components/nsBrowserContentHandler.js b/application/basilisk/components/nsBrowserContentHandler.js index d65e52594..841d7a481 100644 --- a/application/basilisk/components/nsBrowserContentHandler.js +++ b/application/basilisk/components/nsBrowserContentHandler.js @@ -276,7 +276,7 @@ nsBrowserContentHandler.prototype = { classID: Components.ID("{5d0ce354-df01-421a-83fb-7ead0990c24e}"), _xpcom_factory: { - createInstance: function bch_factory_ci(outer, iid) { + createInstance: function(outer, iid) { if (outer) throw Components.results.NS_ERROR_NO_AGGREGATION; return gBrowserContentHandler.QueryInterface(iid); @@ -304,7 +304,7 @@ nsBrowserContentHandler.prototype = { nsICommandLineValidator]), /* nsICommandLineHandler */ - handle : function bch_handle(cmdLine) { + handle : function(cmdLine) { if (cmdLine.handleFlag("browser", false)) { // Passing defaultArgs, so use NO_EXTERNAL_URIS openWindow(null, this.chromeURL, "_blank", @@ -565,7 +565,7 @@ nsBrowserContentHandler.prototype = { mFeatures : null, - getFeatures : function bch_features(cmdLine) { + getFeatures : function(cmdLine) { if (this.mFeatures === null) { this.mFeatures = ""; @@ -593,7 +593,7 @@ nsBrowserContentHandler.prototype = { /* nsIContentHandler */ - handleContent : function bch_handleContent(contentType, context, request) { + handleContent : function(contentType, context, request) { try { var webNavInfo = Components.classes["@mozilla.org/webnavigation-info;1"] .getService(nsIWebNavigationInfo); @@ -611,7 +611,7 @@ nsBrowserContentHandler.prototype = { }, /* nsICommandLineValidator */ - validate : function bch_validate(cmdLine) { + validate : function(cmdLine) { // Other handlers may use osint so only handle the osint flag if the url // flag is also present and the command line is valid. var osintFlagIdx = cmdLine.findFlag("osint", false); @@ -676,7 +676,7 @@ nsDefaultCommandLineHandler.prototype = { classID: Components.ID("{47cd0651-b1be-4a0f-b5c4-10e5a573ef71}"), /* nsISupports */ - QueryInterface : function dch_QI(iid) { + QueryInterface : function(iid) { if (!iid.equals(nsISupports) && !iid.equals(nsICommandLineHandler)) throw Components.results.NS_ERROR_NO_INTERFACE; @@ -687,7 +687,7 @@ nsDefaultCommandLineHandler.prototype = { _haveProfile: false, /* nsICommandLineHandler */ - handle : function dch_handle(cmdLine) { + handle : function(cmdLine) { // The -url flag is inserted by the operating system when the default // application handler is used. We check for default browser to remove // instances where users explicitly decide to "open with" the browser. diff --git a/application/basilisk/components/nsBrowserGlue.js b/application/basilisk/components/nsBrowserGlue.js index 976672372..16f9abbe6 100644 --- a/application/basilisk/components/nsBrowserGlue.js +++ b/application/basilisk/components/nsBrowserGlue.js @@ -85,7 +85,7 @@ const BOOKMARKS_BACKUP_MAX_INTERVAL_DAYS = 3; // Factory object const BrowserGlueServiceFactory = { _instance: null, - createInstance: function BGSF_createInstance(outer, iid) { + createInstance: function(outer, iid) { if (outer != null) throw Components.results.NS_ERROR_NO_AGGREGATION; return this._instance == null ? @@ -129,7 +129,7 @@ BrowserGlue.prototype = { _isPlacesDatabaseLocked: false, _migrationImportsDefaultBookmarks: false, - _setPrefToSaveSession: function BG__setPrefToSaveSession(aForce) { + _setPrefToSaveSession: function(aForce) { if (!this._saveSession && !aForce) return; @@ -142,7 +142,7 @@ BrowserGlue.prototype = { }, #ifdef MOZ_SERVICES_SYNC - _setSyncAutoconnectDelay: function BG__setSyncAutoconnectDelay() { + _setSyncAutoconnectDelay: function() { // Assume that a non-zero value for services.sync.autoconnectDelay should override if (Services.prefs.prefHasUserValue("services.sync.autoconnectDelay")) { let prefDelay = Services.prefs.getIntPref("services.sync.autoconnectDelay"); @@ -166,7 +166,7 @@ BrowserGlue.prototype = { #endif // nsIObserver implementation - observe: function BG_observe(subject, topic, data) { + observe: function(subject, topic, data) { switch (topic) { case "notifications-open-settings": this._openPreferences("content"); @@ -410,7 +410,7 @@ BrowserGlue.prototype = { }, // initialization (called on application startup) - _init: function BG__init() { + _init: function() { let os = Services.obs; os.addObserver(this, "notifications-open-settings", false); os.addObserver(this, "prefservice:after-app-defaults", false); @@ -461,7 +461,7 @@ BrowserGlue.prototype = { }, // cleanup (called on application shutdown) - _dispose: function BG__dispose() { + _dispose: function() { let os = Services.obs; os.removeObserver(this, "notifications-open-settings"); os.removeObserver(this, "prefservice:after-app-defaults"); @@ -499,13 +499,13 @@ BrowserGlue.prototype = { os.removeObserver(this, "autocomplete-did-enter-text"); }, - _onAppDefaults: function BG__onAppDefaults() { + _onAppDefaults: function() { // apply distribution customizations (prefs) // other customizations are applied in _finalUIStartup() this._distributionCustomizer.applyPrefDefaults(); }, - _notifySlowAddon: function BG_notifySlowAddon(addonId) { + _notifySlowAddon: function(addonId) { let addonCallback = function(addon) { if (!addon) { Cu.reportError("couldn't look up addon: " + addonId); @@ -617,7 +617,7 @@ BrowserGlue.prototype = { // runs on startup, before the first command line handler is invoked // (i.e. before the first window is opened) - _finalUIStartup: function BG__finalUIStartup() { + _finalUIStartup: function() { this._sanitizer.onStartup(); // check if we're in safe mode if (Services.appinfo.inSafeMode) { @@ -703,7 +703,7 @@ BrowserGlue.prototype = { } }, - _onSafeModeRestart: function BG_onSafeModeRestart() { + _onSafeModeRestart: function() { // prompt the user to confirm let strings = gBrowserBundle; let promptTitle = strings.GetStringFromName("safeModeRestartPromptTitle"); @@ -894,7 +894,7 @@ BrowserGlue.prototype = { }, // the first browser window has finished initializing - _onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) { + _onFirstWindowLoaded: function(aWindow) { // Initialize PdfJs when running in-process and remote. This only // happens once since PdfJs registers global hooks. If the PdfJs // extension is installed the init method below will be overridden @@ -1014,7 +1014,7 @@ BrowserGlue.prototype = { }, // All initial windows have opened. - _onWindowsRestored: function BG__onWindowsRestored() { + _onWindowsRestored: function() { // Show update notification, if needed. if (Services.prefs.prefHasUserValue("app.update.postupdate")) this._showUpdateNotification(); @@ -1150,7 +1150,7 @@ BrowserGlue.prototype = { E10SAccessibilityCheck.onWindowsRestored(); }, - _onQuitRequest: function BG__onQuitRequest(aCancelQuit, aQuitType) { + _onQuitRequest: function(aCancelQuit, aQuitType) { // If user has already dismissed quit request, then do nothing if ((aCancelQuit instanceof Ci.nsISupportsPRBool) && aCancelQuit.data) return; @@ -1280,7 +1280,7 @@ BrowserGlue.prototype = { } }, - _showUpdateNotification: function BG__showUpdateNotification() { + _showUpdateNotification: function() { Services.prefs.clearUserPref("app.update.postupdate"); var um = Cc["@mozilla.org/updates/update-manager;1"]. @@ -1399,7 +1399,7 @@ BrowserGlue.prototype = { * Set to true by safe-mode dialog to indicate we must restore default * bookmarks. */ - _initPlaces: function BG__initPlaces(aInitialMigrationPerformed) { + _initPlaces: function(aInitialMigrationPerformed) { // We must instantiate the history service since it will tell us if we // need to import or restore bookmarks due to first-run, corruption or // forced migration (due to a major schema change). @@ -1582,7 +1582,7 @@ BrowserGlue.prototype = { /** * If a backup for today doesn't exist, this creates one. */ - _backupBookmarks: function BG__backupBookmarks() { + _backupBookmarks: function() { return Task.spawn(function*() { let lastBackupFile = yield PlacesBackups.getMostRecentBackup(); // Should backup bookmarks if there are no backups or the maximum @@ -1598,7 +1598,7 @@ BrowserGlue.prototype = { /** * Show the notificationBox for a locked places database. */ - _showPlacesLockedNotificationBox: function BG__showPlacesLockedNotificationBox() { + _showPlacesLockedNotificationBox: function() { var applicationName = gBrandBundle.GetStringFromName("brandShortName"); var placesBundle = Services.strings.createBundle("chrome://browser/locale/places/places.properties"); var title = placesBundle.GetStringFromName("lockPrompt.title"); @@ -1647,7 +1647,7 @@ BrowserGlue.prototype = { AlertsService.showAlertNotification(null, title, body, true, null, clickCallback); }, - _migrateUI: function BG__migrateUI() { + _migrateUI: function() { const UI_VERSION = 42; const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; @@ -1973,7 +1973,7 @@ BrowserGlue.prototype = { Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, - _hasExistingNotificationPermission: function BG__hasExistingNotificationPermission() { + _hasExistingNotificationPermission: function() { let enumerator = Services.perms.enumerator; while (enumerator.hasMoreElements()) { let permission = enumerator.getNext().QueryInterface(Ci.nsIPermission); @@ -2020,7 +2020,7 @@ BrowserGlue.prototype = { // public nsIBrowserGlue members // ------------------------------ - sanitize: function BG_sanitize(aParentWindow) { + sanitize: function(aParentWindow) { this._sanitizer.sanitize(aParentWindow); }, @@ -2177,7 +2177,7 @@ BrowserGlue.prototype = { * lesser evil than sending a tab to a specific device (from e.g. Fennec) * and having nothing happen on the receiving end. */ - _onDisplaySyncURI: function _onDisplaySyncURI(data) { + _onDisplaySyncURI: function(data) { try { let tabbrowser = RecentWindow.getMostRecentBrowserWindow({private: false}).gBrowser; diff --git a/application/basilisk/components/places/PlacesUIUtils.jsm b/application/basilisk/components/places/PlacesUIUtils.jsm index 035fc12c2..dc0463c37 100644 --- a/application/basilisk/components/places/PlacesUIUtils.jsm +++ b/application/basilisk/components/places/PlacesUIUtils.jsm @@ -231,11 +231,11 @@ this.PlacesUIUtils = { * The string spec of the URI * @return A URI object for the spec. */ - createFixedURI: function PUIU_createFixedURI(aSpec) { + createFixedURI: function(aSpec) { return URIFixup.createFixupURI(aSpec, Ci.nsIURIFixup.FIXUP_FLAG_NONE); }, - getFormattedString: function PUIU_getFormattedString(key, params) { + getFormattedString: function(key, params) { return bundle.formatStringFromName(key, params, params.length); }, @@ -254,7 +254,7 @@ this.PlacesUIUtils = { * @see https://developer.mozilla.org/en/Localization_and_Plurals * @return The localized plural string. */ - getPluralString: function PUIU_getPluralString(aKey, aNumber, aParams) { + getPluralString: function(aKey, aNumber, aParams) { let str = PluralForm.get(aNumber, bundle.GetStringFromName(aKey)); // Replace #1 with aParams[0], #2 with aParams[1], and so on. @@ -264,7 +264,7 @@ this.PlacesUIUtils = { }); }, - getString: function PUIU_getString(key) { + getString: function(key) { return bundle.GetStringFromName(key); }, @@ -660,7 +660,7 @@ this.PlacesUIUtils = { return ("performed" in aInfo && aInfo.performed); }, - _getTopBrowserWin: function PUIU__getTopBrowserWin() { + _getTopBrowserWin: function() { return RecentWindow.getMostRecentBrowserWindow(); }, @@ -683,7 +683,7 @@ this.PlacesUIUtils = { * a DOM node * @return the closet ancestor places view if exists, null otherwsie. */ - getViewForNode: function PUIU_getViewForNode(aNode) { + getViewForNode: function(aNode) { let node = aNode; // The view for a of which its associated menupopup is a places @@ -712,7 +712,7 @@ this.PlacesUIUtils = { * organizer. If this is not called visits will be marked as * TRANSITION_LINK. */ - markPageAsTyped: function PUIU_markPageAsTyped(aURL) { + markPageAsTyped: function(aURL) { PlacesUtils.history.markPageAsTyped(this.createFixedURI(aURL)); }, @@ -723,7 +723,7 @@ this.PlacesUIUtils = { * personal toolbar, and bookmarks from within the places organizer. * If this is not called visits will be marked as TRANSITION_LINK. */ - markPageAsFollowedBookmark: function PUIU_markPageAsFollowedBookmark(aURL) { + markPageAsFollowedBookmark: function(aURL) { PlacesUtils.history.markPageAsFollowedBookmark(this.createFixedURI(aURL)); }, @@ -733,7 +733,7 @@ this.PlacesUIUtils = { * This is actually used to distinguish user-initiated visits in frames * so automatic visits can be correctly ignored. */ - markPageAsFollowedLink: function PUIU_markPageAsFollowedLink(aURL) { + markPageAsFollowedLink: function(aURL) { PlacesUtils.history.markPageAsFollowedLink(this.createFixedURI(aURL)); }, @@ -747,7 +747,7 @@ this.PlacesUIUtils = { * @return true if it's safe to open the node in the browser, false otherwise. * */ - checkURLSecurity: function PUIU_checkURLSecurity(aURINode, aWindow) { + checkURLSecurity: function(aURINode, aWindow) { if (PlacesUtils.nodeIsBookmark(aURINode)) return true; @@ -774,7 +774,7 @@ this.PlacesUIUtils = { * @return A description string if a META element was discovered with a * "description" or "httpequiv" attribute, empty string otherwise. */ - getDescriptionFromDocument: function PUIU_getDescriptionFromDocument(doc) { + getDescriptionFromDocument: function(doc) { var metaElements = doc.getElementsByTagName("META"); for (var i = 0; i < metaElements.length; ++i) { if (metaElements[i].name.toLowerCase() == "description" || @@ -792,7 +792,7 @@ this.PlacesUIUtils = { * @return the description of the given item, or an empty string if it is * not set. */ - getItemDescription: function PUIU_getItemDescription(aItemId) { + getItemDescription: function(aItemId) { if (PlacesUtils.annotations.itemHasAnnotation(aItemId, this.DESCRIPTION_ANNO)) return PlacesUtils.annotations.getItemAnnotation(aItemId, this.DESCRIPTION_ANNO); return ""; @@ -932,7 +932,7 @@ this.PlacesUIUtils = { /** aItemsToOpen needs to be an array of objects of the form: * {uri: string, isBookmark: boolean} */ - _openTabset: function PUIU__openTabset(aItemsToOpen, aEvent, aWindow) { + _openTabset: function(aItemsToOpen, aEvent, aWindow) { if (!aItemsToOpen.length) return; @@ -1009,7 +1009,7 @@ this.PlacesUIUtils = { } }, - openURINodesInTabs: function PUIU_openURINodesInTabs(aNodes, aEvent, aView) { + openURINodesInTabs: function(aNodes, aEvent, aView) { let window = aView.ownerWindow; let urlsToOpen = []; @@ -1044,12 +1044,12 @@ this.PlacesUIUtils = { * web panel. * see also openUILinkIn */ - openNodeIn: function PUIU_openNodeIn(aNode, aWhere, aView, aPrivate) { + openNodeIn: function(aNode, aWhere, aView, aPrivate) { let window = aView.ownerWindow; this._openNodeIn(aNode, aWhere, window, aPrivate); }, - _openNodeIn: function PUIU_openNodeIn(aNode, aWhere, aWindow, aPrivate=false) { + _openNodeIn: function(aNode, aWhere, aWindow, aPrivate=false) { if (aNode && PlacesUtils.nodeIsURI(aNode) && this.checkURLSecurity(aNode, aWindow)) { let isBookmark = PlacesUtils.nodeIsBookmark(aNode); @@ -1092,11 +1092,11 @@ this.PlacesUIUtils = { * * @note this is not supposed be perfect, so use it only for UI purposes. */ - guessUrlSchemeForUI: function PUIU_guessUrlSchemeForUI(aUrlString) { + guessUrlSchemeForUI: function(aUrlString) { return aUrlString.substr(0, aUrlString.indexOf(":")); }, - getBestTitle: function PUIU_getBestTitle(aNode, aDoNotCutTitle) { + getBestTitle: function(aNode, aDoNotCutTitle) { var title; if (!aNode.title && PlacesUtils.nodeIsURI(aNode)) { // if node title is empty, try to set the label using host and filename @@ -1284,7 +1284,7 @@ this.PlacesUIUtils = { // Create a new left pane folder. var callback = { // Helper to create an organizer special query. - create_query: function CB_create_query(aQueryName, aParentId, aQueryUrl) { + create_query: function(aQueryName, aParentId, aQueryUrl) { let itemId = bs.insertBookmark(aParentId, PlacesUtils._uri(aQueryUrl), bs.DEFAULT_INDEX, @@ -1301,7 +1301,7 @@ this.PlacesUIUtils = { }, // Helper to create an organizer special folder. - create_folder: function CB_create_folder(aFolderName, aParentId, aIsRoot) { + create_folder: function(aFolderName, aParentId, aIsRoot) { // Left Pane Root Folder. let folderId = bs.createFolder(aParentId, queries[aFolderName].title, @@ -1325,7 +1325,7 @@ this.PlacesUIUtils = { return folderId; }, - runBatched: function CB_runBatched(aUserData) { + runBatched: function(aUserData) { delete PlacesUIUtils.leftPaneQueries; PlacesUIUtils.leftPaneQueries = { }; @@ -1392,7 +1392,7 @@ this.PlacesUIUtils = { * @param aItemId id of a container * @return the name of the query, or empty string if not a left-pane query */ - getLeftPaneQueryNameFromId: function PUIU_getLeftPaneQueryNameFromId(aItemId) { + getLeftPaneQueryNameFromId: function(aItemId) { var queryName = ""; // If the let pane hasn't been built, use the annotation service // directly, to avoid building the left pane too early. diff --git a/application/basilisk/components/places/content/bookmarkProperties.js b/application/basilisk/components/places/content/bookmarkProperties.js index afcf65736..1df113d74 100644 --- a/application/basilisk/components/places/content/bookmarkProperties.js +++ b/application/basilisk/components/places/content/bookmarkProperties.js @@ -107,7 +107,7 @@ var BookmarkPropertiesPanel = { * This method returns the correct label for the dialog's "accept" * button based on the variant of the dialog. */ - _getAcceptLabel: function BPP__getAcceptLabel() { + _getAcceptLabel: function() { if (this._action == ACTION_ADD) { if (this._URIs.length) return this._strings.getString("dialogAcceptLabelAddMulti"); @@ -127,7 +127,7 @@ var BookmarkPropertiesPanel = { * This method returns the correct title for the current variant * of this dialog. */ - _getDialogTitle: function BPP__getDialogTitle() { + _getDialogTitle: function() { if (this._action == ACTION_ADD) { if (this._itemType == BOOKMARK_ITEM) return this._strings.getString("dialogTitleAddBookmark"); @@ -255,7 +255,7 @@ var BookmarkPropertiesPanel = { * * @returns a title string */ - _getURITitleFromHistory: function BPP__getURITitleFromHistory(aURI) { + _getURITitleFromHistory: function(aURI) { NS_ASSERT(aURI instanceof Ci.nsIURI); // get the title from History @@ -355,7 +355,7 @@ var BookmarkPropertiesPanel = { }), // nsIDOMEventListener - handleEvent: function BPP_handleEvent(aEvent) { + handleEvent: function(aEvent) { var target = aEvent.target; switch (aEvent.type) { case "input": @@ -410,7 +410,7 @@ var BookmarkPropertiesPanel = { }, // nsISupports - QueryInterface: function BPP_QueryInterface(aIID) { + QueryInterface: function(aIID) { if (aIID.equals(Ci.nsIDOMEventListener) || aIID.equals(Ci.nsISupports)) return this; @@ -418,7 +418,7 @@ var BookmarkPropertiesPanel = { throw Cr.NS_NOINTERFACE; }, - _element: function BPP__element(aID) { + _element: function(aID) { return document.getElementById("editBMPanel_" + aID); }, @@ -463,7 +463,7 @@ var BookmarkPropertiesPanel = { * * @returns true if the input is valid, false otherwise */ - _inputIsValid: function BPP__inputIsValid() { + _inputIsValid: function() { if (this._itemType == BOOKMARK_ITEM && !this._containsValidURI("locationField")) return false; @@ -482,7 +482,7 @@ var BookmarkPropertiesPanel = { * * @returns true if the textbox contains a valid URI string, false otherwise */ - _containsValidURI: function BPP__containsValidURI(aTextboxID) { + _containsValidURI: function(aTextboxID) { try { var value = this._element(aTextboxID).value; if (value) { @@ -500,7 +500,7 @@ var BookmarkPropertiesPanel = { * The container-identifier and insertion-index are returned separately in * the form of [containerIdentifier, insertionIndex] */ - _getInsertionPointDetails: function BPP__getInsertionPointDetails() { + _getInsertionPointDetails: function() { var containerId = this._defaultInsertionPoint.itemId; var indexInContainer = this._defaultInsertionPoint.index; @@ -554,7 +554,7 @@ var BookmarkPropertiesPanel = { * Returns a childItems-transactions array representing the URIList with * which the dialog has been opened. */ - _getTransactionsForURIList: function BPP__getTransactionsForURIList() { + _getTransactionsForURIList: function() { var transactions = []; for (let uri of this._URIs) { // uri should be an object in the form { url, title }. Though add-ons diff --git a/application/basilisk/components/places/content/browserPlacesViews.js b/application/basilisk/components/places/content/browserPlacesViews.js index c6ee9b6ce..2d1a9a23e 100644 --- a/application/basilisk/components/places/content/browserPlacesViews.js +++ b/application/basilisk/components/places/content/browserPlacesViews.js @@ -222,17 +222,17 @@ PlacesViewBase.prototype = { index, orientation, tagName); }, - buildContextMenu: function PVB_buildContextMenu(aPopup) { + buildContextMenu: function(aPopup) { this._contextMenuShown = aPopup; window.updateCommands("places"); return this.controller.buildContextMenu(aPopup); }, - destroyContextMenu: function PVB_destroyContextMenu(aPopup) { + destroyContextMenu: function(aPopup) { this._contextMenuShown = null; }, - _cleanPopup: function PVB_cleanPopup(aPopup, aDelay) { + _cleanPopup: function(aPopup, aDelay) { // Remove Places nodes from the popup. let child = aPopup._startMarker; while (child.nextSibling != aPopup._endMarker) { @@ -255,7 +255,7 @@ PlacesViewBase.prototype = { } }, - _rebuildPopup: function PVB__rebuildPopup(aPopup) { + _rebuildPopup: function(aPopup) { let resultNode = aPopup._placesNode; if (!resultNode.containerOpen) return; @@ -284,7 +284,7 @@ PlacesViewBase.prototype = { aPopup._built = true; }, - _removeChild: function PVB__removeChild(aChild) { + _removeChild: function(aChild) { // If document.popupNode pointed to this child, null it out, // otherwise controller's command-updating may rely on the removed // item still being "selected". @@ -487,7 +487,7 @@ PlacesViewBase.prototype = { } }, - toggleCutNode: function PVB_toggleCutNode(aPlacesNode, aValue) { + toggleCutNode: function(aPlacesNode, aValue) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // We may get the popup for menus, but we need the menu itself. @@ -499,7 +499,7 @@ PlacesViewBase.prototype = { elt.removeAttribute("cutting"); }, - nodeURIChanged: function PVB_nodeURIChanged(aPlacesNode, aURIString) { + nodeURIChanged: function(aPlacesNode, aURIString) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // Here we need the . @@ -509,7 +509,7 @@ PlacesViewBase.prototype = { elt.setAttribute("scheme", PlacesUIUtils.guessUrlSchemeForUI(aURIString)); }, - nodeIconChanged: function PVB_nodeIconChanged(aPlacesNode) { + nodeIconChanged: function(aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // There's no UI representation for the root node, thus there's nothing to @@ -701,7 +701,7 @@ PlacesViewBase.prototype = { } }, - _populateLivemarkPopup: function PVB__populateLivemarkPopup(aPopup) + _populateLivemarkPopup: function(aPopup) { this._setLivemarkSiteURIMenuItem(aPopup); // Show the loading status only if there are no entries yet. @@ -731,7 +731,7 @@ PlacesViewBase.prototype = { }, Components.utils.reportError); }, - invalidateContainer: function PVB_invalidateContainer(aPlacesNode) { + invalidateContainer: function(aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); elt._built = false; @@ -740,7 +740,7 @@ PlacesViewBase.prototype = { this._rebuildPopup(elt); }, - uninit: function PVB_uninit() { + uninit: function() { if (this._result) { this._result.removeObserver(this); this._resultNode.containerOpen = false; @@ -783,7 +783,7 @@ PlacesViewBase.prototype = { * @param aPopup * a Places popup. */ - _mayAddCommandsItems: function PVB__mayAddCommandsItems(aPopup) { + _mayAddCommandsItems: function(aPopup) { // The command items are never added to the root popup. if (aPopup == this._rootElt) return; @@ -860,7 +860,7 @@ PlacesViewBase.prototype = { } }, - _ensureMarkers: function PVB__ensureMarkers(aPopup) { + _ensureMarkers: function(aPopup) { if (aPopup._startMarker) return; @@ -904,7 +904,7 @@ PlacesViewBase.prototype = { } }, - _onPopupShowing: function PVB__onPopupShowing(aEvent) { + _onPopupShowing: function(aEvent) { // Avoid handling popupshowing of inner views. let popup = aEvent.originalTarget; @@ -991,7 +991,7 @@ PlacesToolbar.prototype = { _cbEvents: ["dragstart", "dragover", "dragexit", "dragend", "drop", "mousemove", "mouseover", "mouseout"], - QueryInterface: function PT_QueryInterface(aIID) { + QueryInterface: function(aIID) { if (aIID.equals(Ci.nsIDOMEventListener) || aIID.equals(Ci.nsITimerCallback)) return this; @@ -999,7 +999,7 @@ PlacesToolbar.prototype = { return PlacesViewBase.prototype.QueryInterface.apply(this, arguments); }, - uninit: function PT_uninit() { + uninit: function() { this._removeEventListeners(this._viewElt, this._cbEvents, false); this._removeEventListeners(this._rootElt, ["popupshowing", "popuphidden"], true); @@ -1017,7 +1017,7 @@ PlacesToolbar.prototype = { _openedMenuButton: null, _allowPopupShowing: true, - _rebuild: function PT__rebuild() { + _rebuild: function() { // Clear out references to existing nodes, since they will be removed // and re-added. if (this._overFolder.elt) @@ -1120,7 +1120,7 @@ PlacesToolbar.prototype = { this._updateChevronPopupNodesVisibility(); }, - handleEvent: function PT_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "unload": this.uninit(); @@ -1188,12 +1188,12 @@ PlacesToolbar.prototype = { } }, - _isOverflowStateEventRelevant: function PT_isOverflowStateEventRelevant(aEvent) { + _isOverflowStateEventRelevant: function(aEvent) { // Ignore events not aimed at ourselves, as well as purely vertical ones: return aEvent.target == aEvent.currentTarget && aEvent.detail > 0; }, - _onOverflow: function PT_onOverflow() { + _onOverflow: function() { // Attach the popup binding to the chevron popup if it has not yet // been initialized. if (!this._chevronPopup.hasAttribute("type")) { @@ -1204,12 +1204,12 @@ PlacesToolbar.prototype = { this.updateChevron(); }, - _onUnderflow: function PT_onUnderflow() { + _onUnderflow: function() { this.updateChevron(); this._chevron.collapsed = true; }, - updateChevron: function PT_updateChevron() { + updateChevron: function() { // If the chevron is collapsed there's nothing to update. if (this._chevron.collapsed) return; @@ -1222,7 +1222,7 @@ PlacesToolbar.prototype = { this._updateChevronTimer = this._setTimer(100); }, - _updateChevronTimerCallback: function PT__updateChevronTimerCallback() { + _updateChevronTimerCallback: function() { let scrollRect = this._rootElt.getBoundingClientRect(); let childOverflowed = false; for (let i = 0; i < this._rootElt.childNodes.length; i++) { @@ -1337,7 +1337,7 @@ PlacesToolbar.prototype = { } }, - nodeTitleChanged: function PT_nodeTitleChanged(aPlacesNode, aNewTitle) { + nodeTitleChanged: function(aPlacesNode, aNewTitle) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // There's no UI representation for the root node, thus there's @@ -1357,7 +1357,7 @@ PlacesToolbar.prototype = { } }, - invalidateContainer: function PT_invalidateContainer(aPlacesNode) { + invalidateContainer: function(aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); if (elt == this._rootElt) { // Container is the toolbar itself. @@ -1373,7 +1373,7 @@ PlacesToolbar.prototype = { hoverTime: 350, closeTimer: null }, - _clearOverFolder: function PT__clearOverFolder() { + _clearOverFolder: function() { // The mouse is no longer dragging over the stored menubutton. // Close the menubutton, clear out drag styles, and clear all // timers for opening/closing it. @@ -1401,7 +1401,7 @@ PlacesToolbar.prototype = { * - beforeIndex: child index to drop before, for the drop indicator. * - folderElt: the folder to drop into, if applicable. */ - _getDropPoint: function PT__getDropPoint(aEvent) { + _getDropPoint: function(aEvent) { if (!PlacesUtils.nodeIsFolder(this._resultNode)) return null; @@ -1485,13 +1485,13 @@ PlacesToolbar.prototype = { return dropPoint; }, - _setTimer: function PT_setTimer(aTime) { + _setTimer: function(aTime) { let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer); timer.initWithCallback(this, aTime, timer.TYPE_ONE_SHOT); return timer; }, - notify: function PT_notify(aTimer) { + notify: function(aTimer) { if (aTimer == this._updateChevronTimer) { this._updateChevronTimer = null; this._updateChevronTimerCallback(); @@ -1536,18 +1536,18 @@ PlacesToolbar.prototype = { } }, - _onMouseOver: function PT__onMouseOver(aEvent) { + _onMouseOver: function(aEvent) { let button = aEvent.target; if (button.parentNode == this._rootElt && button._placesNode && PlacesUtils.nodeIsURI(button._placesNode)) window.XULBrowserWindow.setOverLink(aEvent.target._placesNode.uri, null); }, - _onMouseOut: function PT__onMouseOut(aEvent) { + _onMouseOut: function(aEvent) { window.XULBrowserWindow.setOverLink("", null); }, - _cleanupDragDetails: function PT__cleanupDragDetails() { + _cleanupDragDetails: function() { // Called on dragend and drop. PlacesControllerDragHelper.currentDropTarget = null; this._draggedElt = null; @@ -1557,7 +1557,7 @@ PlacesToolbar.prototype = { this._dropIndicator.collapsed = true; }, - _onDragStart: function PT__onDragStart(aEvent) { + _onDragStart: function(aEvent) { // Sub menus have their own d&d handlers. let draggedElt = aEvent.target; if (draggedElt.parentNode != this._rootElt || !draggedElt._placesNode) @@ -1592,7 +1592,7 @@ PlacesToolbar.prototype = { aEvent.stopPropagation(); }, - _onDragOver: function PT__onDragOver(aEvent) { + _onDragOver: function(aEvent) { // Cache the dataTransfer PlacesControllerDragHelper.currentDropTarget = aEvent.target; let dt = aEvent.dataTransfer; @@ -1669,7 +1669,7 @@ PlacesToolbar.prototype = { aEvent.stopPropagation(); }, - _onDrop: function PT__onDrop(aEvent) { + _onDrop: function(aEvent) { PlacesControllerDragHelper.currentDropTarget = aEvent.target; let dropPoint = this._getDropPoint(aEvent); @@ -1683,7 +1683,7 @@ PlacesToolbar.prototype = { aEvent.stopPropagation(); }, - _onDragExit: function PT__onDragExit(aEvent) { + _onDragExit: function(aEvent) { PlacesControllerDragHelper.currentDropTarget = null; // Set timer to turn off indicator bar (if we turn it off @@ -1698,11 +1698,11 @@ PlacesToolbar.prototype = { this._overFolder.closeTimer = this._setTimer(this._overFolder.hoverTime); }, - _onDragEnd: function PT_onDragEnd(aEvent) { + _onDragEnd: function(aEvent) { this._cleanupDragDetails(); }, - _onPopupShowing: function PT__onPopupShowing(aEvent) { + _onPopupShowing: function(aEvent) { if (!this._allowPopupShowing) { this._allowPopupShowing = true; aEvent.preventDefault(); @@ -1716,7 +1716,7 @@ PlacesToolbar.prototype = { PlacesViewBase.prototype._onPopupShowing.apply(this, arguments); }, - _onPopupHidden: function PT__onPopupHidden(aEvent) { + _onPopupHidden: function(aEvent) { let popup = aEvent.target; let placesNode = popup._placesNode; // Avoid handling popuphidden of inner views @@ -1742,7 +1742,7 @@ PlacesToolbar.prototype = { } }, - _onMouseMove: function PT__onMouseMove(aEvent) { + _onMouseMove: function(aEvent) { // Used in dragStart to prevent dragging folders when dragging down. this._cachedMouseMoveEvent = aEvent; @@ -1788,18 +1788,18 @@ function PlacesMenu(aPopupShowingEvent, aPlace, aOptions) { PlacesMenu.prototype = { __proto__: PlacesViewBase.prototype, - QueryInterface: function PM_QueryInterface(aIID) { + QueryInterface: function(aIID) { if (aIID.equals(Ci.nsIDOMEventListener)) return this; return PlacesViewBase.prototype.QueryInterface.apply(this, arguments); }, - _removeChild: function PM_removeChild(aChild) { + _removeChild: function(aChild) { PlacesViewBase.prototype._removeChild.apply(this, arguments); }, - uninit: function PM_uninit() { + uninit: function() { this._removeEventListeners(this._rootElt, ["popupshowing", "popuphidden"], true); this._removeEventListeners(window, ["unload"], false); @@ -1807,7 +1807,7 @@ PlacesMenu.prototype = { PlacesViewBase.prototype.uninit.apply(this, arguments); }, - handleEvent: function PM_handleEvent(aEvent) { + handleEvent: function(aEvent) { switch (aEvent.type) { case "unload": this.uninit(); @@ -1821,7 +1821,7 @@ PlacesMenu.prototype = { } }, - _onPopupHidden: function PM__onPopupHidden(aEvent) { + _onPopupHidden: function(aEvent) { // Avoid handling popuphidden of inner views. let popup = aEvent.originalTarget; let placesNode = popup._placesNode; @@ -1856,11 +1856,11 @@ function PlacesPanelMenuView(aPlace, aViewId, aRootId, aOptions) { PlacesPanelMenuView.prototype = { __proto__: PlacesViewBase.prototype, - QueryInterface: function PAMV_QueryInterface(aIID) { + QueryInterface: function(aIID) { return PlacesViewBase.prototype.QueryInterface.apply(this, arguments); }, - uninit: function PAMV_uninit() { + uninit: function() { PlacesViewBase.prototype.uninit.apply(this, arguments); }, @@ -1969,7 +1969,7 @@ PlacesPanelMenuView.prototype = { } }, - nodeTitleChanged: function PAMV_nodeTitleChanged(aPlacesNode, aNewTitle) { + nodeTitleChanged: function(aPlacesNode, aNewTitle) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // There's no UI representation for the root node. @@ -1979,7 +1979,7 @@ PlacesPanelMenuView.prototype = { PlacesViewBase.prototype.nodeTitleChanged.apply(this, arguments); }, - invalidateContainer: function PAMV_invalidateContainer(aPlacesNode) { + invalidateContainer: function(aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); if (elt != this._rootElt) return; diff --git a/application/basilisk/components/places/content/controller.js b/application/basilisk/components/places/content/controller.js index 931c8fac1..1ed7c7788 100644 --- a/application/basilisk/components/places/content/controller.js +++ b/application/basilisk/components/places/content/controller.js @@ -105,15 +105,15 @@ PlacesController.prototype = { ]), // nsIClipboardOwner - LosingOwnership: function PC_LosingOwnership (aXferable) { + LosingOwnership: function(aXferable) { this.cutNodes = []; }, - terminate: function PC_terminate() { + terminate: function() { this._releaseClipboardOwnership(); }, - supportsCommand: function PC_supportsCommand(aCommand) { + supportsCommand: function(aCommand) { // Non-Places specific commands that we also support switch (aCommand) { case "cmd_undo": @@ -132,7 +132,7 @@ PlacesController.prototype = { return (aCommand.substr(0, CMD_PREFIX.length) == CMD_PREFIX); }, - isCommandEnabled: function PC_isCommandEnabled(aCommand) { + isCommandEnabled: function(aCommand) { switch (aCommand) { case "cmd_undo": if (!PlacesUIUtils.useAsyncTransactions) @@ -213,7 +213,7 @@ PlacesController.prototype = { } }, - doCommand: function PC_doCommand(aCommand) { + doCommand: function(aCommand) { switch (aCommand) { case "cmd_undo": if (!PlacesUIUtils.useAsyncTransactions) { @@ -307,7 +307,7 @@ PlacesController.prototype = { } }, - onEvent: function PC_onEvent(eventName) { }, + onEvent: function(eventName) { }, /** @@ -345,7 +345,7 @@ PlacesController.prototype = { /** * Determines whether or not nodes can be inserted relative to the selection. */ - _canInsert: function PC__canInsert(isPaste) { + _canInsert: function(isPaste) { var ip = this._view.insertionPoint; return ip != null && (isPaste || ip.isTag != true); }, @@ -358,7 +358,7 @@ PlacesController.prototype = { * - clipboard data is of type TEXT_UNICODE and * is a valid URI. */ - _isClipboardDataPasteable: function PC__isClipboardDataPasteable() { + _isClipboardDataPasteable: function() { // if the clipboard contains TYPE_X_MOZ_PLACE_* data, it is definitely // pasteable, with no need to unwrap all the nodes. @@ -418,7 +418,7 @@ PlacesController.prototype = { * Notes: * 1) This can be slow, so don't call it anywhere performance critical! */ - _buildSelectionMetadata: function PC__buildSelectionMetadata() { + _buildSelectionMetadata: function() { var metadata = []; var nodes = this._view.selectedNodes; @@ -501,7 +501,7 @@ PlacesController.prototype = { * @return true if the conditions (see buildContextMenu) are satisfied * and the item can be displayed, false otherwise. */ - _shouldShowMenuItem: function PC__shouldShowMenuItem(aMenuItem, aMetaData) { + _shouldShowMenuItem: function(aMenuItem, aMetaData) { var selectiontype = aMenuItem.getAttribute("selectiontype"); if (!selectiontype) { selectiontype = "single|multiple"; @@ -596,7 +596,7 @@ PlacesController.prototype = { * The menupopup to build children into. * @return true if at least one item is visible, false otherwise. */ - buildContextMenu: function PC_buildContextMenu(aPopup) { + buildContextMenu: function(aPopup) { var metadata = this._buildSelectionMetadata(); var ip = this._view.insertionPoint; var noIp = !ip || ip.isTag; @@ -665,7 +665,7 @@ PlacesController.prototype = { /** * Select all links in the current view. */ - selectAll: function PC_selectAll() { + selectAll: function() { this._view.selectAll(); }, @@ -687,7 +687,7 @@ PlacesController.prototype = { * This method can be run on a URI parameter to ensure that it didn't * receive a string instead of an nsIURI object. */ - _assertURINotString: function PC__assertURINotString(value) { + _assertURINotString: function(value) { NS_ASSERT((typeof(value) == "object") && !(value instanceof String), "This method should be passed a URI as a nsIURI object, not as a string."); }, @@ -695,7 +695,7 @@ PlacesController.prototype = { /** * Reloads the selected livemark if any. */ - reloadSelectedLivemark: function PC_reloadSelectedLivemark() { + reloadSelectedLivemark: function() { var selectedNode = this._view.selectedNode; if (selectedNode) { let itemId = selectedNode.itemId; @@ -709,7 +709,7 @@ PlacesController.prototype = { /** * Opens the links in the selected folder, or the selected links in new tabs. */ - openSelectionInTabs: function PC_openLinksInTabs(aEvent) { + openSelectionInTabs: function(aEvent) { var node = this._view.selectedNode; var nodes = this._view.selectedNodes; // In the case of no selection, open the root node: @@ -728,7 +728,7 @@ PlacesController.prototype = { * @param aType * the type of the new item (bookmark/livemark/folder) */ - newItem: function PC_newItem(aType) { + newItem: function(aType) { let ip = this._view.insertionPoint; if (!ip) throw Cr.NS_ERROR_NOT_AVAILABLE; @@ -776,7 +776,7 @@ PlacesController.prototype = { /** * Opens a dialog for moving the selected nodes. */ - moveSelectedBookmarks: function PC_moveBookmarks() { + moveSelectedBookmarks: function() { window.openDialog("chrome://browser/content/places/moveBookmarks.xul", "", "chrome, modal", this._view.selectedNodes); @@ -806,7 +806,7 @@ PlacesController.prototype = { * List of folders the calling function has already traversed * @return true if the node should be skipped, false otherwise. */ - _shouldSkipNode: function PC_shouldSkipNode(node, pastFolders) { + _shouldSkipNode: function(node, pastFolders) { /** * Determines if a node is contained by another node within a resultset. * @param node @@ -842,7 +842,7 @@ PlacesController.prototype = { * @param [optional] removedFolders * An array of folder nodes that have already been removed. */ - _removeRange: function PC__removeRange(range, transactions, removedFolders) { + _removeRange: function(range, transactions, removedFolders) { NS_ASSERT(transactions instanceof Array, "Must pass a transactions array"); if (!removedFolders) removedFolders = []; @@ -954,7 +954,7 @@ PlacesController.prototype = { * * @note history deletes are not undoable. */ - _removeRowsFromHistory: function PC__removeRowsFromHistory() { + _removeRowsFromHistory: function() { let nodes = this._view.selectedNodes; let URIs = []; for (let i = 0; i < nodes.length; ++i) { @@ -994,7 +994,7 @@ PlacesController.prototype = { * * @note history deletes are not undoable. */ - _removeHistoryContainer: function PC__removeHistoryContainer(aContainerNode) { + _removeHistoryContainer: function(aContainerNode) { if (PlacesUtils.nodeIsHost(aContainerNode)) { // Site container. PlacesUtils.bhistory.removePagesFromHost(aContainerNode.title, true); @@ -1059,7 +1059,7 @@ PlacesController.prototype = { * @param aEvent * The dragstart event. */ - setDataTransfer: function PC_setDataTransfer(aEvent) { + setDataTransfer: function(aEvent) { let dt = aEvent.dataTransfer; let result = this._view.result; @@ -1129,14 +1129,14 @@ PlacesController.prototype = { return action; }, - _releaseClipboardOwnership: function PC__releaseClipboardOwnership() { + _releaseClipboardOwnership: function() { if (this.cutNodes.length > 0) { // This clears the logical clipboard, doesn't remove data. this.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard); } }, - _clearClipboard: function PC__clearClipboard() { + _clearClipboard: function() { let xferable = Cc["@mozilla.org/widget/transferable;1"]. createInstance(Ci.nsITransferable); xferable.init(null); @@ -1147,7 +1147,7 @@ PlacesController.prototype = { this.clipboard.setData(xferable, null, Ci.nsIClipboard.kGlobalClipboard); }, - _populateClipboard: function PC__populateClipboard(aNodes, aAction) { + _populateClipboard: function(aNodes, aAction) { // This order is _important_! It controls how this and other applications // select data to be inserted based on type. let contents = [ @@ -1231,7 +1231,7 @@ PlacesController.prototype = { /** * Copy Bookmarks and Folders to the clipboard */ - copy: function PC_copy() { + copy: function() { let result = this._view.result; let didSuppressNotifications = result.suppressNotifications; if (!didSuppressNotifications) @@ -1248,7 +1248,7 @@ PlacesController.prototype = { /** * Cut Bookmarks and Folders to the clipboard */ - cut: function PC_cut() { + cut: function() { let result = this._view.result; let didSuppressNotifications = result.suppressNotifications; if (!didSuppressNotifications) @@ -1390,7 +1390,7 @@ PlacesController.prototype = { * @param aLivemarkInfo * a mozILivemarkInfo object. */ - cacheLivemarkInfo: function PC_cacheLivemarkInfo(aNode, aLivemarkInfo) { + cacheLivemarkInfo: function(aNode, aLivemarkInfo) { this._cachedLivemarkInfoObjects.set(aNode, aLivemarkInfo); }, @@ -1401,7 +1401,7 @@ PlacesController.prototype = { * @return true if there's a cached mozILivemarkInfo object for * aNode, false otherwise. */ - hasCachedLivemarkInfo: function PC_hasCachedLivemarkInfo(aNode) { + hasCachedLivemarkInfo: function(aNode) { return this._cachedLivemarkInfoObjects.has(aNode); }, @@ -1412,7 +1412,7 @@ PlacesController.prototype = { * a places result node. * @return the mozILivemarkInfo object for aNode, if set, null otherwise. */ - getCachedLivemarkInfo: function PC_getCachedLivemarkInfo(aNode) { + getCachedLivemarkInfo: function(aNode) { return this._cachedLivemarkInfoObjects.get(aNode, null); } }; @@ -1438,7 +1438,7 @@ var PlacesControllerDragHelper = { * @return true if the user is dragging over a node within the hierarchy of * the container, false otherwise. */ - draggingOverChildNode: function PCDH_draggingOverChildNode(node) { + draggingOverChildNode: function(node) { let currentNode = this.currentDropTarget; while (currentNode) { if (currentNode == node) @@ -1451,7 +1451,7 @@ var PlacesControllerDragHelper = { /** * @return The current active drag session. Returns null if there is none. */ - getSession: function PCDH__getSession() { + getSession: function() { return this.dragService.getCurrentSession(); }, @@ -1460,7 +1460,7 @@ var PlacesControllerDragHelper = { * @param aFlavors * The flavors list of type DOMStringList. */ - getFirstValidFlavor: function PCDH_getFirstValidFlavor(aFlavors) { + getFirstValidFlavor: function(aFlavors) { for (let i = 0; i < aFlavors.length; i++) { if (PlacesUIUtils.SUPPORTED_FLAVORS.includes(aFlavors[i])) return aFlavors[i]; @@ -1482,7 +1482,7 @@ var PlacesControllerDragHelper = { * @param ip * The insertion point where the items should be dropped. */ - canDrop: function PCDH_canDrop(ip, dt) { + canDrop: function(ip, dt) { let dropCount = dt.mozItemCount; // Check every dragged item. diff --git a/application/basilisk/components/places/content/editBookmarkOverlay.js b/application/basilisk/components/places/content/editBookmarkOverlay.js index d59f5c764..366942dd3 100644 --- a/application/basilisk/components/places/content/editBookmarkOverlay.js +++ b/application/basilisk/components/places/content/editBookmarkOverlay.js @@ -391,7 +391,7 @@ var gEditItemOverlay = { return folderMenuItem; }, - _initFolderMenuList: function EIO__initFolderMenuList(aSelectedFolder) { + _initFolderMenuList: function(aSelectedFolder) { // clean up first var menupopup = this._folderMenuList.menupopup; while (menupopup.childNodes.length > 6) diff --git a/application/basilisk/components/places/content/moveBookmarks.js b/application/basilisk/components/places/content/moveBookmarks.js index 5bfdce56e..751fc8f41 100644 --- a/application/basilisk/components/places/content/moveBookmarks.js +++ b/application/basilisk/components/places/content/moveBookmarks.js @@ -22,7 +22,7 @@ var gMoveBookmarksDialog = { PlacesUIUtils.allBookmarksFolderId; }, - onOK: function MBD_onOK(aEvent) { + onOK: function(aEvent) { let selectedNode = this.foldersTree.selectedNode; let selectedFolderId = PlacesUtils.getConcreteItemId(selectedNode); @@ -57,7 +57,7 @@ var gMoveBookmarksDialog = { }.bind(this)).then(null, Components.utils.reportError); }, - newFolder: function MBD_newFolder() { + newFolder: function() { // The command is disabled when the tree is not focused this.foldersTree.focus(); goDoCommand("placesCmd_new:folder"); diff --git a/application/basilisk/components/places/content/places.js b/application/basilisk/components/places/content/places.js index 375c3de17..c0df8732c 100644 --- a/application/basilisk/components/places/content/places.js +++ b/application/basilisk/components/places/content/places.js @@ -36,7 +36,7 @@ var PlacesOrganizer = { this._places.place = "place:excludeItems=1&expandQueries=0&folder=" + leftPaneRoot; }, - selectLeftPaneQuery: function PO_selectLeftPaneQuery(aQueryName) { + selectLeftPaneQuery: function(aQueryName) { var itemId = PlacesUIUtils.leftPaneQueries[aQueryName]; this._places.selectItems([itemId]); // Forcefully expand all-bookmarks @@ -87,7 +87,7 @@ var PlacesOrganizer = { } }, - init: function PO_init() { + init: function() { ContentArea.init(); this._places = document.getElementById("placesList"); @@ -135,7 +135,7 @@ var PlacesOrganizer = { ContentArea.focus(); }, - QueryInterface: function PO_QueryInterface(aIID) { + QueryInterface: function(aIID) { if (aIID.equals(Components.interfaces.nsIDOMEventListener) || aIID.equals(Components.interfaces.nsISupports)) return this; @@ -143,7 +143,7 @@ var PlacesOrganizer = { throw Components.results.NS_NOINTERFACE; }, - handleEvent: function PO_handleEvent(aEvent) { + handleEvent: function(aEvent) { if (aEvent.type != "AppCommand") return; @@ -163,7 +163,7 @@ var PlacesOrganizer = { } }, - destroy: function PO_destroy() { + destroy: function() { }, _location: null, @@ -205,13 +205,13 @@ var PlacesOrganizer = { _backHistory: [], _forwardHistory: [], - back: function PO_back() { + back: function() { this._forwardHistory.unshift(this.location); var historyEntry = this._backHistory.shift(); this._location = null; this.location = historyEntry; }, - forward: function PO_forward() { + forward: function() { this._backHistory.unshift(this.location); var historyEntry = this._forwardHistory.shift(); this._location = null; @@ -229,7 +229,7 @@ var PlacesOrganizer = { * deleting its text, this will be false. */ _cachedLeftPaneSelectedURI: null, - onPlaceSelected: function PO_onPlaceSelected(resetSearchBox) { + onPlaceSelected: function(resetSearchBox) { // Don't change the right-hand pane contents when there's no selection. if (!this._places.hasSelection) return; @@ -275,7 +275,7 @@ var PlacesOrganizer = { * @param aNode * the node to set up scope from */ - _setSearchScopeForNode: function PO__setScopeForNode(aNode) { + _setSearchScopeForNode: function(aNode) { let itemId = aNode.itemId; if (PlacesUtils.nodeIsHistoryContainer(aNode) || @@ -298,7 +298,7 @@ var PlacesOrganizer = { * @param aEvent * The mouse event. */ - onPlacesListClick: function PO_onPlacesListClick(aEvent) { + onPlacesListClick: function(aEvent) { // Only handle clicks on tree children. if (aEvent.target.localName != "treechildren") return; @@ -318,7 +318,7 @@ var PlacesOrganizer = { /** * Handle focus changes on the places list and the current content view. */ - updateDetailsPane: function PO_updateDetailsPane() { + updateDetailsPane: function() { if (!ContentArea.currentViewOptions.showDetailsPane) return; let view = PlacesUIUtils.getViewForNode(document.activeElement); @@ -329,7 +329,7 @@ var PlacesOrganizer = { } }, - openFlatContainer: function PO_openFlatContainerFlatContainer(aContainer) { + openFlatContainer: function(aContainer) { if (aContainer.itemId != -1) { PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true; this._places.selectItems([aContainer.itemId], false); @@ -343,7 +343,7 @@ var PlacesOrganizer = { * Returns the options associated with the query currently loaded in the * main places pane. */ - getCurrentOptions: function PO_getCurrentOptions() { + getCurrentOptions: function() { return PlacesUtils.asQuery(ContentArea.currentView.result.root).queryOptions; }, @@ -351,7 +351,7 @@ var PlacesOrganizer = { * Returns the queries associated with the query currently loaded in the * main places pane. */ - getCurrentQueries: function PO_getCurrentQueries() { + getCurrentQueries: function() { return PlacesUtils.asQuery(ContentArea.currentView.result.root).getQueries(); }, @@ -359,7 +359,7 @@ var PlacesOrganizer = { * Show the migration wizard for importing passwords, * cookies, history, preferences, and bookmarks. */ - importFromBrowser: function PO_importFromBrowser() { + importFromBrowser: function() { // We pass in the type of source we're using for use in telemetry: MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PLACES]); }, @@ -367,7 +367,7 @@ var PlacesOrganizer = { /** * Open a file-picker and import the selected file into the bookmarks store */ - importFromFile: function PO_importFromFile() { + importFromFile: function() { let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); let fpCallback = function fpCallback_done(aResult) { if (aResult != Ci.nsIFilePicker.returnCancel && fp.fileURL) { @@ -386,7 +386,7 @@ var PlacesOrganizer = { /** * Allows simple exporting of bookmarks. */ - exportBookmarks: function PO_exportBookmarks() { + exportBookmarks: function() { let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); let fpCallback = function fpCallback_done(aResult) { if (aResult != Ci.nsIFilePicker.returnCancel) { @@ -406,7 +406,7 @@ var PlacesOrganizer = { /** * Populates the restore menu with the dates of the backups available. */ - populateRestoreMenu: function PO_populateRestoreMenu() { + populateRestoreMenu: function() { let restorePopup = document.getElementById("fileRestorePopup"); const locale = Cc["@mozilla.org/chrome/chrome-registry;1"] @@ -475,7 +475,7 @@ var PlacesOrganizer = { * Called when 'Choose File...' is selected from the restore menu. * Prompts for a file and restores bookmarks to those in the file. */ - onRestoreBookmarksFromFile: function PO_onRestoreBookmarksFromFile() { + onRestoreBookmarksFromFile: function() { let dirSvc = Cc["@mozilla.org/file/directory_service;1"]. getService(Ci.nsIProperties); let backupsDir = dirSvc.get("Desk", Ci.nsILocalFile); @@ -498,7 +498,7 @@ var PlacesOrganizer = { /** * Restores bookmarks from a JSON file. */ - restoreBookmarksFromFile: function PO_restoreBookmarksFromFile(aFilePath) { + restoreBookmarksFromFile: function(aFilePath) { // check file extension if (!aFilePath.toLowerCase().endsWith("json") && !aFilePath.toLowerCase().endsWith("jsonlz4")) { @@ -523,7 +523,7 @@ var PlacesOrganizer = { }); }, - _showErrorAlert: function PO__showErrorAlert(aMsg) { + _showErrorAlert: function(aMsg) { var brandShortName = document.getElementById("brandStrings"). getString("brandShortName"); @@ -537,7 +537,7 @@ var PlacesOrganizer = { * The file is a JSON serialization of bookmarks, tags and any annotations * of those items. */ - backupBookmarks: function PO_backupBookmarks() { + backupBookmarks: function() { let dirSvc = Cc["@mozilla.org/file/directory_service;1"]. getService(Ci.nsIProperties); let backupsDir = dirSvc.get("Desk", Ci.nsILocalFile); @@ -596,7 +596,7 @@ var PlacesOrganizer = { }, // NOT YET USED - updateThumbnailProportions: function PO_updateThumbnailProportions() { + updateThumbnailProportions: function() { var previewBox = document.getElementById("previewBox"); var canvas = document.getElementById("itemThumbnail"); var height = previewBox.boxObject.height; @@ -605,7 +605,7 @@ var PlacesOrganizer = { canvas.height = height; }, - _fillDetailsPane: function PO__fillDetailsPane(aNodeList) { + _fillDetailsPane: function(aNodeList) { var infoBox = document.getElementById("infoBox"); var detailsDeck = document.getElementById("detailsDeck"); @@ -697,7 +697,7 @@ var PlacesOrganizer = { }, // NOT YET USED - _updateThumbnail: function PO__updateThumbnail() { + _updateThumbnail: function() { var bo = document.getElementById("previewBox").boxObject; var width = bo.width; var height = bo.height; @@ -718,7 +718,7 @@ var PlacesOrganizer = { ctx.restore(); }, - toggleAdditionalInfoFields: function PO_toggleAdditionalInfoFields() { + toggleAdditionalInfoFields: function() { var infoBox = document.getElementById("infoBox"); var infoBoxExpander = document.getElementById("infoBoxExpander"); var infoBoxExpanderLabel = document.getElementById("infoBoxExpanderLabel"); @@ -777,7 +777,7 @@ var PlacesSearchBox = { * @param filterString * The text to search for. */ - search: function PSB_search(filterString) { + search: function(filterString) { var PO = PlacesOrganizer; // If the user empties the search box manually, reset it and load all // contents of the current scope. @@ -840,7 +840,7 @@ var PlacesSearchBox = { /** * Finds across all history, downloads or all bookmarks. */ - findAll: function PSB_findAll() { + findAll: function() { switch (this.filterCollection) { case "history": PlacesQueryBuilder.setScope("history"); @@ -860,7 +860,7 @@ var PlacesSearchBox = { * @param aTitle * The title of the current collection. */ - updateCollectionTitle: function PSB_updateCollectionTitle(aTitle) { + updateCollectionTitle: function(aTitle) { let title = ""; switch (this.filterCollection) { case "history": @@ -894,14 +894,14 @@ var PlacesSearchBox = { /** * Focus the search box */ - focus: function PSB_focus() { + focus: function() { this.searchFilter.focus(); }, /** * Set up the gray text in the search bar as the Places View loads. */ - init: function PSB_init() { + init: function() { this.updateCollectionTitle(); }, @@ -933,7 +933,7 @@ var PlacesQueryBuilder = { * The search scope: "bookmarks", "collection", "downloads" or * "history". */ - setScope: function PQB_setScope(aScope) { + setScope: function(aScope) { // Determine filterCollection, folders, and scopeButtonId based on aScope. var filterCollection; var folders = []; @@ -987,7 +987,7 @@ var ViewMenu = { * @returns The element for the caller to insert new items before, * null if the caller should just append to the popup. */ - _clean: function VM__clean(popup, startID, endID) { + _clean: function(popup, startID, endID) { if (endID) NS_ASSERT(startID, "meaningless to have valid endID and null startID"); if (startID) { @@ -1035,7 +1035,7 @@ var ViewMenu = { * If propertyPrefix is null, the column label is used as label and * no accesskey is assigned. */ - fillWithColumns: function VM_fillWithColumns(event, startID, endID, type, propertyPrefix) { + fillWithColumns: function(event, startID, endID, type, propertyPrefix) { var popup = event.target; var pivot = this._clean(popup, startID, endID); @@ -1086,7 +1086,7 @@ var ViewMenu = { /** * Set up the content of the view menu. */ - populateSortMenu: function VM_populateSortMenu(event) { + populateSortMenu: function(event) { this.fillWithColumns(event, "viewUnsorted", "directionSeparator", "radio", "view.sortBy.1."); var sortColumn = this._getSortColumn(); @@ -1117,7 +1117,7 @@ var ViewMenu = { * @param element * The menuitem element for the column */ - showHideColumn: function VM_showHideColumn(element) { + showHideColumn: function(element) { var column = element.column; var splitter = column.nextSibling; @@ -1140,7 +1140,7 @@ var ViewMenu = { * Gets the last column that was sorted. * @returns the currently sorted column, null if there is no sorted column. */ - _getSortColumn: function VM__getSortColumn() { + _getSortColumn: function() { var content = document.getElementById("placeContent"); var cols = content.columns; for (var i = 0; i < cols.count; ++i) { @@ -1163,7 +1163,7 @@ var ViewMenu = { * * If both aColumnID and aDirection are null, the view will be unsorted. */ - setSortColumn: function VM_setSortColumn(aColumn, aDirection) { + setSortColumn: function(aColumn, aDirection) { var result = document.getElementById("placeContent").result; if (!aColumn && !aDirection) { result.sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; @@ -1222,7 +1222,7 @@ var ViewMenu = { var ContentArea = { _specialViews: new Map(), - init: function CA_init() { + init: function() { this._deck = document.getElementById("placesViewsDeck"); this._toolbar = document.getElementById("placesToolbar"); ContentTree.init(); @@ -1313,7 +1313,7 @@ var ContentArea = { /** * Applies view options. */ - _setupView: function CA__setupView() { + _setupView: function() { let options = this.currentViewOptions; // showDetailsPane. @@ -1357,7 +1357,7 @@ var ContentArea = { }; var ContentTree = { - init: function CT_init() { + init: function() { this._view = document.getElementById("placeContent"); }, @@ -1372,12 +1372,12 @@ var ContentTree = { }); }, - openSelectedNode: function CT_openSelectedNode(aEvent) { + openSelectedNode: function(aEvent) { let view = this.view; PlacesUIUtils.openNodeWithEvent(view.selectedNode, aEvent, view); }, - onClick: function CT_onClick(aEvent) { + onClick: function(aEvent) { let node = this.view.selectedNode; if (node) { let doubleClick = aEvent.button == 0 && aEvent.detail == 2; @@ -1395,7 +1395,7 @@ var ContentTree = { } }, - onKeyPress: function CT_onKeyPress(aEvent) { + onKeyPress: function(aEvent) { if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN) this.openSelectedNode(aEvent); } diff --git a/application/basilisk/components/places/content/sidebarUtils.js b/application/basilisk/components/places/content/sidebarUtils.js index 96c289741..96e91bb9a 100644 --- a/application/basilisk/components/places/content/sidebarUtils.js +++ b/application/basilisk/components/places/content/sidebarUtils.js @@ -5,7 +5,7 @@ Components.utils.import("resource://gre/modules/AppConstants.jsm"); var SidebarUtils = { - handleTreeClick: function SU_handleTreeClick(aTree, aEvent, aGutterSelect) { + handleTreeClick: function(aTree, aEvent, aGutterSelect) { // right-clicks are not handled here if (aEvent.button == 2) return; @@ -59,7 +59,7 @@ var SidebarUtils = { } }, - handleTreeKeyPress: function SU_handleTreeKeyPress(aEvent) { + handleTreeKeyPress: function(aEvent) { // XXX Bug 627901: Post Fx4, this method should take a tree parameter. let tree = aEvent.target; let node = tree.selectedNode; @@ -73,7 +73,7 @@ var SidebarUtils = { * The following function displays the URL of a node that is being * hovered over. */ - handleTreeMouseMove: function SU_handleTreeMouseMove(aEvent) { + handleTreeMouseMove: function(aEvent) { if (aEvent.target.localName != "treechildren") return; @@ -95,7 +95,7 @@ var SidebarUtils = { this.setMouseoverURL(""); }, - setMouseoverURL: function SU_setMouseoverURL(aURL) { + setMouseoverURL: function(aURL) { // When the browser window is closed with an open sidebar, the sidebar // unload event happens after the browser's one. In this case // top.XULBrowserWindow has been nullified already. diff --git a/application/basilisk/components/places/content/treeView.js b/application/basilisk/components/places/content/treeView.js index 181bb5404..810c4ab8c 100644 --- a/application/basilisk/components/places/content/treeView.js +++ b/application/basilisk/components/places/content/treeView.js @@ -48,7 +48,7 @@ PlacesTreeView.prototype = { /** * This is called once both the result and the tree are set. */ - _finishInit: function PTV__finishInit() { + _finishInit: function() { let selection = this.selection; if (selection) selection.selectEventsSuppressed = true; @@ -89,7 +89,7 @@ PlacesTreeView.prototype = { * * @return true if aContainer is a plain container, false otherwise. */ - _isPlainContainer: function PTV__isPlainContainer(aContainer) { + _isPlainContainer: function(aContainer) { // Livemarks are always plain containers. if (this._controller.hasCachedLivemarkInfo(aContainer)) return true; @@ -204,7 +204,7 @@ PlacesTreeView.prototype = { * Row number. * @return [parentNode, parentRow] */ - _getParentByChildRow: function PTV__getParentByChildRow(aChildRow) { + _getParentByChildRow: function(aChildRow) { let node = this._getNodeForRow(aChildRow); let parent = (node === null) ? this._rootNode : node.parent; @@ -219,7 +219,7 @@ PlacesTreeView.prototype = { /** * Gets the node at a given row. */ - _getNodeForRow: function PTV__getNodeForRow(aRow) { + _getNodeForRow: function(aRow) { if (aRow < 0) { return null; } @@ -481,7 +481,7 @@ PlacesTreeView.prototype = { this._tree.ensureRowIsVisible(scrollToRow); }, - _convertPRTimeToString: function PTV__convertPRTimeToString(aTime) { + _convertPRTimeToString: function(aTime) { const MS_PER_MINUTE = 60000; const MS_PER_DAY = 86400000; let timeMs = aTime / 1000; // PRTime is in microseconds @@ -537,7 +537,7 @@ PlacesTreeView.prototype = { COLUMN_TYPE_LASTMODIFIED: 7, COLUMN_TYPE_TAGS: 8, - _getColumnType: function PTV__getColumnType(aColumn) { + _getColumnType: function(aColumn) { let columnType = aColumn.element.getAttribute("anonid") || aColumn.id; switch (columnType) { @@ -561,7 +561,7 @@ PlacesTreeView.prototype = { return this.COLUMN_TYPE_UNKNOWN; }, - _sortTypeToColumnType: function PTV__sortTypeToColumnType(aSortType) { + _sortTypeToColumnType: function(aSortType) { switch (aSortType) { case Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING: return [this.COLUMN_TYPE_TITLE, false]; @@ -603,7 +603,7 @@ PlacesTreeView.prototype = { }, // nsINavHistoryResultObserver - nodeInserted: function PTV_nodeInserted(aParentNode, aNode, aNewIndex) { + nodeInserted: function(aParentNode, aNode, aNewIndex) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) return; @@ -677,7 +677,7 @@ PlacesTreeView.prototype = { * However, we won't do this when sorted by date because dates will never * change for visits, and date sorting is the only time things are collapsed. */ - nodeRemoved: function PTV_nodeRemoved(aParentNode, aNode, aOldIndex) { + nodeRemoved: function(aParentNode, aNode, aOldIndex) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) return; @@ -776,7 +776,7 @@ PlacesTreeView.prototype = { } }, - _invalidateCellValue: function PTV__invalidateCellValue(aNode, + _invalidateCellValue: function(aNode, aColumnType) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) @@ -803,7 +803,7 @@ PlacesTreeView.prototype = { } }, - _populateLivemarkContainer: function PTV__populateLivemarkContainer(aNode) { + _populateLivemarkContainer: function(aNode) { PlacesUtils.livemarks.getLivemark({ id: aNode.itemId }) .then(aLivemark => { let placesNode = aNode; @@ -819,20 +819,20 @@ PlacesTreeView.prototype = { }, Components.utils.reportError); }, - nodeTitleChanged: function PTV_nodeTitleChanged(aNode, aNewTitle) { + nodeTitleChanged: function(aNode, aNewTitle) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE); }, - nodeURIChanged: function PTV_nodeURIChanged(aNode, aNewURI) { + nodeURIChanged: function(aNode, aNewURI) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_URI); }, - nodeIconChanged: function PTV_nodeIconChanged(aNode) { + nodeIconChanged: function(aNode) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE); }, nodeHistoryDetailsChanged: - function PTV_nodeHistoryDetailsChanged(aNode, aUpdatedVisitDate, + function(aNode, aUpdatedVisitDate, aUpdatedVisitCount) { if (aNode.parent && this._controller.hasCachedLivemarkInfo(aNode.parent)) { // Find the node in the parent. @@ -852,13 +852,13 @@ PlacesTreeView.prototype = { this._invalidateCellValue(aNode, this.COLUMN_TYPE_VISITCOUNT); }, - nodeTagsChanged: function PTV_nodeTagsChanged(aNode) { + nodeTagsChanged: function(aNode) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_TAGS); }, nodeKeywordChanged(aNode, aNewKeyword) {}, - nodeAnnotationChanged: function PTV_nodeAnnotationChanged(aNode, aAnno) { + nodeAnnotationChanged: function(aNode, aAnno) { if (aAnno == PlacesUIUtils.DESCRIPTION_ANNO) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_DESCRIPTION); } @@ -874,17 +874,17 @@ PlacesTreeView.prototype = { } }, - nodeDateAddedChanged: function PTV_nodeDateAddedChanged(aNode, aNewValue) { + nodeDateAddedChanged: function(aNode, aNewValue) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_DATEADDED); }, nodeLastModifiedChanged: - function PTV_nodeLastModifiedChanged(aNode, aNewValue) { + function(aNode, aNewValue) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_LASTMODIFIED); }, containerStateChanged: - function PTV_containerStateChanged(aNode, aOldState, aNewState) { + function(aNode, aOldState, aNewState) { this.invalidateContainer(aNode); if (PlacesUtils.nodeIsFolder(aNode) || @@ -915,7 +915,7 @@ PlacesTreeView.prototype = { } }, - invalidateContainer: function PTV_invalidateContainer(aContainer) { + invalidateContainer: function(aContainer) { NS_ASSERT(this._result, "Need to have a result to update"); if (!this._tree) return; @@ -1021,7 +1021,7 @@ PlacesTreeView.prototype = { }, _columns: [], - _findColumnByType: function PTV__findColumnByType(aColumnType) { + _findColumnByType: function(aColumnType) { if (this._columns[aColumnType]) return this._columns[aColumnType]; @@ -1040,7 +1040,7 @@ PlacesTreeView.prototype = { return null; }, - sortingChanged: function PTV__sortingChanged(aSortingMode) { + sortingChanged: function(aSortingMode) { if (!this._tree || !this._result) return; @@ -1068,7 +1068,7 @@ PlacesTreeView.prototype = { }, _inBatchMode: false, - batching: function PTV__batching(aToggleMode) { + batching: function(aToggleMode) { if (this._inBatchMode != aToggleMode) { this._inBatchMode = this.selection.selectEventsSuppressed = aToggleMode; if (this._inBatchMode) { @@ -1109,14 +1109,14 @@ PlacesTreeView.prototype = { return val; }, - nodeForTreeIndex: function PTV_nodeForTreeIndex(aIndex) { + nodeForTreeIndex: function(aIndex) { if (aIndex > this._rows.length) throw Cr.NS_ERROR_INVALID_ARG; return this._getNodeForRow(aIndex); }, - treeIndexForNode: function PTV_treeNodeForIndex(aNode) { + treeIndexForNode: function(aNode) { // The API allows passing invisible nodes. try { return this._getRowForNode(aNode, true); @@ -1140,7 +1140,7 @@ PlacesTreeView.prototype = { getRowProperties: function() { return ""; }, getCellProperties: - function PTV_getCellProperties(aRow, aColumn) { + function(aRow, aColumn) { // for anonid-trees, we need to add the column-type manually var props = ""; let columnType = aColumn.element.getAttribute("anonid"); @@ -1221,7 +1221,7 @@ PlacesTreeView.prototype = { getColumnProperties: function(aColumn) { return ""; }, - isContainer: function PTV_isContainer(aRow) { + isContainer: function(aRow) { // Only leaf nodes aren't listed in the rows array. let node = this._rows[aRow]; if (node === undefined) @@ -1246,7 +1246,7 @@ PlacesTreeView.prototype = { return false; }, - isContainerOpen: function PTV_isContainerOpen(aRow) { + isContainerOpen: function(aRow) { if (this._flatList) return false; @@ -1254,7 +1254,7 @@ PlacesTreeView.prototype = { return this._rows[aRow].containerOpen; }, - isContainerEmpty: function PTV_isContainerEmpty(aRow) { + isContainerEmpty: function(aRow) { if (this._flatList) return true; @@ -1268,18 +1268,18 @@ PlacesTreeView.prototype = { return !node.hasChildren; }, - isSeparator: function PTV_isSeparator(aRow) { + isSeparator: function(aRow) { // All separators are listed in the rows array. let node = this._rows[aRow]; return node && PlacesUtils.nodeIsSeparator(node); }, - isSorted: function PTV_isSorted() { + isSorted: function() { return this._result.sortingMode != Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; }, - canDrop: function PTV_canDrop(aRow, aOrientation, aDataTransfer) { + canDrop: function(aRow, aOrientation, aDataTransfer) { if (!this._result) throw Cr.NS_ERROR_UNEXPECTED; @@ -1291,7 +1291,7 @@ PlacesTreeView.prototype = { return ip && PlacesControllerDragHelper.canDrop(ip, aDataTransfer); }, - _getInsertionPoint: function PTV__getInsertionPoint(index, orientation) { + _getInsertionPoint: function(index, orientation) { let container = this._result.root; let dropNearItemId = -1; // When there's no selection, assume the container is the container @@ -1370,7 +1370,7 @@ PlacesTreeView.prototype = { dropNearItemId); }, - drop: function PTV_drop(aRow, aOrientation, aDataTransfer) { + drop: function(aRow, aOrientation, aDataTransfer) { // We are responsible for translating the |index| and |orientation| // parameters into a container id and index within the container, // since this information is specific to the tree view. @@ -1383,12 +1383,12 @@ PlacesTreeView.prototype = { PlacesControllerDragHelper.currentDropTarget = null; }, - getParentIndex: function PTV_getParentIndex(aRow) { + getParentIndex: function(aRow) { let [, parentRow] = this._getParentByChildRow(aRow); return parentRow; }, - hasNextSibling: function PTV_hasNextSibling(aRow, aAfterIndex) { + hasNextSibling: function(aRow, aAfterIndex) { if (aRow == this._rows.length - 1) { // The last row has no sibling. return false; @@ -1420,7 +1420,7 @@ PlacesTreeView.prototype = { return this._getNodeForRow(aRow).indentLevel; }, - getImageSrc: function PTV_getImageSrc(aRow, aColumn) { + getImageSrc: function(aRow, aColumn) { // Only the title column has an image. if (this._getColumnType(aColumn) != this.COLUMN_TYPE_TITLE) return ""; @@ -1432,7 +1432,7 @@ PlacesTreeView.prototype = { getProgressMode: function(aRow, aColumn) { }, getCellValue: function(aRow, aColumn) { }, - getCellText: function PTV_getCellText(aRow, aColumn) { + getCellText: function(aRow, aColumn) { let node = this._getNodeForRow(aRow); switch (this._getColumnType(aColumn)) { case this.COLUMN_TYPE_TITLE: @@ -1484,7 +1484,7 @@ PlacesTreeView.prototype = { return ""; }, - setTree: function PTV_setTree(aTree) { + setTree: function(aTree) { // If we are replacing the tree during a batch, there is a concrete risk // that the treeView goes out of sync, thus it's safer to end the batch now. // This is a no-op if we are not batching. @@ -1507,7 +1507,7 @@ PlacesTreeView.prototype = { } }, - toggleOpenState: function PTV_toggleOpenState(aRow) { + toggleOpenState: function(aRow) { if (!this._result) throw Cr.NS_ERROR_UNEXPECTED; @@ -1535,7 +1535,7 @@ PlacesTreeView.prototype = { node.containerOpen = !node.containerOpen; }, - cycleHeader: function PTV_cycleHeader(aColumn) { + cycleHeader: function(aColumn) { if (!this._result) throw Cr.NS_ERROR_UNEXPECTED; @@ -1650,7 +1650,7 @@ PlacesTreeView.prototype = { this._result.sortingMode = newSort; }, - isEditable: function PTV_isEditable(aRow, aColumn) { + isEditable: function(aRow, aColumn) { // At this point we only support editing the title field. if (aColumn.index != 0) return false; @@ -1693,7 +1693,7 @@ PlacesTreeView.prototype = { return true; }, - setCellText: function PTV_setCellText(aRow, aColumn, aText) { + setCellText: function(aRow, aColumn, aText) { // We may only get here if the cell is editable. let node = this._rows[aRow]; if (node.title != aText) { @@ -1707,7 +1707,7 @@ PlacesTreeView.prototype = { } }, - toggleCutNode: function PTV_toggleCutNode(aNode, aValue) { + toggleCutNode: function(aNode, aValue) { let currentVal = this._cuttingNodes.has(aNode); if (currentVal != aValue) { if (aValue) diff --git a/application/basilisk/components/preferences/applicationManager.js b/application/basilisk/components/preferences/applicationManager.js index 2e0f47a69..997c3571f 100644 --- a/application/basilisk/components/preferences/applicationManager.js +++ b/application/basilisk/components/preferences/applicationManager.js @@ -10,7 +10,7 @@ var Ci = Components.interfaces; var gAppManagerDialog = { _removed: [], - init: function appManager_init() { + init: function() { this.handlerInfo = window.arguments[0]; var bundle = document.getElementById("appManagerBundle"); @@ -44,7 +44,7 @@ var gAppManagerDialog = { list.selectedIndex = 0; }, - onOK: function appManager_onOK() { + onOK: function() { if (!this._removed.length) { // return early to avoid calling the |store| method. return; @@ -56,11 +56,11 @@ var gAppManagerDialog = { this.handlerInfo.store(); }, - onCancel: function appManager_onCancel() { + onCancel: function() { // do nothing }, - remove: function appManager_remove() { + remove: function() { var list = document.getElementById("appList"); this._removed.push(list.selectedItem.app); var index = list.selectedIndex; @@ -78,7 +78,7 @@ var gAppManagerDialog = { } }, - onSelect: function appManager_onSelect() { + onSelect: function() { var list = document.getElementById("appList"); if (!list.selectedItem) { document.getElementById("remove").disabled = true; diff --git a/application/basilisk/components/preferences/cookies.js b/application/basilisk/components/preferences/cookies.js index 4ede5b6e6..d44e9ee8a 100644 --- a/application/basilisk/components/preferences/cookies.js +++ b/application/basilisk/components/preferences/cookies.js @@ -564,7 +564,7 @@ var gCookiesWindow = { removeSelectedCookies.disabled = !hasRows || !hasSelection; }, - performDeletion: function gCookiesWindow_performDeletion(deleteItems) { + performDeletion: function(deleteItems) { var psvc = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); var blockFutureCookies = false; @@ -869,7 +869,7 @@ var gCookiesWindow = { } }, - _updateRemoveAllButton: function gCookiesWindow__updateRemoveAllButton() { + _updateRemoveAllButton: function() { let removeAllCookies = document.getElementById("removeAllCookies"); removeAllCookies.disabled = this._view._rowCount == 0; diff --git a/application/basilisk/components/preferences/in-content/privacy.js b/application/basilisk/components/preferences/in-content/privacy.js index a976fb4fa..0774ecc59 100644 --- a/application/basilisk/components/preferences/in-content/privacy.js +++ b/application/basilisk/components/preferences/in-content/privacy.js @@ -232,7 +232,7 @@ var gPrivacyPane = { /** * Initialize the history mode menulist based on the privacy preferences */ - initializeHistoryMode: function PPP_initializeHistoryMode() + initializeHistoryMode: function() { let mode; let getVal = aPref => document.getElementById(aPref).value; @@ -252,7 +252,7 @@ var gPrivacyPane = { /** * Update the selected pane based on the history mode menulist */ - updateHistoryModePane: function PPP_updateHistoryModePane() + updateHistoryModePane: function() { let selectedIndex = -1; switch (document.getElementById("historyMode").value) { @@ -273,7 +273,7 @@ var gPrivacyPane = { * Update the private browsing auto-start pref and the history mode * micro-management prefs based on the history mode menulist */ - updateHistoryModePrefs: function PPP_updateHistoryModePrefs() + updateHistoryModePrefs: function() { let pref = document.getElementById("browser.privatebrowsing.autostart"); switch (document.getElementById("historyMode").value) { @@ -308,7 +308,7 @@ var gPrivacyPane = { * Update the privacy micro-management controls based on the * value of the private browsing auto-start checkbox. */ - updatePrivacyMicroControls: function PPP_updatePrivacyMicroControls() + updatePrivacyMicroControls: function() { if (document.getElementById("historyMode").value == "custom") { let disabled = this._autoStartPrivateBrowsing = @@ -360,7 +360,7 @@ var gPrivacyPane = { /** * Initialize the starting state for the auto-start private browsing mode pref reverter. */ - initAutoStartPrivateBrowsingReverter: function PPP_initAutoStartPrivateBrowsingReverter() + initAutoStartPrivateBrowsingReverter: function() { let mode = document.getElementById("historyMode"); let autoStart = document.getElementById("privateBrowsingAutoStart"); @@ -370,7 +370,7 @@ var gPrivacyPane = { _lastMode: null, _lastCheckState: null, - updateAutostart: function PPP_updateAutostart() { + updateAutostart: function() { let mode = document.getElementById("historyMode"); let autoStart = document.getElementById("privateBrowsingAutoStart"); let pref = document.getElementById("browser.privatebrowsing.autostart"); diff --git a/application/basilisk/components/preferences/in-content/search.js b/application/basilisk/components/preferences/in-content/search.js index 55aa2c18c..badd3661d 100644 --- a/application/basilisk/components/preferences/in-content/search.js +++ b/application/basilisk/components/preferences/in-content/search.js @@ -345,15 +345,15 @@ EngineStore.prototype = { return val; }, - _getIndexForEngine: function ES_getIndexForEngine(aEngine) { + _getIndexForEngine: function(aEngine) { return this._engines.indexOf(aEngine); }, - _getEngineByName: function ES_getEngineByName(aName) { + _getEngineByName: function(aName) { return this._engines.find(engine => engine.name == aName); }, - _cloneEngine: function ES_cloneEngine(aEngine) { + _cloneEngine: function(aEngine) { var clonedObj={}; for (var i in aEngine) clonedObj[i] = aEngine[i]; @@ -363,15 +363,15 @@ EngineStore.prototype = { }, // Callback for Array's some(). A thisObj must be passed to some() - _isSameEngine: function ES_isSameEngine(aEngineClone) { + _isSameEngine: function(aEngineClone) { return aEngineClone.originalEngine == this.originalEngine; }, - addEngine: function ES_addEngine(aEngine) { + addEngine: function(aEngine) { this._engines.push(this._cloneEngine(aEngine)); }, - moveEngine: function ES_moveEngine(aEngine, aNewIndex) { + moveEngine: function(aEngine, aNewIndex) { if (aNewIndex < 0 || aNewIndex > this._engines.length - 1) throw new Error("ES_moveEngine: invalid aNewIndex!"); var index = this._getIndexForEngine(aEngine); @@ -388,7 +388,7 @@ EngineStore.prototype = { Services.search.moveEngine(aEngine.originalEngine, aNewIndex); }, - removeEngine: function ES_removeEngine(aEngine) { + removeEngine: function(aEngine) { if (this._engines.length == 1) { throw new Error("Cannot remove last engine!"); } @@ -407,7 +407,7 @@ EngineStore.prototype = { return index; }, - restoreDefaultEngines: function ES_restoreDefaultEngines() { + restoreDefaultEngines: function() { var added = 0; for (var i = 0; i < this._defaultEngines.length; ++i) { @@ -436,7 +436,7 @@ EngineStore.prototype = { return added; }, - changeEngine: function ES_changeEngine(aEngine, aProp, aNewValue) { + changeEngine: function(aEngine, aProp, aNewValue) { var index = this._getIndexForEngine(aEngine); if (index == -1) throw new Error("invalid engine?"); @@ -445,7 +445,7 @@ EngineStore.prototype = { aEngine.originalEngine[aProp] = aNewValue; }, - reloadIcons: function ES_reloadIcons() { + reloadIcons: function() { this._engines.forEach(function (e) { e.uri = e.originalEngine.uri; }); diff --git a/application/basilisk/components/preferences/selectBookmark.js b/application/basilisk/components/preferences/selectBookmark.js index ae9b6b1c8..5d03c4b62 100644 --- a/application/basilisk/components/preferences/selectBookmark.js +++ b/application/basilisk/components/preferences/selectBookmark.js @@ -15,7 +15,7 @@ * closes. */ var SelectBookmarkDialog = { - init: function SBD_init() { + init: function() { document.getElementById("bookmarks").place = "place:queryType=1&folder=" + PlacesUIUtils.allBookmarksFolderId; @@ -27,7 +27,7 @@ var SelectBookmarkDialog = { * Update the disabled state of the OK button as the user changes the * selection within the view. */ - selectionChanged: function SBD_selectionChanged() { + selectionChanged: function() { var accept = document.documentElement.getButton("accept"); var bookmarks = document.getElementById("bookmarks"); var disableAcceptButton = true; @@ -38,7 +38,7 @@ var SelectBookmarkDialog = { accept.disabled = disableAcceptButton; }, - onItemDblClick: function SBD_onItemDblClick() { + onItemDblClick: function() { var bookmarks = document.getElementById("bookmarks"); var selectedNode = bookmarks.selectedNode; if (selectedNode && PlacesUtils.nodeIsURI(selectedNode)) { @@ -54,7 +54,7 @@ var SelectBookmarkDialog = { * User accepts their selection. Set all the selected URLs or the contents * of the selected folder as the list of homepages. */ - accept: function SBD_accept() { + accept: function() { var bookmarks = document.getElementById("bookmarks"); NS_ASSERT(bookmarks.hasSelection, "Should not be able to accept dialog if there is no selected URL!"); diff --git a/application/basilisk/components/search/service/nsSearchService.js b/application/basilisk/components/search/service/nsSearchService.js index 2ea9384f5..b7601fd05 100644 --- a/application/basilisk/components/search/service/nsSearchService.js +++ b/application/basilisk/components/search/service/nsSearchService.js @@ -321,13 +321,13 @@ loadListener.prototype = { ]), // nsIRequestObserver - onStartRequest: function SRCH_loadStartR(aRequest, aContext) { + onStartRequest: function(aRequest, aContext) { LOG("loadListener: Starting request: " + aRequest.name); this._stream = Cc["@mozilla.org/binaryinputstream;1"]. createInstance(Ci.nsIBinaryInputStream); }, - onStopRequest: function SRCH_loadStopR(aRequest, aContext, aStatusCode) { + onStopRequest: function(aRequest, aContext, aStatusCode) { LOG("loadListener: Stopping request: " + aRequest.name); var requestFailed = !Components.isSuccessCode(aStatusCode); @@ -345,7 +345,7 @@ loadListener.prototype = { }, // nsIStreamListener - onDataAvailable: function SRCH_loadDAvailable(aRequest, aContext, + onDataAvailable: function(aRequest, aContext, aInputStream, aOffset, aCount) { this._stream.setInputStream(aInputStream); @@ -356,14 +356,14 @@ loadListener.prototype = { }, // nsIChannelEventSink - asyncOnChannelRedirect: function SRCH_loadCRedirect(aOldChannel, aNewChannel, + asyncOnChannelRedirect: function(aOldChannel, aNewChannel, aFlags, callback) { this._channel = aNewChannel; callback.onRedirectVerifyCallback(Components.results.NS_OK); }, // nsIInterfaceRequestor - getInterface: function SRCH_load_GI(aIID) { + getInterface: function(aIID) { return this.QueryInterface(aIID); }, @@ -688,18 +688,18 @@ function EngineURL(aType, aMethod, aTemplate, aResultDomain) { } EngineURL.prototype = { - addParam: function SRCH_EURL_addParam(aName, aValue, aPurpose) { + addParam: function(aName, aValue, aPurpose) { this.params.push(new QueryParameter(aName, aValue, aPurpose)); }, // Note: This method requires that aObj has a unique name or the previous MozParams entry with // that name will be overwritten. - _addMozParam: function SRCH_EURL__addMozParam(aObj) { + _addMozParam: function(aObj) { aObj.mozparam = true; this.mozparams[aObj.name] = aObj; }, - getSubmission: function SRCH_EURL_getSubmission(aSearchTerms, aEngine, aPurpose) { + getSubmission: function(aSearchTerms, aEngine, aPurpose) { var url = ParamSubstitution(this.template, aSearchTerms, aEngine); // Default to searchbar if the purpose is not provided var purpose = aPurpose || "searchbar"; @@ -747,16 +747,16 @@ EngineURL.prototype = { return new Submission(makeURI(url), postData); }, - _getTermsParameterName: function SRCH_EURL__getTermsParameterName() { + _getTermsParameterName: function() { let queryParam = this.params.find(p => p.value == USER_DEFINED); return queryParam ? queryParam.name : ""; }, - _hasRelation: function SRC_EURL__hasRelation(aRel) { + _hasRelation: function(aRel) { return this.rels.some(e => e == aRel.toLowerCase()); }, - _initWithJSON: function SRC_EURL__initWithJSON(aJson, aEngine) { + _initWithJSON: function(aJson, aEngine) { if (!aJson.params) return; @@ -780,7 +780,7 @@ EngineURL.prototype = { * Creates a JavaScript object that represents this URL. * @returns An object suitable for serialization as JSON. **/ - toJSON: function SRCH_EURL_toJSON() { + toJSON: function() { var json = { template: this.template, rels: this.rels, @@ -947,7 +947,7 @@ Engine.prototype = { * Retrieves the data from the engine's file. * The document element is placed in the engine's data field. */ - _initFromFile: function SRCH_ENG_initFromFile(file) { + _initFromFile: function(file) { if (!file || !file.exists()) FAIL("File must exist before calling initFromFile!", Cr.NS_ERROR_UNEXPECTED); @@ -995,7 +995,7 @@ Engine.prototype = { * * @param uri The uri to load the search plugin from. */ - _initFromURIAndLoad: function SRCH_ENG_initFromURIAndLoad(uri) { + _initFromURIAndLoad: function(uri) { ENSURE_WARN(uri instanceof Ci.nsIURI, "Must have URI when calling _initFromURIAndLoad!", Cr.NS_ERROR_UNEXPECTED); @@ -1039,7 +1039,7 @@ Engine.prototype = { * @returns {Promise} A promise, resolved successfully if retrieveing data * succeeds. */ - _retrieveSearchXMLData: function SRCH_ENG__retrieveSearchXMLData(aURL) { + _retrieveSearchXMLData: function(aURL) { let deferred = Promise.defer(); let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]. createInstance(Ci.nsIXMLHttpRequest); @@ -1058,7 +1058,7 @@ Engine.prototype = { return deferred.promise; }, - _initFromURISync: function SRCH_ENG_initFromURISync(uri) { + _initFromURISync: function(uri) { ENSURE_WARN(uri instanceof Ci.nsIURI, "Must have URI when calling _initFromURISync!", Cr.NS_ERROR_UNEXPECTED); @@ -1094,7 +1094,7 @@ Engine.prototype = { * @param aType string to match the EngineURL's type attribute * @param aRel [optional] only return URLs that with this rel value */ - _getURLOfType: function SRCH_ENG__getURLOfType(aType, aRel) { + _getURLOfType: function(aType, aRel) { for (var i = 0; i < this._urls.length; ++i) { if (this._urls[i].type == aType && (!aRel || this._urls[i]._hasRelation(aRel))) return this._urls[i]; @@ -1103,7 +1103,7 @@ Engine.prototype = { return null; }, - _confirmAddEngine: function SRCH_SVC_confirmAddEngine() { + _confirmAddEngine: function() { var stringBundle = Services.strings.createBundle(SEARCH_BUNDLE); var titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle"); @@ -1143,7 +1143,7 @@ Engine.prototype = { * triggers parsing of the data. The engine is then flushed to disk. Notifies * the search service once initialization is complete. */ - _onLoad: function SRCH_ENG_onLoad(aBytes, aEngine) { + _onLoad: function(aBytes, aEngine) { /** * Handle an error during the load of an engine by notifying the engine's * error callback, if any. @@ -1271,7 +1271,7 @@ Engine.prototype = { * Height of the icon. * @returns key string */ - _getIconKey: function SRCH_ENG_getIconKey(aWidth, aHeight) { + _getIconKey: function(aWidth, aHeight) { let keyObj = { width: aWidth, height: aHeight @@ -1290,7 +1290,7 @@ Engine.prototype = { * @param aURISpec * String with the icon's URI. */ - _addIconToMap: function SRCH_ENG_addIconToMap(aWidth, aHeight, aURISpec) { + _addIconToMap: function(aWidth, aHeight, aURISpec) { if (aWidth == 16 && aHeight == 16) { // The 16x16 icon is stored in _iconURL, we don't need to store it twice. return; @@ -1320,7 +1320,7 @@ Engine.prototype = { * @param aHeight (optional) * Height of the icon. */ - _setIcon: function SRCH_ENG_setIcon(aIconURL, aIsPreferred, aWidth, aHeight) { + _setIcon: function(aIconURL, aIsPreferred, aWidth, aHeight) { var uri = makeURI(aIconURL); // Ignore bad URIs @@ -1401,7 +1401,7 @@ Engine.prototype = { /** * Initialize this Engine object from the collected data. */ - _initFromData: function SRCH_ENG_initFromData() { + _initFromData: function() { ENSURE_WARN(this._data, "Can't init an engine with no data!", Cr.NS_ERROR_UNEXPECTED); @@ -1426,7 +1426,7 @@ Engine.prototype = { /** * Initialize this Engine object from a collection of metadata. */ - _initFromMetadata: function SRCH_ENG_initMetaData(aName, aIconURL, aAlias, + _initFromMetadata: function(aName, aIconURL, aAlias, aDescription, aMethod, aTemplate, aExtensionID) { ENSURE_WARN(!this._readOnly, @@ -1451,7 +1451,7 @@ Engine.prototype = { * @see http://opensearch.a9.com/spec/1.1/querysyntax/#urltag. * @see EngineURL() */ - _parseURL: function SRCH_ENG_parseURL(aElement) { + _parseURL: function(aElement) { var type = aElement.getAttribute("type"); // According to the spec, method is optional, defaulting to "GET" if not // specified @@ -1525,7 +1525,7 @@ Engine.prototype = { * Get the icon from an OpenSearch Image element. * @see http://opensearch.a9.com/spec/1.1/description/#image */ - _parseImage: function SRCH_ENG_parseImage(aElement) { + _parseImage: function(aElement) { LOG("_parseImage: Image textContent: \"" + limitURILength(aElement.textContent) + "\""); let width = parseInt(aElement.getAttribute("width"), 10); @@ -1544,7 +1544,7 @@ Engine.prototype = { * Extract search engine information from the collected data to initialize * the engine object. */ - _parse: function SRCH_ENG_parse() { + _parse: function() { var doc = this._data; // The OpenSearch spec sets a default value for the input encoding. @@ -1601,7 +1601,7 @@ Engine.prototype = { /** * Init from a JSON record. **/ - _initWithJSON: function SRCH_ENG__initWithJSON(aJson) { + _initWithJSON: function(aJson) { this._name = aJson._name; this._shortName = aJson._shortName; this._loadPath = aJson._loadPath; @@ -1640,7 +1640,7 @@ Engine.prototype = { * Creates a JavaScript object that represents this engine. * @returns An object suitable for serialization as JSON. **/ - toJSON: function SRCH_ENG_toJSON() { + toJSON: function() { var json = { _name: this._name, _shortName: this._shortName, @@ -1933,7 +1933,7 @@ Engine.prototype = { }, // from nsISearchEngine - addParam: function SRCH_ENG_addParam(aName, aValue, aResponseType) { + addParam: function(aName, aValue, aResponseType) { if (!aName || (aValue == null)) FAIL("missing name or value for nsISearchEngine::addParam!"); ENSURE_WARN(!this._readOnly, @@ -1983,7 +1983,7 @@ Engine.prototype = { }, // from nsISearchEngine - getSubmission: function SRCH_ENG_getSubmission(aData, aResponseType, aPurpose) { + getSubmission: function(aData, aResponseType, aPurpose) { if (!aResponseType) { aResponseType = AppConstants.platform == "android" ? this._defaultMobileResponseType : URLTYPE_SEARCH_HTML; @@ -2031,12 +2031,12 @@ Engine.prototype = { }, // from nsISearchEngine - supportsResponseType: function SRCH_ENG_supportsResponseType(type) { + supportsResponseType: function(type) { return (this._getURLOfType(type) != null); }, // from nsISearchEngine - getResultDomain: function SRCH_ENG_getResultDomain(aResponseType) { + getResultDomain: function(aResponseType) { if (!aResponseType) { aResponseType = AppConstants.platform == "android" ? this._defaultMobileResponseType : URLTYPE_SEARCH_HTML; @@ -2093,7 +2093,7 @@ Engine.prototype = { * @param height * Height of the requested icon. */ - getIconURLBySize: function SRCH_ENG_getIconURLBySize(aWidth, aHeight) { + getIconURLBySize: function(aWidth, aHeight) { if (aWidth == 16 && aHeight == 16) return this._iconURL; @@ -2113,7 +2113,7 @@ Engine.prototype = { * represent the icon's dimensions. url is a string with the URL for * the icon. */ - getIcons: function SRCH_ENG_getIcons() { + getIcons: function() { let result = []; if (this._iconURL) result.push({width: 16, height: 16, url: this._iconURL}); @@ -2144,7 +2144,7 @@ Engine.prototype = { * @throws NS_ERROR_INVALID_ARG if options is omitted or lacks required * elemeents */ - speculativeConnect: function SRCH_ENG_speculativeConnect(options) { + speculativeConnect: function(options) { if (!options || !options.window) { Cu.reportError("invalid options arg passed to nsISearchEngine.speculativeConnect"); throw Cr.NS_ERROR_INVALID_ARG; @@ -2262,7 +2262,7 @@ SearchService.prototype = { // If initialization has not been completed yet, perform synchronous // initialization. // Throws in case of initialization error. - _ensureInitialized: function SRCH_SVC__ensureInitialized() { + _ensureInitialized: function() { if (gInitialized) { if (!Components.isSuccessCode(this._initRV)) { LOG("_ensureInitialized: failure"); @@ -2287,7 +2287,7 @@ SearchService.prototype = { // Synchronous implementation of the initializer. // Used by |_ensureInitialized| as a fallback if initialization is not // complete. - _syncInit: function SRCH_SVC__syncInit() { + _syncInit: function() { LOG("_syncInit start"); this._initStarted = true; @@ -2405,11 +2405,11 @@ SearchService.prototype = { return this.getEngineByName(defaultEngine); }, - resetToOriginalDefaultEngine: function SRCH_SVC__resetToOriginalDefaultEngine() { + resetToOriginalDefaultEngine: function() { this.currentEngine = this.originalDefaultEngine; }, - _buildCache: function SRCH_SVC__buildCache() { + _buildCache: function() { if (this._batchTask) this._batchTask.disarm(); @@ -2458,7 +2458,7 @@ SearchService.prototype = { } }, - _syncLoadEngines: function SRCH_SVC__syncLoadEngines(cache) { + _syncLoadEngines: function(cache) { LOG("_syncLoadEngines: start"); // See if we have a cache file so we don't have to parse a bunch of XML. let chromeURIs = this._findJAREngines(); @@ -2732,7 +2732,7 @@ SearchService.prototype = { * * @returns A JS object containing the cached data. */ - _readCacheFile: function SRCH_SVC__readCacheFile() { + _readCacheFile: function() { if (this._cacheFileJSON) { return this._cacheFileJSON; } @@ -2854,7 +2854,7 @@ SearchService.prototype = { return this._batchTask; }, - _addEngineToStore: function SRCH_SVC_addEngineToStore(aEngine) { + _addEngineToStore: function(aEngine) { LOG("_addEngineToStore: Adding engine: \"" + aEngine.name + "\""); // See if there is an existing engine with the same name. However, if this @@ -2909,7 +2909,7 @@ SearchService.prototype = { } }, - _loadEnginesMetadataFromCache: function SRCH_SVC__loadEnginesMetadataFromCache(cache) { + _loadEnginesMetadataFromCache: function(cache) { if (cache._oldMetadata) { // If we have old metadata in the cache, we had no valid cache // file and read data from search-metadata.json. @@ -2933,7 +2933,7 @@ SearchService.prototype = { } }, - _loadEnginesFromCache: function SRCH_SVC__loadEnginesFromCache(cache, + _loadEnginesFromCache: function(cache, skipReadOnly) { if (!cache.engines) return; @@ -2956,7 +2956,7 @@ SearchService.prototype = { } }, - _loadEngineFromCache: function SRCH_SVC__loadEngineFromCache(json) { + _loadEngineFromCache: function(json) { try { let engine = new Engine(json._shortName, json._readOnly == undefined); engine._initWithJSON(json); @@ -2967,7 +2967,7 @@ SearchService.prototype = { } }, - _loadEnginesFromDir: function SRCH_SVC__loadEnginesFromDir(aDir) { + _loadEnginesFromDir: function(aDir) { LOG("_loadEnginesFromDir: Searching in " + aDir.path + " for search engines."); // Check whether aDir is the user profile dir @@ -3064,7 +3064,7 @@ SearchService.prototype = { return engines; }), - _loadFromChromeURLs: function SRCH_SVC_loadFromChromeURLs(aURLs) { + _loadFromChromeURLs: function(aURLs) { aURLs.forEach(function (url) { try { LOG("_loadFromChromeURLs: loading engine from chrome url: " + url); @@ -3117,7 +3117,7 @@ SearchService.prototype = { return fileURI.file; }, - _findJAREngines: function SRCH_SVC_findJAREngines() { + _findJAREngines: function() { LOG("_findJAREngines: looking for engines in JARs") let chan = makeChannel(APP_SEARCH_PREFIX + "list.json"); @@ -3192,7 +3192,7 @@ SearchService.prototype = { return uris; }), - _parseListJSON: function SRCH_SVC_parseListJSON(list, uris) { + _parseListJSON: function(list, uris) { let searchSettings; try { searchSettings = JSON.parse(list); @@ -3247,7 +3247,7 @@ SearchService.prototype = { this._visibleDefaultEngines = engineNames; }, - _parseListTxt: function SRCH_SVC_parseListTxt(list, uris) { + _parseListTxt: function(list, uris) { let names = list.split("\n").filter(n => !!n); // This maps the names of our built-in engines to a boolean // indicating whether it should be hidden by default. @@ -3301,7 +3301,7 @@ SearchService.prototype = { }, - _saveSortedEngineList: function SRCH_SVC_saveSortedEngineList() { + _saveSortedEngineList: function() { LOG("SRCH_SVC_saveSortedEngineList: starting"); // Set the useDB pref to indicate that from now on we should use the order @@ -3317,7 +3317,7 @@ SearchService.prototype = { LOG("SRCH_SVC_saveSortedEngineList: done"); }, - _buildSortedEngineList: function SRCH_SVC_buildSortedEngineList() { + _buildSortedEngineList: function() { LOG("_buildSortedEngineList: building list"); var addedEngines = { }; this.__sortedEngines = []; @@ -3419,7 +3419,7 @@ SearchService.prototype = { * @param aWithHidden * True if hidden plugins should be included in the result. */ - _getSortedEngines: function SRCH_SVC_getSorted(aWithHidden) { + _getSortedEngines: function(aWithHidden) { if (aWithHidden) return this._sortedEngines; @@ -3429,7 +3429,7 @@ SearchService.prototype = { }, // nsIBrowserSearchService - init: function SRCH_SVC_init(observer) { + init: function(observer) { LOG("SearchService.init"); let self = this; if (!this._initStarted) { @@ -3469,7 +3469,7 @@ SearchService.prototype = { return gInitialized; }, - getEngines: function SRCH_SVC_getEngines(aCount) { + getEngines: function(aCount) { this._ensureInitialized(); LOG("getEngines: getting all engines"); var engines = this._getSortedEngines(true); @@ -3477,7 +3477,7 @@ SearchService.prototype = { return engines; }, - getVisibleEngines: function SRCH_SVC_getVisible(aCount) { + getVisibleEngines: function(aCount) { this._ensureInitialized(); LOG("getVisibleEngines: getting all visible engines"); var engines = this._getSortedEngines(false); @@ -3485,7 +3485,7 @@ SearchService.prototype = { return engines; }, - getDefaultEngines: function SRCH_SVC_getDefault(aCount) { + getDefaultEngines: function(aCount) { this._ensureInitialized(); function isDefault(engine) { return engine._isDefault; @@ -3544,12 +3544,12 @@ SearchService.prototype = { return engines; }, - getEngineByName: function SRCH_SVC_getEngineByName(aEngineName) { + getEngineByName: function(aEngineName) { this._ensureInitialized(); return this._engines[aEngineName] || null; }, - getEngineByAlias: function SRCH_SVC_getEngineByAlias(aAlias) { + getEngineByAlias: function(aAlias) { this._ensureInitialized(); for (var engineName in this._engines) { var engine = this._engines[engineName]; @@ -3559,7 +3559,7 @@ SearchService.prototype = { return null; }, - addEngineWithDetails: function SRCH_SVC_addEWD(aName, aIconURL, aAlias, + addEngineWithDetails: function(aName, aIconURL, aAlias, aDescription, aMethod, aTemplate, aExtensionID) { this._ensureInitialized(); @@ -3579,7 +3579,7 @@ SearchService.prototype = { this._addEngineToStore(engine); }, - addEngine: function SRCH_SVC_addEngine(aEngineURL, aDataType, aIconURL, + addEngine: function(aEngineURL, aDataType, aIconURL, aConfirm, aCallback) { LOG("addEngine: Adding \"" + aEngineURL + "\"."); this._ensureInitialized(); @@ -3611,7 +3611,7 @@ SearchService.prototype = { engine._confirm = aConfirm; }, - removeEngine: function SRCH_SVC_removeEngine(aEngine) { + removeEngine: function(aEngine) { this._ensureInitialized(); if (!aEngine) FAIL("no engine passed to removeEngine!"); @@ -3660,7 +3660,7 @@ SearchService.prototype = { notifyAction(engineToRemove, SEARCH_ENGINE_REMOVED); }, - moveEngine: function SRCH_SVC_moveEngine(aEngine, aNewIndex) { + moveEngine: function(aEngine, aNewIndex) { this._ensureInitialized(); if ((aNewIndex > this._sortedEngines.length) || (aNewIndex < 0)) FAIL("SRCH_SVC_moveEngine: Index out of bounds!"); @@ -3710,7 +3710,7 @@ SearchService.prototype = { this._saveSortedEngineList(); }, - restoreDefaultEngines: function SRCH_SVC_resetDefaultEngines() { + restoreDefaultEngines: function() { this._ensureInitialized(); for (let name in this._engines) { let e = this._engines[name]; @@ -3928,7 +3928,7 @@ SearchService.prototype = { */ _parseSubmissionMap: null, - _buildParseSubmissionMap: function SRCH_SVC__buildParseSubmissionMap() { + _buildParseSubmissionMap: function() { LOG("_buildParseSubmissionMap"); this._parseSubmissionMap = new Map(); @@ -4041,7 +4041,7 @@ SearchService.prototype = { }); }, - parseSubmissionURL: function SRCH_SVC_parseSubmissionURL(aURL) { + parseSubmissionURL: function(aURL) { this._ensureInitialized(); LOG("parseSubmissionURL: Parsing \"" + aURL + "\"."); @@ -4128,7 +4128,7 @@ SearchService.prototype = { }, // nsIObserver - observe: function SRCH_SVC_observe(aEngine, aTopic, aVerb) { + observe: function(aEngine, aTopic, aVerb) { switch (aTopic) { case SEARCH_ENGINE_TOPIC: switch (aVerb) { @@ -4170,7 +4170,7 @@ SearchService.prototype = { }, // nsITimerCallback - notify: function SRCH_SVC_notify(aTimer) { + notify: function(aTimer) { LOG("_notify: checking for updates"); if (!Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "update", true)) @@ -4208,7 +4208,7 @@ SearchService.prototype = { } // end engine iteration }, - _addObservers: function SRCH_SVC_addObservers() { + _addObservers: function() { if (this._observersAdded) { // There might be a race between synchronous and asynchronous // initialization for which we try to register the observers twice. @@ -4260,7 +4260,7 @@ SearchService.prototype = { }, _observersAdded: false, - _removeObservers: function SRCH_SVC_removeObservers() { + _removeObservers: function() { Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC); Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC); @@ -4291,13 +4291,13 @@ function ULOG(aText) { } var engineUpdateService = { - scheduleNextUpdate: function eus_scheduleNextUpdate(aEngine) { + scheduleNextUpdate: function(aEngine) { var interval = aEngine._updateInterval || SEARCH_DEFAULT_UPDATE_INTERVAL; var milliseconds = interval * 86400000; // |interval| is in days aEngine.setAttr("updateexpir", Date.now() + milliseconds); }, - update: function eus_Update(aEngine) { + update: function(aEngine) { let engine = aEngine.wrappedJSObject; ULOG("update called for " + aEngine._name); if (!Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "update", true) || !engine._hasUpdates) diff --git a/application/basilisk/components/sessionstore/SessionStore.jsm b/application/basilisk/components/sessionstore/SessionStore.jsm index 086bb914a..144fa4600 100644 --- a/application/basilisk/components/sessionstore/SessionStore.jsm +++ b/application/basilisk/components/sessionstore/SessionStore.jsm @@ -186,7 +186,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown", "resource://gre/modules/AsyncShutdown.jsm"); Object.defineProperty(this, "HUDService", { - get: function HUDService_getter() { + get: function() { let devtools = Cu.import("resource://devtools/shared/Loader.jsm", {}).devtools; return devtools.require("devtools/client/webconsole/hudservice").HUDService; }, @@ -223,111 +223,111 @@ this.SessionStore = { return SessionStoreInternal.lastClosedObjectType; }, - init: function ss_init() { + init: function() { SessionStoreInternal.init(); }, - getBrowserState: function ss_getBrowserState() { + getBrowserState: function() { return SessionStoreInternal.getBrowserState(); }, - setBrowserState: function ss_setBrowserState(aState) { + setBrowserState: function(aState) { SessionStoreInternal.setBrowserState(aState); }, - getWindowState: function ss_getWindowState(aWindow) { + getWindowState: function(aWindow) { return SessionStoreInternal.getWindowState(aWindow); }, - setWindowState: function ss_setWindowState(aWindow, aState, aOverwrite) { + setWindowState: function(aWindow, aState, aOverwrite) { SessionStoreInternal.setWindowState(aWindow, aState, aOverwrite); }, - getTabState: function ss_getTabState(aTab) { + getTabState: function(aTab) { return SessionStoreInternal.getTabState(aTab); }, - setTabState: function ss_setTabState(aTab, aState) { + setTabState: function(aTab, aState) { SessionStoreInternal.setTabState(aTab, aState); }, - duplicateTab: function ss_duplicateTab(aWindow, aTab, aDelta = 0) { + duplicateTab: function(aWindow, aTab, aDelta = 0) { return SessionStoreInternal.duplicateTab(aWindow, aTab, aDelta); }, - getClosedTabCount: function ss_getClosedTabCount(aWindow) { + getClosedTabCount: function(aWindow) { return SessionStoreInternal.getClosedTabCount(aWindow); }, - getClosedTabData: function ss_getClosedTabData(aWindow, aAsString = true) { + getClosedTabData: function(aWindow, aAsString = true) { return SessionStoreInternal.getClosedTabData(aWindow, aAsString); }, - undoCloseTab: function ss_undoCloseTab(aWindow, aIndex) { + undoCloseTab: function(aWindow, aIndex) { return SessionStoreInternal.undoCloseTab(aWindow, aIndex); }, - forgetClosedTab: function ss_forgetClosedTab(aWindow, aIndex) { + forgetClosedTab: function(aWindow, aIndex) { return SessionStoreInternal.forgetClosedTab(aWindow, aIndex); }, - getClosedWindowCount: function ss_getClosedWindowCount() { + getClosedWindowCount: function() { return SessionStoreInternal.getClosedWindowCount(); }, - getClosedWindowData: function ss_getClosedWindowData(aAsString = true) { + getClosedWindowData: function(aAsString = true) { return SessionStoreInternal.getClosedWindowData(aAsString); }, - undoCloseWindow: function ss_undoCloseWindow(aIndex) { + undoCloseWindow: function(aIndex) { return SessionStoreInternal.undoCloseWindow(aIndex); }, - forgetClosedWindow: function ss_forgetClosedWindow(aIndex) { + forgetClosedWindow: function(aIndex) { return SessionStoreInternal.forgetClosedWindow(aIndex); }, - getWindowValue: function ss_getWindowValue(aWindow, aKey) { + getWindowValue: function(aWindow, aKey) { return SessionStoreInternal.getWindowValue(aWindow, aKey); }, - setWindowValue: function ss_setWindowValue(aWindow, aKey, aStringValue) { + setWindowValue: function(aWindow, aKey, aStringValue) { SessionStoreInternal.setWindowValue(aWindow, aKey, aStringValue); }, - deleteWindowValue: function ss_deleteWindowValue(aWindow, aKey) { + deleteWindowValue: function(aWindow, aKey) { SessionStoreInternal.deleteWindowValue(aWindow, aKey); }, - getTabValue: function ss_getTabValue(aTab, aKey) { + getTabValue: function(aTab, aKey) { return SessionStoreInternal.getTabValue(aTab, aKey); }, - setTabValue: function ss_setTabValue(aTab, aKey, aStringValue) { + setTabValue: function(aTab, aKey, aStringValue) { SessionStoreInternal.setTabValue(aTab, aKey, aStringValue); }, - deleteTabValue: function ss_deleteTabValue(aTab, aKey) { + deleteTabValue: function(aTab, aKey) { SessionStoreInternal.deleteTabValue(aTab, aKey); }, - getGlobalValue: function ss_getGlobalValue(aKey) { + getGlobalValue: function(aKey) { return SessionStoreInternal.getGlobalValue(aKey); }, - setGlobalValue: function ss_setGlobalValue(aKey, aStringValue) { + setGlobalValue: function(aKey, aStringValue) { SessionStoreInternal.setGlobalValue(aKey, aStringValue); }, - deleteGlobalValue: function ss_deleteGlobalValue(aKey) { + deleteGlobalValue: function(aKey) { SessionStoreInternal.deleteGlobalValue(aKey); }, - persistTabAttribute: function ss_persistTabAttribute(aName) { + persistTabAttribute: function(aName) { SessionStoreInternal.persistTabAttribute(aName); }, - restoreLastSession: function ss_restoreLastSession() { + restoreLastSession: function() { SessionStoreInternal.restoreLastSession(); }, @@ -661,7 +661,7 @@ var SessionStoreInternal = { * Called on application shutdown, after notifications: * quit-application-granted, quit-application */ - _uninit: function ssi_uninit() { + _uninit: function() { if (!this._initialized) { throw new Error("SessionStore is not initialized."); } @@ -684,7 +684,7 @@ var SessionStoreInternal = { /** * Handle notifications */ - observe: function ssi_observe(aSubject, aTopic, aData) { + observe: function(aSubject, aTopic, aData) { switch (aTopic) { case "browser-window-before-show": // catch new windows this.onBeforeBrowserWindowShown(aSubject); @@ -936,7 +936,7 @@ var SessionStoreInternal = { /** * Implement nsIDOMEventListener for handling various window and tab events */ - handleEvent: function ssi_handleEvent(aEvent) { + handleEvent: function(aEvent) { let win = aEvent.currentTarget.ownerGlobal; let target = aEvent.originalTarget; switch (aEvent.type) { @@ -990,7 +990,7 @@ var SessionStoreInternal = { * @return string * A unique string to identify a window */ - _generateWindowID: function ssi_generateWindowID() { + _generateWindowID: function() { return "window" + (this._nextWindowID++); }, @@ -1259,7 +1259,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onClose: function ssi_onClose(aWindow) { + onClose: function(aWindow) { // this window was about to be restored - conserve its original data, if any let isFullyLoaded = this._isWindowLoaded(aWindow); if (!isFullyLoaded) { @@ -1490,7 +1490,7 @@ var SessionStoreInternal = { /** * On quit application granted */ - onQuitApplicationGranted: function ssi_onQuitApplicationGranted(syncShutdown=false) { + onQuitApplicationGranted: function(syncShutdown=false) { // Collect an initial snapshot of window data before we do the flush this._forEachBrowserWindow((win) => { this._collectWindowData(win); @@ -1607,7 +1607,7 @@ var SessionStoreInternal = { /** * On last browser window close */ - onLastWindowCloseGranted: function ssi_onLastWindowCloseGranted() { + onLastWindowCloseGranted: function() { // last browser window is quitting. // remember to restore the last window when another browser window is opened // do not account for pref(resume_session_once) at this point, as it might be @@ -1620,7 +1620,7 @@ var SessionStoreInternal = { * @param aData * String type of quitting */ - onQuitApplication: function ssi_onQuitApplication(aData) { + onQuitApplication: function(aData) { if (aData == "restart") { this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); // The browser:purge-session-history notification fires after the @@ -1643,7 +1643,7 @@ var SessionStoreInternal = { /** * On purge of session history */ - onPurgeSessionHistory: function ssi_onPurgeSessionHistory() { + onPurgeSessionHistory: function() { SessionFile.wipe(); // If the browser is shutting down, simply return after clearing the // session data on disk as this notification fires after the @@ -1683,7 +1683,7 @@ var SessionStoreInternal = { * @param aData * String domain data */ - onPurgeDomainData: function ssi_onPurgeDomainData(aData) { + onPurgeDomainData: function(aData) { // does a session history entry contain a url for the given domain? function containsDomain(aEntry) { if (Utils.hasRootDomain(aEntry.url, aData)) { @@ -1741,7 +1741,7 @@ var SessionStoreInternal = { * @param aData * String preference changed */ - onPrefChange: function ssi_onPrefChange(aData) { + onPrefChange: function(aData) { switch (aData) { // if the user decreases the max number of closed tabs they want // preserved update our internal states to match that max @@ -1763,7 +1763,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onTabAdd: function ssi_onTabAdd(aWindow) { + onTabAdd: function(aWindow) { this.saveStateDelayed(aWindow); }, @@ -1774,7 +1774,7 @@ var SessionStoreInternal = { * @param aTab * Tab reference */ - onTabBrowserInserted: function ssi_onTabBrowserInserted(aWindow, aTab) { + onTabBrowserInserted: function(aWindow, aTab) { let browser = aTab.linkedBrowser; browser.addEventListener("SwapDocShells", this); browser.addEventListener("oop-browser-crashed", this); @@ -1793,7 +1793,7 @@ var SessionStoreInternal = { * @param aNoNotification * bool Do not save state if we're updating an existing tab */ - onTabRemove: function ssi_onTabRemove(aWindow, aTab, aNoNotification) { + onTabRemove: function(aWindow, aTab, aNoNotification) { let browser = aTab.linkedBrowser; browser.removeEventListener("SwapDocShells", this); browser.removeEventListener("oop-browser-crashed", this); @@ -1820,7 +1820,7 @@ var SessionStoreInternal = { * @param aTab * Tab reference */ - onTabClose: function ssi_onTabClose(aWindow, aTab) { + onTabClose: function(aWindow, aTab) { // notify the tabbrowser that the tab state will be retrieved for the last time // (so that extension authors can easily set data on soon-to-be-closed tabs) var event = aWindow.document.createEvent("Events"); @@ -1943,7 +1943,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onTabSelect: function ssi_onTabSelect(aWindow) { + onTabSelect: function(aWindow) { if (RunState.isRunning) { this._windows[aWindow.__SSi].selected = aWindow.gBrowser.tabContainer.selectedIndex; @@ -1970,7 +1970,7 @@ var SessionStoreInternal = { } }, - onTabShow: function ssi_onTabShow(aWindow, aTab) { + onTabShow: function(aWindow, aTab) { // If the tab hasn't been restored yet, move it into the right bucket if (aTab.linkedBrowser.__SS_restoreState && aTab.linkedBrowser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE) { @@ -1987,7 +1987,7 @@ var SessionStoreInternal = { this.saveStateDelayed(aWindow); }, - onTabHide: function ssi_onTabHide(aWindow, aTab) { + onTabHide: function(aWindow, aTab) { // If the tab hasn't been restored yet, move it into the right bucket if (aTab.linkedBrowser.__SS_restoreState && aTab.linkedBrowser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE) { @@ -2076,7 +2076,7 @@ var SessionStoreInternal = { /* ........ nsISessionStore API .............. */ - getBrowserState: function ssi_getBrowserState() { + getBrowserState: function() { let state = this.getCurrentState(); // Don't include the last session state in getBrowserState(). @@ -2088,7 +2088,7 @@ var SessionStoreInternal = { return JSON.stringify(state); }, - setBrowserState: function ssi_setBrowserState(aState) { + setBrowserState: function(aState) { this._handleClosedWindows(); try { @@ -2136,7 +2136,7 @@ var SessionStoreInternal = { this.restoreWindows(window, state, {overwriteTabs: true}); }, - getWindowState: function ssi_getWindowState(aWindow) { + getWindowState: function(aWindow) { if ("__SSi" in aWindow) { return JSON.stringify(this._getWindowState(aWindow)); } @@ -2149,7 +2149,7 @@ var SessionStoreInternal = { throw Components.Exception("Window is not tracked", Cr.NS_ERROR_INVALID_ARG); }, - setWindowState: function ssi_setWindowState(aWindow, aState, aOverwrite) { + setWindowState: function(aWindow, aState, aOverwrite) { if (!aWindow.__SSi) { throw Components.Exception("Window is not tracked", Cr.NS_ERROR_INVALID_ARG); } @@ -2157,7 +2157,7 @@ var SessionStoreInternal = { this.restoreWindows(aWindow, aState, {overwriteTabs: aOverwrite}); }, - getTabState: function ssi_getTabState(aTab) { + getTabState: function(aTab) { if (!aTab.ownerGlobal.__SSi) { throw Components.Exception("Default view is not tracked", Cr.NS_ERROR_INVALID_ARG); } @@ -2195,7 +2195,7 @@ var SessionStoreInternal = { this.restoreTab(aTab, tabState); }, - duplicateTab: function ssi_duplicateTab(aWindow, aTab, aDelta = 0, aRestoreImmediately = true) { + duplicateTab: function(aWindow, aTab, aDelta = 0, aRestoreImmediately = true) { if (!aTab.ownerGlobal.__SSi) { throw Components.Exception("Default view is not tracked", Cr.NS_ERROR_INVALID_ARG); } @@ -2250,7 +2250,7 @@ var SessionStoreInternal = { return newTab; }, - getClosedTabCount: function ssi_getClosedTabCount(aWindow) { + getClosedTabCount: function(aWindow) { if ("__SSi" in aWindow) { return this._windows[aWindow.__SSi]._closedTabs.length; } @@ -2262,7 +2262,7 @@ var SessionStoreInternal = { return DyingWindowCache.get(aWindow)._closedTabs.length; }, - getClosedTabData: function ssi_getClosedTabData(aWindow, aAsString = true) { + getClosedTabData: function(aWindow, aAsString = true) { if ("__SSi" in aWindow) { return aAsString ? JSON.stringify(this._windows[aWindow.__SSi]._closedTabs) : @@ -2277,7 +2277,7 @@ var SessionStoreInternal = { return aAsString ? JSON.stringify(data._closedTabs) : Cu.cloneInto(data._closedTabs, {}); }, - undoCloseTab: function ssi_undoCloseTab(aWindow, aIndex) { + undoCloseTab: function(aWindow, aIndex) { if (!aWindow.__SSi) { throw Components.Exception("Window is not tracked", Cr.NS_ERROR_INVALID_ARG); } @@ -2309,7 +2309,7 @@ var SessionStoreInternal = { return tab; }, - forgetClosedTab: function ssi_forgetClosedTab(aWindow, aIndex) { + forgetClosedTab: function(aWindow, aIndex) { if (!aWindow.__SSi) { throw Components.Exception("Window is not tracked", Cr.NS_ERROR_INVALID_ARG); } @@ -2326,15 +2326,15 @@ var SessionStoreInternal = { this.removeClosedTabData(closedTabs, aIndex); }, - getClosedWindowCount: function ssi_getClosedWindowCount() { + getClosedWindowCount: function() { return this._closedWindows.length; }, - getClosedWindowData: function ssi_getClosedWindowData(aAsString = true) { + getClosedWindowData: function(aAsString = true) { return aAsString ? JSON.stringify(this._closedWindows) : Cu.cloneInto(this._closedWindows, {}); }, - undoCloseWindow: function ssi_undoCloseWindow(aIndex) { + undoCloseWindow: function(aIndex) { if (!(aIndex in this._closedWindows)) { throw Components.Exception("Invalid index: not in the closed windows", Cr.NS_ERROR_INVALID_ARG); } @@ -2348,7 +2348,7 @@ var SessionStoreInternal = { return window; }, - forgetClosedWindow: function ssi_forgetClosedWindow(aIndex) { + forgetClosedWindow: function(aIndex) { // default to the most-recently closed window aIndex = aIndex || 0; if (!(aIndex in this._closedWindows)) { @@ -2361,7 +2361,7 @@ var SessionStoreInternal = { this._saveableClosedWindowData.delete(winData); }, - getWindowValue: function ssi_getWindowValue(aWindow, aKey) { + getWindowValue: function(aWindow, aKey) { if ("__SSi" in aWindow) { var data = this._windows[aWindow.__SSi].extData || {}; return data[aKey] || ""; @@ -2375,7 +2375,7 @@ var SessionStoreInternal = { throw Components.Exception("Window is not tracked", Cr.NS_ERROR_INVALID_ARG); }, - setWindowValue: function ssi_setWindowValue(aWindow, aKey, aStringValue) { + setWindowValue: function(aWindow, aKey, aStringValue) { if (typeof aStringValue != "string") { throw new TypeError("setWindowValue only accepts string values"); } @@ -2390,18 +2390,18 @@ var SessionStoreInternal = { this.saveStateDelayed(aWindow); }, - deleteWindowValue: function ssi_deleteWindowValue(aWindow, aKey) { + deleteWindowValue: function(aWindow, aKey) { if (aWindow.__SSi && this._windows[aWindow.__SSi].extData && this._windows[aWindow.__SSi].extData[aKey]) delete this._windows[aWindow.__SSi].extData[aKey]; this.saveStateDelayed(aWindow); }, - getTabValue: function ssi_getTabValue(aTab, aKey) { + getTabValue: function(aTab, aKey) { return (aTab.__SS_extdata || {})[aKey] || ""; }, - setTabValue: function ssi_setTabValue(aTab, aKey, aStringValue) { + setTabValue: function(aTab, aKey, aStringValue) { if (typeof aStringValue != "string") { throw new TypeError("setTabValue only accepts string values"); } @@ -2416,18 +2416,18 @@ var SessionStoreInternal = { this.saveStateDelayed(aTab.ownerGlobal); }, - deleteTabValue: function ssi_deleteTabValue(aTab, aKey) { + deleteTabValue: function(aTab, aKey) { if (aTab.__SS_extdata && aKey in aTab.__SS_extdata) { delete aTab.__SS_extdata[aKey]; this.saveStateDelayed(aTab.ownerGlobal); } }, - getGlobalValue: function ssi_getGlobalValue(aKey) { + getGlobalValue: function(aKey) { return this._globalState.get(aKey); }, - setGlobalValue: function ssi_setGlobalValue(aKey, aStringValue) { + setGlobalValue: function(aKey, aStringValue) { if (typeof aStringValue != "string") { throw new TypeError("setGlobalValue only accepts string values"); } @@ -2436,12 +2436,12 @@ var SessionStoreInternal = { this.saveStateDelayed(); }, - deleteGlobalValue: function ssi_deleteGlobalValue(aKey) { + deleteGlobalValue: function(aKey) { this._globalState.delete(aKey); this.saveStateDelayed(); }, - persistTabAttribute: function ssi_persistTabAttribute(aName) { + persistTabAttribute: function(aName) { if (TabAttributes.persist(aName)) { this.saveStateDelayed(); } @@ -2490,7 +2490,7 @@ var SessionStoreInternal = { * that window will be opened into that window. Otherwise new windows will * be opened. */ - restoreLastSession: function ssi_restoreLastSession() { + restoreLastSession: function() { // Use the public getter since it also checks PB mode if (!this.canRestoreLastSession) { throw Components.Exception("Last session can not be restored"); @@ -2771,7 +2771,7 @@ var SessionStoreInternal = { * canOverwriteTabs: all of the current tabs are home pages and we * can overwrite them */ - _prepWindowToRestoreInto: function ssi_prepWindowToRestoreInto(aWindow) { + _prepWindowToRestoreInto: function(aWindow) { if (!aWindow) return [false, false]; @@ -2818,7 +2818,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - _updateWindowFeatures: function ssi_updateWindowFeatures(aWindow) { + _updateWindowFeatures: function(aWindow) { var winData = this._windows[aWindow.__SSi]; WINDOW_ATTRIBUTES.forEach(function(aAttr) { @@ -2971,7 +2971,7 @@ var SessionStoreInternal = { * Window reference * @returns string */ - _getWindowState: function ssi_getWindowState(aWindow) { + _getWindowState: function(aWindow) { if (!this._isWindowLoaded(aWindow)) return this._statesToRestore[aWindow.__SS_restoreID]; @@ -2994,7 +2994,7 @@ var SessionStoreInternal = { * @returns a Map mapping the browser tabs from aWindow to the tab * entry that was put into the window data in this._windows. */ - _collectWindowData: function ssi_collectWindowData(aWindow) { + _collectWindowData: function(aWindow) { let tabMap = new Map(); if (!this._isWindowLoaded(aWindow)) @@ -3040,7 +3040,7 @@ var SessionStoreInternal = { * restoring in this session, that might open an * external link as well */ - restoreWindow: function ssi_restoreWindow(aWindow, winData, aOptions = {}) { + restoreWindow: function(aWindow, winData, aOptions = {}) { let overwriteTabs = aOptions && aOptions.overwriteTabs; let isFollowUp = aOptions && aOptions.isFollowUp; let firstWindow = aOptions && aOptions.firstWindow; @@ -3229,7 +3229,7 @@ var SessionStoreInternal = { * restoring in this session, that might open an * external link as well */ - restoreWindows: function ssi_restoreWindows(aWindow, aState, aOptions = {}) { + restoreWindows: function(aWindow, aState, aOptions = {}) { let isFollowUp = aOptions && aOptions.isFollowUp; if (isFollowUp) { @@ -3586,7 +3586,7 @@ var SessionStoreInternal = { * if there are no tabs to restore * if we have already reached the limit for number of tabs to restore */ - restoreNextTab: function ssi_restoreNextTab() { + restoreNextTab: function() { // If we call in here while quitting, we don't actually want to do anything if (RunState.isQuitting) return; @@ -3608,7 +3608,7 @@ var SessionStoreInternal = { * @param aWinData * Object containing session data for the window */ - restoreWindowFeatures: function ssi_restoreWindowFeatures(aWindow, aWinData) { + restoreWindowFeatures: function(aWindow, aWinData) { var hidden = (aWinData.hidden)?aWinData.hidden.split(","):[]; WINDOW_HIDEABLE_FEATURES.forEach(function(aItem) { aWindow[aItem].visible = hidden.indexOf(aItem) == -1; @@ -3655,7 +3655,7 @@ var SessionStoreInternal = { * @param aSidebar * Sidebar command */ - restoreDimensions: function ssi_restoreDimensions(aWindow, aWidth, aHeight, aLeft, aTop, aSizeMode, aSidebar) { + restoreDimensions: function(aWindow, aWidth, aHeight, aLeft, aTop, aSizeMode, aSidebar) { var win = aWindow; var _this = this; function win_(aName) { return _this._getWindowDimension(win, aName); } @@ -3816,7 +3816,7 @@ var SessionStoreInternal = { * @param state * The session state. */ - _updateSessionStartTime: function ssi_updateSessionStartTime(state) { + _updateSessionStartTime: function(state) { // Attempt to load the session start time from the session state if (state.session && state.session.startTime) { this._sessionStartTime = state.session.startTime; @@ -3829,7 +3829,7 @@ var SessionStoreInternal = { * @param aFunc * Callback each window is passed to */ - _forEachBrowserWindow: function ssi_forEachBrowserWindow(aFunc) { + _forEachBrowserWindow: function(aFunc) { var windowsEnum = Services.wm.getEnumerator("navigator:browser"); while (windowsEnum.hasMoreElements()) { @@ -3844,7 +3844,7 @@ var SessionStoreInternal = { * Returns most recent window * @returns Window reference */ - _getMostRecentBrowserWindow: function ssi_getMostRecentBrowserWindow() { + _getMostRecentBrowserWindow: function() { return RecentWindow.getMostRecentBrowserWindow({ allowPopups: true }); }, @@ -3853,7 +3853,7 @@ var SessionStoreInternal = { * destroyed yet, which would otherwise cause getBrowserState and * setBrowserState to treat them as open windows. */ - _handleClosedWindows: function ssi_handleClosedWindows() { + _handleClosedWindows: function() { var windowsEnum = Services.wm.getEnumerator("navigator:browser"); while (windowsEnum.hasMoreElements()) { @@ -3870,7 +3870,7 @@ var SessionStoreInternal = { * @param aState * Object containing session data */ - _openWindowWithState: function ssi_openWindowWithState(aState) { + _openWindowWithState: function(aState) { var argString = Cc["@mozilla.org/supports-string;1"]. createInstance(Ci.nsISupportsString); argString.data = ""; @@ -3904,7 +3904,7 @@ var SessionStoreInternal = { * Whether or not to resume session, if not recovering from a crash. * @returns bool */ - _doResumeSession: function ssi_doResumeSession() { + _doResumeSession: function() { return this._prefBranch.getIntPref("startup.page") == 3 || this._prefBranch.getBoolPref("sessionstore.resume_session_once"); }, @@ -3915,7 +3915,7 @@ var SessionStoreInternal = { * C.f.: nsBrowserContentHandler's defaultArgs implementation. * @returns bool */ - _isCmdLineEmpty: function ssi_isCmdLineEmpty(aWindow, aState) { + _isCmdLineEmpty: function(aWindow, aState) { var pinnedOnly = aState.windows && aState.windows.every(win => win.tabs.every(tab => tab.pinned)); @@ -3944,7 +3944,7 @@ var SessionStoreInternal = { * String sizemode | width | height | other window attribute * @returns string */ - _getWindowDimension: function ssi_getWindowDimension(aWindow, aAttribute) { + _getWindowDimension: function(aWindow, aAttribute) { if (aAttribute == "sizemode") { switch (aWindow.windowState) { case aWindow.STATE_FULLSCREEN: @@ -3981,7 +3981,7 @@ var SessionStoreInternal = { * @param aRecentCrashes is the number of consecutive crashes * @returns whether a restore page will be needed for the session state */ - _needsRestorePage: function ssi_needsRestorePage(aState, aRecentCrashes) { + _needsRestorePage: function(aState, aRecentCrashes) { const SIX_HOURS_IN_MS = 6 * 60 * 60 * 1000; // don't display the page when there's nothing to restore @@ -4034,7 +4034,7 @@ var SessionStoreInternal = { * The current tab state * @returns boolean */ - _shouldSaveTabState: function ssi_shouldSaveTabState(aTabState) { + _shouldSaveTabState: function(aTabState) { // If the tab has only a transient about: history entry, no other // session history, and no userTypedValue, then we don't actually want to // store this tab's data. @@ -4063,7 +4063,7 @@ var SessionStoreInternal = { * The state, presumably from nsISessionStartup.state * @returns [defaultState, state] */ - _prepDataForDeferredRestore: function ssi_prepDataForDeferredRestore(state) { + _prepDataForDeferredRestore: function(state) { // Make sure that we don't modify the global state as provided by // nsSessionStartup.state. state = Cu.cloneInto(state, {}); @@ -4174,7 +4174,7 @@ var SessionStoreInternal = { } }, - _sendRestoreCompletedNotifications: function ssi_sendRestoreCompletedNotifications() { + _sendRestoreCompletedNotifications: function() { // not all windows restored, yet if (this._restoreCount > 1) { this._restoreCount--; @@ -4216,7 +4216,7 @@ var SessionStoreInternal = { * Set the given window's state to 'not busy'. * @param aWindow the window */ - _setWindowStateReady: function ssi_setWindowStateReady(aWindow) { + _setWindowStateReady: function(aWindow) { let newCount = (this._windowBusyStates.get(aWindow) || 0) - 1; if (newCount < 0) { throw new Error("Invalid window busy state (less than zero)."); @@ -4233,7 +4233,7 @@ var SessionStoreInternal = { * Set the given window's state to 'busy'. * @param aWindow the window */ - _setWindowStateBusy: function ssi_setWindowStateBusy(aWindow) { + _setWindowStateBusy: function(aWindow) { let newCount = (this._windowBusyStates.get(aWindow) || 0) + 1; this._windowBusyStates.set(aWindow, newCount); @@ -4248,7 +4248,7 @@ var SessionStoreInternal = { * @param aWindow the window * @param aType the type of event, SSWindowState will be prepended to this string */ - _sendWindowStateEvent: function ssi_sendWindowStateEvent(aWindow, aType) { + _sendWindowStateEvent: function(aWindow, aType) { let event = aWindow.document.createEvent("Events"); event.initEvent("SSWindowState" + aType, true, false); aWindow.dispatchEvent(event); @@ -4287,7 +4287,7 @@ var SessionStoreInternal = { * @returns whether this window's data is still cached in _statesToRestore * because it's not fully loaded yet */ - _isWindowLoaded: function ssi_isWindowLoaded(aWindow) { + _isWindowLoaded: function(aWindow) { return !aWindow.__SS_restoreID; }, @@ -4299,7 +4299,7 @@ var SessionStoreInternal = { * * @returns aString that has been updated with the new title */ - _replaceLoadingTitle : function ssi_replaceLoadingTitle(aString, aTabbrowser, aTab) { + _replaceLoadingTitle : function(aString, aTabbrowser, aTab) { if (aString == aTabbrowser.mStringBundle.getString("tabs.connecting")) { aTabbrowser.setTabTitle(aTab); [aString, aTab.label] = [aTab.label, aString]; @@ -4312,7 +4312,7 @@ var SessionStoreInternal = { * where we don't have any non-popup windows on Windows and Linux. Then we must * resize such that we have at least one non-popup window. */ - _capClosedWindows : function ssi_capClosedWindows() { + _capClosedWindows : function() { if (this._closedWindows.length <= this._max_windows_undo) return; let spliceTo = this._max_windows_undo; @@ -4337,7 +4337,7 @@ var SessionStoreInternal = { * windows that have been closed before are not part of a series of closing * windows. */ - _clearRestoringWindows: function ssi_clearRestoringWindows() { + _clearRestoringWindows: function() { for (let i = 0; i < this._closedWindows.length; i++) { delete this._closedWindows[i]._shouldRestore; } @@ -4346,7 +4346,7 @@ var SessionStoreInternal = { /** * Reset state to prepare for a new session state to be restored. */ - _resetRestoringState: function ssi_initRestoringState() { + _resetRestoringState: function() { TabRestoreQueue.reset(); this._tabsRestoringCount = 0; }, diff --git a/application/basilisk/components/sessionstore/nsSessionStartup.js b/application/basilisk/components/sessionstore/nsSessionStartup.js index 9cda1552e..9e77b12da 100644 --- a/application/basilisk/components/sessionstore/nsSessionStartup.js +++ b/application/basilisk/components/sessionstore/nsSessionStartup.js @@ -95,7 +95,7 @@ SessionStartup.prototype = { /** * Initialize the component */ - init: function sss_init() { + init: function() { Services.obs.notifyObservers(null, "sessionstore-init-started", null); StartupPerformance.init(); @@ -113,7 +113,7 @@ SessionStartup.prototype = { }, // Wrap a string as a nsISupports - _createSupportsString: function ssfi_createSupportsString(aData) { + _createSupportsString: function(aData) { let string = Cc["@mozilla.org/supports-string;1"] .createInstance(Ci.nsISupportsString); string.data = aData; @@ -232,7 +232,7 @@ SessionStartup.prototype = { /** * Handle notifications */ - observe: function sss_observe(aSubject, aTopic, aData) { + observe: function(aSubject, aTopic, aData) { switch (aTopic) { case "app-startup": Services.obs.addObserver(this, "final-ui-startup", true); @@ -281,7 +281,7 @@ SessionStartup.prototype = { * called after initialization has completed. * @returns bool */ - doRestore: function sss_doRestore() { + doRestore: function() { return this._willRestore(); }, diff --git a/application/basilisk/components/shell/nsSetDefaultBrowser.js b/application/basilisk/components/shell/nsSetDefaultBrowser.js index c7a78c538..853d8d860 100644 --- a/application/basilisk/components/shell/nsSetDefaultBrowser.js +++ b/application/basilisk/components/shell/nsSetDefaultBrowser.js @@ -15,7 +15,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); function nsSetDefaultBrowser() {} nsSetDefaultBrowser.prototype = { - handle: function nsSetDefault_handle(aCmdline) { + handle: function(aCmdline) { if (aCmdline.handleFlag("setDefaultBrowser", false)) { ShellService.setDefaultBrowser(true, true); } diff --git a/application/basilisk/components/sync/addDevice.js b/application/basilisk/components/sync/addDevice.js index 0390d4397..b4ed9596c 100644 --- a/application/basilisk/components/sync/addDevice.js +++ b/application/basilisk/components/sync/addDevice.js @@ -34,7 +34,7 @@ var gSyncAddDevice = { Weave.Service.scheduler.scheduleNextSync(0); }, - onPageShow: function onPageShow() { + onPageShow: function() { this.wizard.getButton("back").hidden = true; switch (this.wizard.pageIndex) { @@ -60,7 +60,7 @@ var gSyncAddDevice = { } }, - onWizardAdvance: function onWizardAdvance() { + onWizardAdvance: function() { switch (this.wizard.pageIndex) { case ADD_DEVICE_PAGE: this.startTransfer(); @@ -72,21 +72,21 @@ var gSyncAddDevice = { return true; }, - startTransfer: function startTransfer() { + startTransfer: function() { this.errorRow.hidden = true; // When onAbort is called, Weave may already be gone. const JPAKE_ERROR_USERABORT = Weave.JPAKE_ERROR_USERABORT; let self = this; let jpakeclient = this._jpakeclient = new Weave.JPAKEClient({ - onPaired: function onPaired() { + onPaired: function() { let credentials = {account: Weave.Service.identity.account, password: Weave.Service.identity.basicPassword, synckey: Weave.Service.identity.syncKey, serverURL: Weave.Service.serverURL}; jpakeclient.sendAndComplete(credentials); }, - onComplete: function onComplete() { + onComplete: function() { delete self._jpakeclient; self.wizard.pageIndex = DEVICE_CONNECTED_PAGE; @@ -94,7 +94,7 @@ var gSyncAddDevice = { // device with which we just paired. Weave.Service.scheduler.scheduleNextSync(Weave.Service.scheduler.activeInterval); }, - onAbort: function onAbort(error) { + onAbort: function(error) { delete self._jpakeclient; // Aborted by user, ignore. @@ -118,7 +118,7 @@ var gSyncAddDevice = { jpakeclient.pairWithPIN(pin, expectDelay); }, - onWizardBack: function onWizardBack() { + onWizardBack: function() { if (this.wizard.pageIndex != SYNC_KEY_PAGE) return true; @@ -126,7 +126,7 @@ var gSyncAddDevice = { return false; }, - onWizardCancel: function onWizardCancel() { + onWizardCancel: function() { if (this._jpakeclient) { this._jpakeclient.abort(); delete this._jpakeclient; @@ -134,7 +134,7 @@ var gSyncAddDevice = { return true; }, - onTextBoxInput: function onTextBoxInput(textbox) { + onTextBoxInput: function(textbox) { if (textbox && textbox.value.length == PIN_PART_LENGTH) this.nextFocusEl[textbox.id].focus(); @@ -143,7 +143,7 @@ var gSyncAddDevice = { && this.pin3.value.length == PIN_PART_LENGTH); }, - goToSyncKeyPage: function goToSyncKeyPage() { + goToSyncKeyPage: function() { this.wizard.pageIndex = SYNC_KEY_PAGE; } diff --git a/application/basilisk/components/sync/genericChange.js b/application/basilisk/components/sync/genericChange.js index df6639178..a0af2d94d 100644 --- a/application/basilisk/components/sync/genericChange.js +++ b/application/basilisk/components/sync/genericChange.js @@ -29,7 +29,7 @@ var Change = { return this._dialogType == "UpdatePassphrase"; }, - onLoad: function Change_onLoad() { + onLoad: function() { /* Load labels */ let introText = document.getElementById("introText"); let introText2 = document.getElementById("introText2"); @@ -112,16 +112,16 @@ var Change = { .setAttribute("label", document.title); }, - _clearStatus: function _clearStatus() { + _clearStatus: function() { this._status.value = ""; this._statusIcon.removeAttribute("status"); }, - _updateStatus: function Change__updateStatus(str, state) { + _updateStatus: function(str, state) { this._updateStatusWithString(this._str(str), state); }, - _updateStatusWithString: function Change__updateStatusWithString(string, state) { + _updateStatusWithString: function(string, state) { this._statusRow.hidden = false; this._status.value = string; this._statusIcon.setAttribute("status", state); @@ -154,7 +154,7 @@ var Change = { this._dialog.getButton("finish").disabled = false; }, - doChangePassphrase: function Change_doChangePassphrase() { + doChangePassphrase: function() { let pp = Weave.Utils.normalizePassphrase(this._passphraseBox.value); if (this._updatingPassphrase) { Weave.Service.identity.syncKey = pp; @@ -179,7 +179,7 @@ var Change = { return false; }, - doChangePassword: function Change_doChangePassword() { + doChangePassword: function() { if (this._currentPasswordInvalid) { Weave.Service.identity.basicPassword = this._firstBox.value; if (Weave.Service.login()) { @@ -228,7 +228,7 @@ var Change = { this._dialog.getButton("finish").disabled = !valid; }, - _str: function Change__string(str) { + _str: function(str) { return this._stringBundle.GetStringFromName(str); } }; diff --git a/application/basilisk/components/sync/quota.js b/application/basilisk/components/sync/quota.js index b416a44cc..2f0b19566 100644 --- a/application/basilisk/components/sync/quota.js +++ b/application/basilisk/components/sync/quota.js @@ -12,7 +12,7 @@ Cu.import("resource://gre/modules/DownloadUtils.jsm"); var gSyncQuota = { - init: function init() { + init: function() { this.bundle = document.getElementById("quotaStrings"); let caption = document.getElementById("treeCaption"); caption.firstChild.nodeValue = this.bundle.getString("quota.treeCaption.label"); @@ -24,7 +24,7 @@ var gSyncQuota = { this.loadData(); }, - loadData: function loadData() { + loadData: function() { this._usage_req = Weave.Service.getStorageInfo(Weave.INFO_COLLECTION_USAGE, function (error, usage) { delete gSyncQuota._usage_req; @@ -57,7 +57,7 @@ var gSyncQuota = { }); }, - onCancel: function onCancel() { + onCancel: function() { if (this._usage_req) { this._usage_req.abort(); } @@ -67,7 +67,7 @@ var gSyncQuota = { return true; }, - onAccept: function onAccept() { + onAccept: function() { let engines = gUsageTreeView.getEnginesToDisable(); for each (let engine in engines) { Weave.Service.engineManager.get(engine).enabled = false; @@ -80,7 +80,7 @@ var gSyncQuota = { return this.onCancel(); }, - convertKB: function convertKB(value) { + convertKB: function(value) { return DownloadUtils.convertByteUnits(value * 1024); } @@ -98,7 +98,7 @@ var gUsageTreeView = { _collections: [], _byname: {}, - init: function init() { + init: function() { let retrievingLabel = gSyncQuota.bundle.getString("quota.retrieving.label"); for each (let engine in Weave.Service.engineManager.getEnabled()) { if (this._ignored[engine.name]) @@ -122,7 +122,7 @@ var gUsageTreeView = { } }, - _collectionTitle: function _collectionTitle(engine) { + _collectionTitle: function(engine) { try { return gSyncQuota.bundle.getString( "collection." + engine.prefName + ".label"); @@ -134,7 +134,7 @@ var gUsageTreeView = { /* * Process the quota information as returned by info/collection_usage. */ - displayUsageData: function displayUsageData(data) { + displayUsageData: function(data) { for each (let coll in this._collections) { coll.size = 0; // If we couldn't retrieve any data, just blank out the label. @@ -157,7 +157,7 @@ var gUsageTreeView = { /* * Handle click events on the tree. */ - onTreeClick: function onTreeClick(event) { + onTreeClick: function(event) { if (event.button == 2) return; @@ -169,7 +169,7 @@ var gUsageTreeView = { /* * Toggle enabled state of an engine. */ - toggle: function toggle(row) { + toggle: function(row) { // Update the tree let collection = this._collections[row]; collection.enabled = !collection.enabled; @@ -180,7 +180,7 @@ var gUsageTreeView = { * Return a list of engines (or rather their pref names) that should be * disabled. */ - getEnginesToDisable: function getEnginesToDisable() { + getEnginesToDisable: function() { // Tycho: return [coll.name for each (coll in this._collections) if (!coll.enabled)]; let engines = []; for each (let coll in this._collections) { @@ -228,7 +228,7 @@ var gUsageTreeView = { } }, - setTree: function setTree(tree) { + setTree: function(tree) { this.treeBox = tree; }, diff --git a/application/basilisk/components/sync/setup.js b/application/basilisk/components/sync/setup.js index e8d67a5f6..1a8fda811 100644 --- a/application/basilisk/components/sync/setup.js +++ b/application/basilisk/components/sync/setup.js @@ -138,7 +138,7 @@ var gSyncSetup = { } }, - resetPassphrase: function resetPassphrase() { + resetPassphrase: function() { // Apply the existing form fields so that // Weave.Service.changePassphrase() has the necessary credentials. Weave.Service.identity.account = document.getElementById("existingAccountName").value; @@ -281,7 +281,7 @@ var gSyncSetup = { return true; }, - onPINInput: function onPINInput(textbox) { + onPINInput: function(textbox) { if (textbox && textbox.value.length == PIN_PART_LENGTH) { this.nextFocusEl[textbox.id].focus(); } @@ -595,21 +595,21 @@ var gSyncSetup = { return false; }, - startPairing: function startPairing() { + startPairing: function() { this.pairDeviceErrorRow.hidden = true; // When onAbort is called, Weave may already be gone. const JPAKE_ERROR_USERABORT = Weave.JPAKE_ERROR_USERABORT; let self = this; let jpakeclient = this._jpakeclient = new Weave.JPAKEClient({ - onPaired: function onPaired() { + onPaired: function() { self.wizard.pageIndex = INTRO_PAGE; }, - onComplete: function onComplete() { + onComplete: function() { // This method will never be called since SendCredentialsController // will take over after the wizard completes. }, - onAbort: function onAbort(error) { + onAbort: function(error) { delete self._jpakeclient; // Aborted by user, ignore. The window is almost certainly going to close @@ -636,7 +636,7 @@ var gSyncSetup = { jpakeclient.pairWithPIN(pin, expectDelay); }, - completePairing: function completePairing() { + completePairing: function() { if (!this._jpakeclient) { // The channel was aborted while we were setting up the account // locally. XXX TODO should we do anything here, e.g. tell @@ -660,15 +660,15 @@ var gSyncSetup = { let self = this; this._jpakeclient = new Weave.JPAKEClient({ - displayPIN: function displayPIN(pin) { + displayPIN: function(pin) { document.getElementById("easySetupPIN1").value = pin.slice(0, 4); document.getElementById("easySetupPIN2").value = pin.slice(4, 8); document.getElementById("easySetupPIN3").value = pin.slice(8); }, - onPairingStart: function onPairingStart() {}, + onPairingStart: function() {}, - onComplete: function onComplete(credentials) { + onComplete: function(credentials) { Weave.Service.identity.account = credentials.account; Weave.Service.identity.basicPassword = credentials.password; Weave.Service.identity.syncKey = credentials.synckey; @@ -676,7 +676,7 @@ var gSyncSetup = { gSyncSetup.wizardFinish(); }, - onAbort: function onAbort(error) { + onAbort: function(error) { delete self._jpakeclient; // Ignore if wizard is aborted. @@ -1017,7 +1017,7 @@ var gSyncSetup = { this._setFeedback(element, success, str); }, - loadCaptcha: function loadCaptcha() { + loadCaptcha: function() { let captchaURI = Weave.Service.miscAPI + "captcha_html"; // First check for NoScript and whitelist the right sites. this._handleNoScript(true); diff --git a/application/basilisk/components/sync/utils.js b/application/basilisk/components/sync/utils.js index d41ecf18a..93f371352 100644 --- a/application/basilisk/components/sync/utils.js +++ b/application/basilisk/components/sync/utils.js @@ -30,13 +30,13 @@ var gSyncUtils = { openUILinkIn(url, "tab"); }, - changeName: function changeName(input) { + changeName: function(input) { // Make sure to update to a modified name, e.g., empty-string -> default Weave.Service.clientsEngine.localName = input.value; input.value = Weave.Service.clientsEngine.localName; }, - openChange: function openChange(type, duringSetup) { + openChange: function(type, duringSetup) { // Just re-show the dialog if it's already open let openedDialog = Services.wm.getMostRecentWindow("Sync:" + type); if (openedDialog != null) { diff --git a/application/basilisk/modules/NetworkPrioritizer.jsm b/application/basilisk/modules/NetworkPrioritizer.jsm index 770a30e09..b812b150e 100644 --- a/application/basilisk/modules/NetworkPrioritizer.jsm +++ b/application/basilisk/modules/NetworkPrioritizer.jsm @@ -70,7 +70,7 @@ function _handleEvent(aEvent) { // Methods that impact a browser. Put into single object for organization. var BrowserHelper = { - onOpen: function NP_BH_onOpen(aBrowser) { + onOpen: function(aBrowser) { _priorityBackup.set(aBrowser.permanentKey, Ci.nsISupportsPriority.PRIORITY_NORMAL); // If the tab is in the focused window, leave priority as it is @@ -78,7 +78,7 @@ var BrowserHelper = { this.decreasePriority(aBrowser); }, - onSelect: function NP_BH_onSelect(aBrowser) { + onSelect: function(aBrowser) { let windowEntry = WindowHelper.getEntry(aBrowser.ownerGlobal); if (windowEntry.lastSelectedBrowser) this.decreasePriority(windowEntry.lastSelectedBrowser); @@ -91,13 +91,13 @@ var BrowserHelper = { aBrowser.setPriority(_priorityBackup.get(aBrowser.permanentKey)); }, - increasePriority: function NP_BH_increasePriority(aBrowser) { + increasePriority: function(aBrowser) { aBrowser.adjustPriority(PRIORITY_DELTA); _priorityBackup.set(aBrowser.permanentKey, _priorityBackup.get(aBrowser.permanentKey) + PRIORITY_DELTA); }, - decreasePriority: function NP_BH_decreasePriority(aBrowser) { + decreasePriority: function(aBrowser) { aBrowser.adjustPriority(PRIORITY_DELTA * -1); _priorityBackup.set(aBrowser.permanentKey, _priorityBackup.get(aBrowser.permanentKey) - PRIORITY_DELTA); @@ -107,7 +107,7 @@ var BrowserHelper = { // Methods that impact a window. Put into single object for organization. var WindowHelper = { - addWindow: function NP_WH_addWindow(aWindow) { + addWindow: function(aWindow) { // Build internal data object _windows.push({ window: aWindow, lastSelectedBrowser: null }); @@ -130,7 +130,7 @@ var WindowHelper = { BrowserHelper.onSelect(aWindow.gBrowser.selectedBrowser); }, - removeWindow: function NP_WH_removeWindow(aWindow) { + removeWindow: function(aWindow) { if (aWindow == _lastFocusedWindow) _lastFocusedWindow = null; @@ -146,7 +146,7 @@ var WindowHelper = { }); }, - onActivate: function NP_WH_onActivate(aWindow, aHasFocus) { + onActivate: function(aWindow, aHasFocus) { // If this window was the last focused window, we don't need to do anything if (aWindow == _lastFocusedWindow) return; @@ -158,7 +158,7 @@ var WindowHelper = { this.increasePriority(aWindow); }, - handleFocusedWindow: function NP_WH_handleFocusedWindow(aWindow) { + handleFocusedWindow: function(aWindow) { // If we have a last focused window, we need to deprioritize it first if (_lastFocusedWindow) this.decreasePriority(_lastFocusedWindow); @@ -168,23 +168,23 @@ var WindowHelper = { }, // Auxiliary methods - increasePriority: function NP_WH_increasePriority(aWindow) { + increasePriority: function(aWindow) { aWindow.gBrowser.browsers.forEach(function(aBrowser) { BrowserHelper.increasePriority(aBrowser); }); }, - decreasePriority: function NP_WH_decreasePriority(aWindow) { + decreasePriority: function(aWindow) { aWindow.gBrowser.browsers.forEach(function(aBrowser) { BrowserHelper.decreasePriority(aBrowser); }); }, - getEntry: function NP_WH_getEntry(aWindow) { + getEntry: function(aWindow) { return _windows[this.getEntryIndex(aWindow)]; }, - getEntryIndex: function NP_WH_getEntryAtIndex(aWindow) { + getEntryIndex: function(aWindow) { // Assumes that every object has a unique window & it's in the array for (let i = 0; i < _windows.length; i++) if (_windows[i].window == aWindow) diff --git a/application/basilisk/modules/RecentWindow.jsm b/application/basilisk/modules/RecentWindow.jsm index fac9dcea4..d7f51e6c8 100644 --- a/application/basilisk/modules/RecentWindow.jsm +++ b/application/basilisk/modules/RecentWindow.jsm @@ -22,7 +22,7 @@ this.RecentWindow = { * Omit the property to search in both groups. * * allowPopups: true if popup windows are permissable. */ - getMostRecentBrowserWindow: function RW_getMostRecentBrowserWindow(aOptions) { + getMostRecentBrowserWindow: function(aOptions) { let checkPrivacy = typeof aOptions == "object" && "private" in aOptions; diff --git a/application/basilisk/modules/WindowsJumpLists.jsm b/application/basilisk/modules/WindowsJumpLists.jsm index 4df87b47a..94e612d4c 100644 --- a/application/basilisk/modules/WindowsJumpLists.jsm +++ b/application/basilisk/modules/WindowsJumpLists.jsm @@ -146,7 +146,7 @@ this.WinTaskbarJumpList = * Startup, shutdown, and update */ - startup: function WTBJL_startup() { + startup: function() { // exit if this isn't win7 or higher. if (!this._initTaskbar()) return; @@ -173,7 +173,7 @@ this.WinTaskbarJumpList = this._updateTimer(); }, - update: function WTBJL_update() { + update: function() { // are we disabled via prefs? don't do anything! if (!this._enabled) return; @@ -182,7 +182,7 @@ this.WinTaskbarJumpList = this._buildList(); }, - _shutdown: function WTBJL__shutdown() { + _shutdown: function() { this._shuttingDown = true; // Correctly handle a clear history on shutdown. If there are no @@ -195,7 +195,7 @@ this.WinTaskbarJumpList = this._free(); }, - _shortcutMaintenance: function WTBJL__maintenace() { + _shortcutMaintenance: function() { _winShellService.shortcutMaintenance(); }, @@ -210,11 +210,11 @@ this.WinTaskbarJumpList = */ _pendingStatements: {}, - _hasPendingStatements: function WTBJL__hasPendingStatements() { + _hasPendingStatements: function() { return Object.keys(this._pendingStatements).length > 0; }, - _buildList: function WTBJL__buildList() { + _buildList: function() { if (this._hasPendingStatements()) { // We were requested to update the list while another update was in // progress, this could happen at shutdown, idle or privatebrowsing. @@ -253,7 +253,7 @@ this.WinTaskbarJumpList = * Taskbar api wrappers */ - _startBuild: function WTBJL__startBuild() { + _startBuild: function() { var removedItems = Cc["@mozilla.org/array;1"]. createInstance(Ci.nsIMutableArray); this._builder.abortListBuild(); @@ -265,13 +265,13 @@ this.WinTaskbarJumpList = return false; }, - _commitBuild: function WTBJL__commitBuild() { + _commitBuild: function() { if (!this._hasPendingStatements() && !this._builder.commitListBuild()) { this._builder.abortListBuild(); } }, - _buildTasks: function WTBJL__buildTasks() { + _buildTasks: function() { var items = Cc["@mozilla.org/array;1"]. createInstance(Ci.nsIMutableArray); this._tasks.forEach(function (task) { @@ -286,12 +286,12 @@ this.WinTaskbarJumpList = this._builder.addListToBuild(this._builder.JUMPLIST_CATEGORY_TASKS, items); }, - _buildCustom: function WTBJL__buildCustom(title, items) { + _buildCustom: function(title, items) { if (items.length > 0) this._builder.addListToBuild(this._builder.JUMPLIST_CATEGORY_CUSTOMLIST, items, title); }, - _buildFrequent: function WTBJL__buildFrequent() { + _buildFrequent: function() { // If history is empty, just bail out. if (!PlacesUtils.history.hasHistoryEntries) { return; @@ -331,7 +331,7 @@ this.WinTaskbarJumpList = ); }, - _buildRecent: function WTBJL__buildRecent() { + _buildRecent: function() { // If history is empty, just bail out. if (!PlacesUtils.history.hasHistoryEntries) { return; @@ -376,7 +376,7 @@ this.WinTaskbarJumpList = ); }, - _deleteActiveJumpList: function WTBJL__deleteAJL() { + _deleteActiveJumpList: function () { this._builder.deleteActiveList(); }, @@ -384,7 +384,7 @@ this.WinTaskbarJumpList = * Jump list item creation helpers */ - _getHandlerAppItem: function WTBJL__getHandlerAppItem(name, description, + _getHandlerAppItem: function(name, description, args, iconIndex, faviconPageUri) { var file = Services.dirsvc.get("XREExeF", Ci.nsILocalFile); @@ -406,7 +406,7 @@ this.WinTaskbarJumpList = return item; }, - _getSeparatorItem: function WTBJL__getSeparatorItem() { + _getSeparatorItem: function() { var item = Cc["@mozilla.org/windows-jumplistseparator;1"]. createInstance(Ci.nsIJumpListSeparator); return item; @@ -446,7 +446,7 @@ this.WinTaskbarJumpList = }); }, - _clearHistory: function WTBJL__clearHistory(items) { + _clearHistory: function(items) { if (!items) return; var URIsToRemove = []; @@ -469,7 +469,7 @@ this.WinTaskbarJumpList = * Prefs utilities */ - _refreshPrefs: function WTBJL__refreshPrefs() { + _refreshPrefs: function() { this._enabled = _prefs.getBoolPref(PREF_TASKBAR_ENABLED); this._showFrequent = _prefs.getBoolPref(PREF_TASKBAR_FREQUENT); this._showRecent = _prefs.getBoolPref(PREF_TASKBAR_RECENT); @@ -481,7 +481,7 @@ this.WinTaskbarJumpList = * Init and shutdown utilities */ - _initTaskbar: function WTBJL__initTaskbar() { + _initTaskbar: function() { this._builder = _taskbarService.createJumpListBuilder(); if (!this._builder || !this._builder.available) return false; @@ -489,7 +489,7 @@ this.WinTaskbarJumpList = return true; }, - _initObs: function WTBJL__initObs() { + _initObs: function() { // If the browser is closed while in private browsing mode, the "exit" // notification is fired on quit-application-granted. // History cleanup can happen at profile-change-teardown. @@ -498,13 +498,13 @@ this.WinTaskbarJumpList = _prefs.addObserver("", this, false); }, - _freeObs: function WTBJL__freeObs() { + _freeObs: function() { Services.obs.removeObserver(this, "profile-before-change"); Services.obs.removeObserver(this, "browser:purge-session-history"); _prefs.removeObserver("", this); }, - _updateTimer: function WTBJL__updateTimer() { + _updateTimer: function() { if (this._enabled && !this._shuttingDown && !this._timer) { this._timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer); this._timer.initWithCallback(this, @@ -518,7 +518,7 @@ this.WinTaskbarJumpList = }, _hasIdleObserver: false, - _updateIdleObserver: function WTBJL__updateIdleObserver() { + _updateIdleObserver: function() { if (this._enabled && !this._shuttingDown && !this._hasIdleObserver) { _idle.addIdleObserver(this, IDLE_TIMEOUT_SECONDS); this._hasIdleObserver = true; @@ -529,7 +529,7 @@ this.WinTaskbarJumpList = } }, - _free: function WTBJL__free() { + _free: function() { this._freeObs(); this._updateTimer(); this._updateIdleObserver(); @@ -540,13 +540,13 @@ this.WinTaskbarJumpList = * Notification handlers */ - notify: function WTBJL_notify(aTimer) { + notify: function(aTimer) { // Add idle observer on the first notification so it doesn't hit startup. this._updateIdleObserver(); this.update(); }, - observe: function WTBJL_observe(aSubject, aTopic, aData) { + observe: function(aSubject, aTopic, aData) { switch (aTopic) { case "nsPref:changed": if (this._enabled == true && !_prefs.getBoolPref(PREF_TASKBAR_ENABLED)) diff --git a/application/palemoon/base/content/browser-fullZoom.js b/application/palemoon/base/content/browser-fullZoom.js index 890cd8440..595e9b8ac 100644 --- a/application/palemoon/base/content/browser-fullZoom.js +++ b/application/palemoon/base/content/browser-fullZoom.js @@ -38,7 +38,7 @@ var FullZoom = { // Initialization & Destruction - init: function FullZoom_init() { + init: function () { gBrowser.addEventListener("ZoomChangeUsingMouseWheel", this); // Register ourselves with the service so we know when our pref changes. @@ -66,7 +66,7 @@ var FullZoom = { this._initialLocations = null; }, - destroy: function FullZoom_destroy() { + destroy: function () { gPrefService.removeObserver("browser.zoom.", this); this._cps2.removeObserverForName(this.name, this); gBrowser.removeEventListener("ZoomChangeUsingMouseWheel", this); @@ -77,7 +77,7 @@ var FullZoom = { // nsIDOMEventListener - handleEvent: function FullZoom_handleEvent(event) { + handleEvent: function (event) { switch (event.type) { case "ZoomChangeUsingMouseWheel": let browser = this._getTargetedBrowser(event); @@ -108,11 +108,11 @@ var FullZoom = { // nsIContentPrefObserver - onContentPrefSet: function FullZoom_onContentPrefSet(aGroup, aName, aValue, aIsPrivate) { + onContentPrefSet: function (aGroup, aName, aValue, aIsPrivate) { this._onContentPrefChanged(aGroup, aValue, aIsPrivate); }, - onContentPrefRemoved: function FullZoom_onContentPrefRemoved(aGroup, aName, aIsPrivate) { + onContentPrefRemoved: function (aGroup, aName, aIsPrivate) { this._onContentPrefChanged(aGroup, undefined, aIsPrivate); }, @@ -124,7 +124,7 @@ var FullZoom = { * @param aValue The new value of the changed preference. Pass undefined to * indicate the preference's removal. */ - _onContentPrefChanged: function FullZoom__onContentPrefChanged(aGroup, aValue, aIsPrivate) { + _onContentPrefChanged: function (aGroup, aValue, aIsPrivate) { if (this._isNextContentPrefChangeInternal) { // Ignore changes that FullZoom itself makes. This works because the // content pref service calls callbacks before notifying observers, and it @@ -175,7 +175,7 @@ var FullZoom = { * @param aBrowser * (optional) browser object displaying the document */ - onLocationChange: function FullZoom_onLocationChange(aURI, aIsTabSwitch, aBrowser) { + onLocationChange: function (aURI, aIsTabSwitch, aBrowser) { let browser = aBrowser || gBrowser.selectedBrowser; // If we haven't been initialized yet but receive an onLocationChange @@ -237,7 +237,7 @@ var FullZoom = { // update state of zoom type menu item - updateMenu: function FullZoom_updateMenu() { + updateMenu: function () { var menuItem = document.getElementById("toggle_zoom"); menuItem.setAttribute("checked", !ZoomManager.useFullZoom); @@ -248,7 +248,7 @@ var FullZoom = { /** * Reduces the zoom level of the page in the current browser. */ - reduce: function FullZoom_reduce() { + reduce: function () { ZoomManager.reduce(); let browser = gBrowser.selectedBrowser; this._ignorePendingZoomAccesses(browser); @@ -258,7 +258,7 @@ var FullZoom = { /** * Enlarges the zoom level of the page in the current browser. */ - enlarge: function FullZoom_enlarge() { + enlarge: function () { ZoomManager.enlarge(); let browser = gBrowser.selectedBrowser; this._ignorePendingZoomAccesses(browser); @@ -281,7 +281,7 @@ var FullZoom = { * * @return A promise which resolves when the zoom reset has been applied. */ - reset: function FullZoom_reset(browser = gBrowser.selectedBrowser) { + reset: function (browser = gBrowser.selectedBrowser) { let token = this._getBrowserToken(browser); let result = this._getGlobalValue(browser).then(value => { if (token.isCurrent) { @@ -317,7 +317,7 @@ var FullZoom = { * @param aBrowser The zoom is set in this browser. Required. * @param aCallback If given, it's asynchronously called when complete. */ - _applyPrefToZoom: function FullZoom__applyPrefToZoom(aValue, aBrowser, aCallback) { + _applyPrefToZoom: function (aValue, aBrowser, aCallback) { if (!this.siteSpecific || gInPrintPreviewMode) { this._executeSoon(aCallback); return; @@ -354,7 +354,7 @@ var FullZoom = { * * @param browser The zoom of this browser will be saved. Required. */ - _applyZoomToPref: function FullZoom__applyZoomToPref(browser) { + _applyZoomToPref: function (browser) { Services.obs.notifyObservers(browser, "browser-fullZoom:zoomChange", ""); if (!this.siteSpecific || gInPrintPreviewMode || @@ -375,7 +375,7 @@ var FullZoom = { * * @param browser The zoom of this browser will be removed. Required. */ - _removePref: function FullZoom__removePref(browser) { + _removePref: function (browser) { Services.obs.notifyObservers(browser, "browser-fullZoom:zoomReset", ""); if (browser.isSyntheticDocument) return; @@ -401,7 +401,7 @@ var FullZoom = { * @param browser The token of this browser will be returned. * @return An object with an "isCurrent" getter. */ - _getBrowserToken: function FullZoom__getBrowserToken(browser) { + _getBrowserToken: function (browser) { let map = this._browserTokenMap; if (!map.has(browser)) map.set(browser, 0); @@ -423,7 +423,7 @@ var FullZoom = { * @param event The ZoomChangeUsingMouseWheel event. * @return The associated browser element, if one exists, otherwise null. */ - _getTargetedBrowser: function FullZoom__getTargetedBrowser(event) { + _getTargetedBrowser: function (event) { let target = event.originalTarget; // With remote content browsers, the event's target is the browser @@ -449,12 +449,12 @@ var FullZoom = { * * @param browser Pending accesses in this browser will be ignored. */ - _ignorePendingZoomAccesses: function FullZoom__ignorePendingZoomAccesses(browser) { + _ignorePendingZoomAccesses: function (browser) { let map = this._browserTokenMap; map.set(browser, (map.get(browser) || 0) + 1); }, - _ensureValid: function FullZoom__ensureValid(aValue) { + _ensureValid: function (aValue) { // Note that undefined is a valid value for aValue that indicates a known- // not-to-exist value. if (isNaN(aValue)) @@ -476,7 +476,7 @@ var FullZoom = { * @returns Promise * Resolves to the preference value when done. */ - _getGlobalValue: function FullZoom__getGlobalValue(browser) { + _getGlobalValue: function (browser) { // * !("_globalValue" in this) => global value not yet cached. // * this._globalValue === undefined => global value known not to exist. // * Otherwise, this._globalValue is a number, the global value. @@ -502,7 +502,7 @@ var FullZoom = { * @param Browser The Browser whose load context will be returned. * @return The nsILoadContext of the given Browser. */ - _loadContextFromBrowser: function FullZoom__loadContextFromBrowser(browser) { + _loadContextFromBrowser: function (browser) { return browser.loadContext; }, @@ -512,13 +512,13 @@ var FullZoom = { * The notification is always asynchronous so that observers are guaranteed a * consistent behavior. */ - _notifyOnLocationChange: function FullZoom__notifyOnLocationChange(browser) { + _notifyOnLocationChange: function (browser) { this._executeSoon(function () { Services.obs.notifyObservers(browser, "browser-fullZoom:location-change", ""); }); }, - _executeSoon: function FullZoom__executeSoon(callback) { + _executeSoon: function (callback) { if (!callback) return; Services.tm.mainThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL); diff --git a/application/palemoon/base/content/browser-gestureSupport.js b/application/palemoon/base/content/browser-gestureSupport.js index 13eb71b99..6826fdbf3 100644 --- a/application/palemoon/base/content/browser-gestureSupport.js +++ b/application/palemoon/base/content/browser-gestureSupport.js @@ -24,7 +24,7 @@ var gGestureSupport = { * @param aAddListener * True to add/init listeners and false to remove/uninit */ - init: function GS_init(aAddListener) { + init: function (aAddListener) { // Bug 863514 - Make gesture support work in electrolysis if (gMultiProcessBrowser) return; @@ -50,7 +50,7 @@ var gGestureSupport = { * @param aEvent * The gesture event to handle */ - handleEvent: function GS_handleEvent(aEvent) { + handleEvent: function (aEvent) { if (!Services.prefs.getBoolPref( "dom.debug.propagate_gesture_events_through_content")) { aEvent.stopPropagation(); @@ -122,7 +122,7 @@ var gGestureSupport = { * @param aDec * Command to trigger for decreasing motion (without gesture name) */ - _setupGesture: function GS__setupGesture(aEvent, aGesture, aPref, aInc, aDec) { + _setupGesture: function (aEvent, aGesture, aPref, aInc, aDec) { // Try to load user-set values from preferences for (let [pref, def] in Iterator(aPref)) aPref[pref] = this._getPref(aGesture + "." + pref, def); @@ -133,7 +133,7 @@ var gGestureSupport = { let isLatched = false; // Create the update function here to capture closure state - this._doUpdate = function GS__doUpdate(aEvent) { + this._doUpdate = function (aEvent) { // Update the offset with new event data offset += aEvent.delta; @@ -167,7 +167,7 @@ var gGestureSupport = { * The swipe gesture event. * @return true if the swipe event may navigate the history, false othwerwise. */ - _swipeNavigatesHistory: function GS__swipeNavigatesHistory(aEvent) { + _swipeNavigatesHistory: function (aEvent) { return this._getCommand(aEvent, ["swipe", "left"]) == "Browser:BackOrBackDuplicate" && this._getCommand(aEvent, ["swipe", "right"]) @@ -180,7 +180,7 @@ var gGestureSupport = { * @param aEvent * The swipe gesture start event. */ - _setupSwipeGesture: function GS__setupSwipeGesture(aEvent) { + _setupSwipeGesture: function (aEvent) { if (!this._swipeNavigatesHistory(aEvent)) return; @@ -197,11 +197,11 @@ var gGestureSupport = { gHistorySwipeAnimation.startAnimation(); - this._doUpdate = function GS__doUpdate(aEvent) { + this._doUpdate = function (aEvent) { gHistorySwipeAnimation.updateAnimation(aEvent.delta); }; - this._doEnd = function GS__doEnd(aEvent) { + this._doEnd = function (aEvent) { gHistorySwipeAnimation.swipeEndEventReceived(); this._doUpdate = function (aEvent) {}; @@ -217,7 +217,7 @@ var gGestureSupport = { * Source array containing any number of elements * @yield Array that is a subset of the input array from full set to empty */ - _power: function GS__power(aArray) { + _power: function (aArray) { // Create a bitmask based on the length of the array let num = 1 << aArray.length; while (--num >= 0) { @@ -241,7 +241,7 @@ var gGestureSupport = { * @return Name of the executed command. Returns null if no command is * found. */ - _doAction: function GS__doAction(aEvent, aGesture) { + _doAction: function (aEvent, aGesture) { let command = this._getCommand(aEvent, aGesture); return command && this._doCommand(aEvent, command); }, @@ -255,7 +255,7 @@ var gGestureSupport = { * @param aGesture * Array of gesture name parts (to be joined by periods) */ - _getCommand: function GS__getCommand(aEvent, aGesture) { + _getCommand: function (aEvent, aGesture) { // Create an array of pressed keys in a fixed order so that a command for // "meta" is preferred over "ctrl" when both buttons are pressed (and a // command for both don't exist) @@ -289,7 +289,7 @@ var gGestureSupport = { * @param aCommand * Name of the command found for the event's keys and gesture. */ - _doCommand: function GS__doCommand(aEvent, aCommand) { + _doCommand: function (aEvent, aCommand) { let node = document.getElementById(aCommand); if (node) { if (node.getAttribute("disabled") != "true") { @@ -329,7 +329,7 @@ var gGestureSupport = { * @param aEvent * The swipe event to handle */ - onSwipe: function GS_onSwipe(aEvent) { + onSwipe: function (aEvent) { // Figure out which one (and only one) direction was triggered for (let dir of ["UP", "RIGHT", "DOWN", "LEFT"]) { if (aEvent.direction == aEvent["DIRECTION_" + dir]) { @@ -347,7 +347,7 @@ var gGestureSupport = { * @param aDir * The direction for the swipe event */ - processSwipeEvent: function GS_processSwipeEvent(aEvent, aDir) { + processSwipeEvent: function (aEvent, aDir) { this._doAction(aEvent, ["swipe", aDir.toLowerCase()]); }, @@ -363,7 +363,7 @@ var gGestureSupport = { * The direction for the swipe event */ _coordinateSwipeEventWithAnimation: - function GS__coordinateSwipeEventWithAnimation(aEvent, aDir) { + function (aEvent, aDir) { if ((gHistorySwipeAnimation.isAnimationRunning()) && (aDir == "RIGHT" || aDir == "LEFT")) { gHistorySwipeAnimation.processSwipeEvent(aEvent, aDir); @@ -381,7 +381,7 @@ var gGestureSupport = { * @param aDef * Default value if the preference doesn't exist */ - _getPref: function GS__getPref(aPref, aDef) { + _getPref: function (aPref, aDef) { // Preferences branch under which all gestures preferences are stored const branch = "browser.gesture."; @@ -541,7 +541,7 @@ var gHistorySwipeAnimation = { * Initializes the support for history swipe animations, if it is supported * by the platform/configuration. */ - init: function HSA_init() { + init: function () { if (!this._isSupported()) return; @@ -568,7 +568,7 @@ var gHistorySwipeAnimation = { /** * Uninitializes the support for history swipe animations. */ - uninit: function HSA_uninit() { + uninit: function () { gBrowser.removeEventListener("pagehide", this, false); gBrowser.removeEventListener("pageshow", this, false); gBrowser.removeEventListener("popstate", this, false); @@ -582,7 +582,7 @@ var gHistorySwipeAnimation = { * Starts the swipe animation and handles fast swiping (i.e. a swipe animation * is already in progress when a new one is initiated). */ - startAnimation: function HSA_startAnimation() { + startAnimation: function () { if (this.isAnimationRunning()) { gBrowser.stop(); this._lastSwipeDir = "RELOAD"; // just ensure that != "" @@ -607,7 +607,7 @@ var gHistorySwipeAnimation = { /** * Stops the swipe animation. */ - stopAnimation: function HSA_stopAnimation() { + stopAnimation: function () { gHistorySwipeAnimation._removeBoxes(); }, @@ -618,7 +618,7 @@ var gHistorySwipeAnimation = { * A floating point value that represents the progress of the * swipe gesture. */ - updateAnimation: function HSA_updateAnimation(aVal) { + updateAnimation: function (aVal) { if (!this.isAnimationRunning()) return; @@ -668,7 +668,7 @@ var gHistorySwipeAnimation = { * @param aEvent * An event to process. */ - handleEvent: function HSA_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "TabClose": let browser = gBrowser.getBrowserForTab(aEvent.target); @@ -698,7 +698,7 @@ var gHistorySwipeAnimation = { * * @return true if the animation is currently running, false otherwise. */ - isAnimationRunning: function HSA_isAnimationRunning() { + isAnimationRunning: function () { return !!this._container; }, @@ -710,7 +710,7 @@ var gHistorySwipeAnimation = { * @param aDir * The direction for the swipe event */ - processSwipeEvent: function HSA_processSwipeEvent(aEvent, aDir) { + processSwipeEvent: function (aEvent, aDir) { if (aDir == "RIGHT") this._historyIndex += this.isLTR ? 1 : -1; else if (aDir == "LEFT") @@ -725,7 +725,7 @@ var gHistorySwipeAnimation = { * * @return true if there is a previous page in history, false otherwise. */ - canGoBack: function HSA_canGoBack() { + canGoBack: function () { if (this.isAnimationRunning()) return this._doesIndexExistInHistory(this._historyIndex - 1); return gBrowser.webNavigation.canGoBack; @@ -736,7 +736,7 @@ var gHistorySwipeAnimation = { * * @return true if there is a next page in history, false otherwise. */ - canGoForward: function HSA_canGoForward() { + canGoForward: function () { if (this.isAnimationRunning()) return this._doesIndexExistInHistory(this._historyIndex + 1); return gBrowser.webNavigation.canGoForward; @@ -747,7 +747,7 @@ var gHistorySwipeAnimation = { * event and that we should navigate to the page that the user swiped to, if * any. This will also result in the animation overlay to be torn down. */ - swipeEndEventReceived: function HSA_swipeEndEventReceived() { + swipeEndEventReceived: function () { if (this._lastSwipeDir != "") this._navigateToHistoryIndex(); else @@ -761,7 +761,7 @@ var gHistorySwipeAnimation = { * The index to check for availability for in the history. * @return true if the index exists in the browser history, false otherwise. */ - _doesIndexExistInHistory: function HSA__doesIndexExistInHistory(aIndex) { + _doesIndexExistInHistory: function (aIndex) { try { gBrowser.webNavigation.sessionHistory.getEntryAtIndex(aIndex, false); } @@ -775,7 +775,7 @@ var gHistorySwipeAnimation = { * Navigates to the index in history that is currently being tracked by * |this|. */ - _navigateToHistoryIndex: function HSA__navigateToHistoryIndex() { + _navigateToHistoryIndex: function () { if (this._doesIndexExistInHistory(this._historyIndex)) { gBrowser.webNavigation.gotoIndex(this._historyIndex); } @@ -787,7 +787,7 @@ var gHistorySwipeAnimation = { * * return true if supported, false otherwise. */ - _isSupported: function HSA__isSupported() { + _isSupported: function () { return window.matchMedia("(-moz-swipe-animation-enabled)").matches; }, @@ -796,7 +796,7 @@ var gHistorySwipeAnimation = { * progress when a new one is initiated). This will swap out the snapshots * used in the previous animation with the appropriate new ones. */ - _handleFastSwiping: function HSA__handleFastSwiping() { + _handleFastSwiping: function () { this._installCurrentPageSnapshot(null); this._installPrevAndNextSnapshots(); }, @@ -804,7 +804,7 @@ var gHistorySwipeAnimation = { /** * Adds the boxes that contain the snapshots used during the swipe animation. */ - _addBoxes: function HSA__addBoxes() { + _addBoxes: function () { let browserStack = document.getAnonymousElementByAttribute(gBrowser.getNotificationBox(), "class", "browserStack"); @@ -830,7 +830,7 @@ var gHistorySwipeAnimation = { /** * Removes the boxes. */ - _removeBoxes: function HSA__removeBoxes() { + _removeBoxes: function () { this._curBox = null; this._prevBox = null; this._nextBox = null; @@ -849,7 +849,7 @@ var gHistorySwipeAnimation = { * The name of the tag to create the element for. * @return the newly created element. */ - _createElement: function HSA__createElement(aID, aTagName) { + _createElement: function (aID, aTagName) { let XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; let element = document.createElementNS(XULNS, aTagName); element.id = aID; @@ -864,14 +864,14 @@ var gHistorySwipeAnimation = { * @param aPosition * The position (in X coordinates) to move the box element to. */ - _positionBox: function HSA__positionBox(aBox, aPosition) { + _positionBox: function (aBox, aPosition) { aBox.style.transform = "translateX(" + this._boxWidth * aPosition + "px)"; }, /** * Takes a snapshot of the page the browser is currently on. */ - _takeSnapshot: function HSA__takeSnapshot() { + _takeSnapshot: function () { if ((this._maxSnapshots < 1) || (gBrowser.webNavigation.sessionHistory.index < 0)) return; @@ -899,7 +899,7 @@ var gHistorySwipeAnimation = { * Retrieves the maximum number of snapshots that should be kept in memory. * This limit is a global limit and is valid across all open tabs. */ - _getMaxSnapshots: function HSA__getMaxSnapshots() { + _getMaxSnapshots: function () { return gPrefService.getIntPref("browser.snapshots.limit"); }, @@ -912,7 +912,7 @@ var gHistorySwipeAnimation = { * The snapshot to add to the list and compress. */ _assignSnapshotToCurrentBrowser: - function HSA__assignSnapshotToCurrentBrowser(aCanvas) { + function (aCanvas) { let browser = gBrowser.selectedBrowser; let currIndex = browser.webNavigation.sessionHistory.index; @@ -946,7 +946,7 @@ var gHistorySwipeAnimation = { * @param aBrowser * The browser the new snapshot was taken in. */ - _removeTrackedSnapshot: function HSA__removeTrackedSnapshot(aIndex, aBrowser) { + _removeTrackedSnapshot: function (aIndex, aBrowser) { let arr = this._trackedSnapshots; let requiresExactIndexMatch = aIndex >= 0; for (let i = 0; i < arr.length; i++) { @@ -972,7 +972,7 @@ var gHistorySwipeAnimation = { * The browser the new snapshot was taken in. */ _addSnapshotRefToArray: - function HSA__addSnapshotRefToArray(aIndex, aBrowser) { + function (aIndex, aBrowser) { let id = { index: aIndex, browser: aBrowser }; let arr = this._trackedSnapshots; @@ -995,7 +995,7 @@ var gHistorySwipeAnimation = { * couldn't complete before this method was called. * @return A new Image object representing the converted blob. */ - _convertToImg: function HSA__convertToImg(aBlob) { + _convertToImg: function (aBlob) { if (!aBlob) return null; @@ -1022,7 +1022,7 @@ var gHistorySwipeAnimation = { * the previously stored snapshot for this index (if any) will be used. */ _installCurrentPageSnapshot: - function HSA__installCurrentPageSnapshot(aCanvas) { + function (aCanvas) { let currSnapshot = aCanvas; if (!currSnapshot) { let snapshots = gBrowser.selectedBrowser.snapshots || {}; @@ -1039,7 +1039,7 @@ var gHistorySwipeAnimation = { * previously stored for their respective indeces. */ _installPrevAndNextSnapshots: - function HSA__installPrevAndNextSnapshots() { + function () { let snapshots = gBrowser.selectedBrowser.snapshots || []; let currIndex = this._historyIndex; let prevIndex = currIndex - 1; diff --git a/application/palemoon/base/content/browser-places.js b/application/palemoon/base/content/browser-places.js index 590fe7ecd..92c61b2cf 100644 --- a/application/palemoon/base/content/browser-places.js +++ b/application/palemoon/base/content/browser-places.js @@ -33,7 +33,7 @@ var StarUI = { ["cmd_close", "cmd_closeWindow"].map(function (id) this._element(id), this); }, - _blockCommands: function SU__blockCommands() { + _blockCommands: function () { this._blockedCommands.forEach(function (elt) { // make sure not to permanently disable this item (see bug 409155) if (elt.hasAttribute("wasDisabled")) @@ -47,7 +47,7 @@ var StarUI = { }); }, - _restoreCommandsState: function SU__restoreCommandsState() { + _restoreCommandsState: function () { this._blockedCommands.forEach(function (elt) { if (elt.getAttribute("wasDisabled") != "true") elt.removeAttribute("disabled"); @@ -56,7 +56,7 @@ var StarUI = { }, // nsIDOMEventListener - handleEvent: function SU_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "popuphidden": if (aEvent.originalTarget == this.panel) { @@ -119,7 +119,7 @@ var StarUI = { _overlayLoaded: false, _overlayLoading: false, showEditBookmarkPopup: - function SU_showEditBookmarkPopup(aItemId, aAnchorElement, aPosition) { + function (aItemId, aAnchorElement, aPosition) { // Performance: load the overlay the first time the panel is opened // (see bug 392443). if (this._overlayLoading) @@ -152,7 +152,7 @@ var StarUI = { }, _doShowEditBookmarkPanel: - function SU__doShowEditBookmarkPanel(aItemId, aAnchorElement, aPosition) { + function (aItemId, aAnchorElement, aPosition) { if (this.panel.state != "closed") return; @@ -210,7 +210,7 @@ var StarUI = { }, panelShown: - function SU_panelShown(aEvent) { + function (aEvent) { if (aEvent.target == this.panel) { if (!this._element("editBookmarkPanelContent").hidden) { let fieldToFocus = "editBMPanel_" + @@ -227,24 +227,24 @@ var StarUI = { } }, - quitEditMode: function SU_quitEditMode() { + quitEditMode: function () { this._element("editBookmarkPanelContent").hidden = true; this._element("editBookmarkPanelBottomButtons").hidden = true; gEditItemOverlay.uninitPanel(true); }, - cancelButtonOnCommand: function SU_cancelButtonOnCommand() { + cancelButtonOnCommand: function () { this._actionOnHide = "cancel"; this.panel.hidePopup(); }, - removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() { + removeBookmarkButtonCommand: function () { this._uriForRemoval = PlacesUtils.bookmarks.getBookmarkURI(this._itemId); this._actionOnHide = "remove"; this.panel.hidePopup(); }, - beginBatch: function SU_beginBatch() { + beginBatch: function () { if (!this._batching) { PlacesUtils.transactionManager.beginBatch(null); this._batching = true; @@ -267,7 +267,7 @@ var PlacesCommandHook = { * @param [optional] aShowEditUI * whether or not to show the edit-bookmark UI for the bookmark item */ - bookmarkPage: function PCH_bookmarkPage(aBrowser, aParent, aShowEditUI) { + bookmarkPage: function (aBrowser, aParent, aShowEditUI) { var uri = aBrowser.currentURI; var itemId = PlacesUtils.getMostRecentBookmarkForURI(uri); if (itemId == -1) { @@ -343,7 +343,7 @@ var PlacesCommandHook = { /** * Adds a bookmark to the page loaded in the current tab. */ - bookmarkCurrentPage: function PCH_bookmarkCurrentPage(aShowEditUI, aParent) { + bookmarkCurrentPage: function (aShowEditUI, aParent) { this.bookmarkPage(gBrowser.selectedBrowser, aParent, aShowEditUI); }, @@ -357,7 +357,7 @@ var PlacesCommandHook = { * @param aTitle * The link text */ - bookmarkLink: function PCH_bookmarkLink(aParent, aURL, aTitle) { + bookmarkLink: function (aParent, aURL, aTitle) { var linkURI = makeURI(aURL); var itemId = PlacesUtils.getMostRecentBookmarkForURI(linkURI); if (itemId == -1) { @@ -401,7 +401,7 @@ var PlacesCommandHook = { * Adds a folder with bookmarks to all of the currently open tabs in this * window. */ - bookmarkCurrentPages: function PCH_bookmarkCurrentPages() { + bookmarkCurrentPages: function () { let pages = this.uniqueCurrentPages; if (pages.length > 1) { PlacesUIUtils.showBookmarkDialog({ action: "add" @@ -416,7 +416,7 @@ var PlacesCommandHook = { * Updates disabled state for the "Bookmark All Tabs" command. */ updateBookmarkAllTabsCommand: - function PCH_updateBookmarkAllTabsCommand() { + function () { // There's nothing to do in non-browser windows. if (window.location.href != getBrowserURL()) return; @@ -436,7 +436,7 @@ var PlacesCommandHook = { * @subtitle subtitle * A short description of the feed. Optional. */ - addLiveBookmark: function PCH_addLiveBookmark(url, feedTitle, feedSubtitle) { + addLiveBookmark: function (url, feedTitle, feedSubtitle) { let toolbarIP = new InsertionPoint(PlacesUtils.toolbarFolderId, -1); let feedURI = makeURI(url); @@ -466,7 +466,7 @@ var PlacesCommandHook = { * are: History, AllBookmarks, BookmarksMenu, BookmarksToolbar, * UnfiledBookmarks, Tags and Downloads. */ - showPlacesOrganizer: function PCH_showPlacesOrganizer(aLeftPaneRoot) { + showPlacesOrganizer: function (aLeftPaneRoot) { var organizer = Services.wm.getMostRecentWindow("Places:Organizer"); // Due to bug 528706, getMostRecentWindow can return closed windows. if (!organizer || organizer.closed) { @@ -499,7 +499,7 @@ function HistoryMenu(aPopupShowingEvent) { } HistoryMenu.prototype = { - toggleRestoreLastSession: function HM_toggleRestoreLastSession() { + toggleRestoreLastSession: function () { let restoreItem = this._rootElt.ownerDocument.getElementById("Browser:RestoreLastSession"); if (this._ss.canRestoreLastSession && @@ -509,7 +509,7 @@ HistoryMenu.prototype = { restoreItem.setAttribute("disabled", true); }, - toggleRecentlyClosedTabs: function HM_toggleRecentlyClosedTabs() { + toggleRecentlyClosedTabs: function () { // enable/disable the Recently Closed Tabs sub menu var undoMenu = this._rootElt.getElementsByClassName("recentlyClosedTabsMenu")[0]; @@ -526,7 +526,7 @@ HistoryMenu.prototype = { * @param aEvent * The event when the user clicks the menu item */ - _undoCloseMiddleClick: function PHM__undoCloseMiddleClick(aEvent) { + _undoCloseMiddleClick: function (aEvent) { if (aEvent.button != 1) return; @@ -537,7 +537,7 @@ HistoryMenu.prototype = { /** * Populate when the history menu is opened */ - populateUndoSubmenu: function PHM_populateUndoSubmenu() { + populateUndoSubmenu: function () { var undoMenu = this._rootElt.getElementsByClassName("recentlyClosedTabsMenu")[0]; var undoPopup = undoMenu.firstChild; @@ -596,7 +596,7 @@ HistoryMenu.prototype = { }, false); }, - toggleRecentlyClosedWindows: function PHM_toggleRecentlyClosedWindows() { + toggleRecentlyClosedWindows: function () { // enable/disable the Recently Closed Windows sub menu var undoMenu = this._rootElt.getElementsByClassName("recentlyClosedWindowsMenu")[0]; @@ -610,7 +610,7 @@ HistoryMenu.prototype = { /** * Populate when the history menu is opened */ - populateUndoWindowSubmenu: function PHM_populateUndoWindowSubmenu() { + populateUndoWindowSubmenu: function () { let undoMenu = this._rootElt.getElementsByClassName("recentlyClosedWindowsMenu")[0]; let undoPopup = undoMenu.firstChild; let menuLabelString = gNavigatorBundle.getString("menuUndoCloseWindowLabel"); @@ -672,7 +672,7 @@ HistoryMenu.prototype = { "for (var i = 0; i < " + undoItems.length + "; i++) undoCloseWindow();"); }, - toggleTabsFromOtherComputers: function PHM_toggleTabsFromOtherComputers() { + toggleTabsFromOtherComputers: function () { // This is a no-op if MOZ_SERVICES_SYNC isn't defined #ifdef MOZ_SERVICES_SYNC // Enable/disable the Tabs From Other Computers menu. Some of the menus handled @@ -698,7 +698,7 @@ HistoryMenu.prototype = { #endif }, - _onPopupShowing: function HM__onPopupShowing(aEvent) { + _onPopupShowing: function (aEvent) { PlacesMenu.prototype._onPopupShowing.apply(this, arguments); // Don't handle events for submenus. @@ -711,7 +711,7 @@ HistoryMenu.prototype = { this.toggleTabsFromOtherComputers(); }, - _onCommand: function HM__onCommand(aEvent) { + _onCommand: function (aEvent) { let placesNode = aEvent.target._placesNode; if (placesNode) { if (!PrivateBrowsingUtils.isWindowPrivate(window)) @@ -739,7 +739,7 @@ var BookmarksEventHandler = { * @param aView * The places view which aEvent should be associated with. */ - onClick: function BEH_onClick(aEvent, aView) { + onClick: function (aEvent, aView) { // Only handle middle-click or left-click with modifiers. #ifdef XP_MACOSX var modifKey = aEvent.metaKey || aEvent.shiftKey; @@ -786,13 +786,13 @@ var BookmarksEventHandler = { * @param aView * The places view which aEvent should be associated with. */ - onCommand: function BEH_onCommand(aEvent, aView) { + onCommand: function (aEvent, aView) { var target = aEvent.originalTarget; if (target._placesNode) PlacesUIUtils.openNodeWithEvent(target._placesNode, aEvent, aView); }, - fillInBHTooltip: function BEH_fillInBHTooltip(aDocument, aEvent) { + fillInBHTooltip: function (aDocument, aEvent) { var node; var cropped = false; var targetURI; @@ -863,7 +863,7 @@ var PlacesMenuDNDHandler = { * @param event * The DragEnter event that spawned the opening. */ - onDragEnter: function PMDH_onDragEnter(event) { + onDragEnter: function (event) { // Opening menus in a Places popup is handled by the view itself. if (!this._isStaticContainer(event.target)) return; @@ -887,7 +887,7 @@ var PlacesMenuDNDHandler = { * @returns true if the element is a container element (menu or * menu-toolbarbutton), false otherwise. */ - onDragLeave: function PMDH_onDragLeave(event) { + onDragLeave: function (event) { // Handle menu-button separate targets. if (event.relatedTarget === event.currentTarget || event.relatedTarget.parentNode === event.currentTarget) @@ -924,7 +924,7 @@ var PlacesMenuDNDHandler = { * @returns true if the element is a container element (menu or *` menu-toolbarbutton), false otherwise. */ - _isStaticContainer: function PMDH__isContainer(node) { + _isStaticContainer: function (node) { let isMenu = node.localName == "menu" || (node.localName == "toolbarbutton" && (node.getAttribute("type") == "menu" || @@ -940,7 +940,7 @@ var PlacesMenuDNDHandler = { * @param event * The DragOver event. */ - onDragOver: function PMDH_onDragOver(event) { + onDragOver: function (event) { let ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId, PlacesUtils.bookmarks.DEFAULT_INDEX, Ci.nsITreeView.DROP_ON); @@ -955,7 +955,7 @@ var PlacesMenuDNDHandler = { * @param event * The Drop event. */ - onDrop: function PMDH_onDrop(event) { + onDrop: function (event) { // Put the item at the end of bookmark menu. let ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId, PlacesUtils.bookmarks.DEFAULT_INDEX, @@ -979,7 +979,7 @@ var PlacesToolbarHelper = { return document.getElementById("PlacesToolbar"); }, - init: function PTH_init() { + init: function () { let viewElt = this._viewElt; if (!viewElt || viewElt._placesView) return; @@ -997,7 +997,7 @@ var PlacesToolbarHelper = { new PlacesToolbar(this._place); }, - customizeStart: function PTH_customizeStart() { + customizeStart: function () { let viewElt = this._viewElt; if (viewElt && viewElt._placesView) viewElt._placesView.uninit(); @@ -1005,7 +1005,7 @@ var PlacesToolbarHelper = { this._isCustomizing = true; }, - customizeDone: function PTH_customizeDone() { + customizeDone: function () { this._isCustomizing = false; this.init(); } @@ -1074,11 +1074,11 @@ var BookmarkingUI = { * reasons. */ _popupNeedsUpdate: true, - onToolbarVisibilityChange: function BUI_onToolbarVisibilityChange() { + onToolbarVisibilityChange: function () { this._popupNeedsUpdate = true; }, - onPopupShowing: function BUI_onPopupShowing(event) { + onPopupShowing: function (event) { // Don't handle events for submenus. if (event.target != event.currentTarget) return; @@ -1112,7 +1112,7 @@ var BookmarkingUI = { /** * Handles star styling based on page proxy state changes. */ - onPageProxyStateChanged: function BUI_onPageProxyStateChanged(aState) { + onPageProxyStateChanged: function (aState) { if (!this.star) { return; } @@ -1126,7 +1126,7 @@ var BookmarkingUI = { } }, - _updateToolbarStyle: function BUI__updateToolbarStyle() { + _updateToolbarStyle: function () { if (!this.button) { return; } @@ -1145,7 +1145,7 @@ var BookmarkingUI = { } }, - _uninitView: function BUI__uninitView() { + _uninitView: function () { // When an element with a placesView attached is removed and re-inserted, // XBL reapplies the binding causing any kind of issues and possible leaks, // so kill current view and let popupshowing generate a new one. @@ -1160,22 +1160,22 @@ var BookmarkingUI = { } }, - customizeStart: function BUI_customizeStart() { + customizeStart: function () { this._uninitView(); }, - customizeChange: function BUI_customizeChange() { + customizeChange: function () { this._updateToolbarStyle(); }, - customizeDone: function BUI_customizeDone() { + customizeDone: function () { delete this._button; this.onToolbarVisibilityChange(); this._updateToolbarStyle(); }, _hasBookmarksObserver: false, - uninit: function BUI_uninit() { + uninit: function () { this._uninitView(); if (this._hasBookmarksObserver) { @@ -1188,14 +1188,14 @@ var BookmarkingUI = { } }, - onLocationChange: function BUI_onLocationChange() { + onLocationChange: function () { if (this._uri && gBrowser.currentURI.equals(this._uri)) { return; } this.updateStarState(); }, - updateStarState: function BUI_updateStarState() { + updateStarState: function () { // Reset tracked values. this._uri = gBrowser.currentURI; this._itemIds = []; @@ -1240,7 +1240,7 @@ var BookmarkingUI = { }, this); }, - _updateStar: function BUI__updateStar() { + _updateStar: function () { if (!this.star) { return; } @@ -1255,7 +1255,7 @@ var BookmarkingUI = { } }, - onCommand: function BUI_onCommand(aEvent) { + onCommand: function (aEvent) { if (aEvent.target != aEvent.currentTarget) { return; } @@ -1266,7 +1266,7 @@ var BookmarkingUI = { }, // nsINavBookmarkObserver - onItemAdded: function BUI_onItemAdded(aItemId, aParentId, aIndex, aItemType, + onItemAdded: function (aItemId, aParentId, aIndex, aItemType, aURI) { if (aURI && aURI.equals(this._uri)) { // If a new bookmark has been added to the tracked uri, register it. @@ -1277,7 +1277,7 @@ var BookmarkingUI = { } }, - onItemRemoved: function BUI_onItemRemoved(aItemId) { + onItemRemoved: function (aItemId) { let index = this._itemIds.indexOf(aItemId); // If one of the tracked bookmarks has been removed, unregister it. if (index != -1) { @@ -1286,7 +1286,7 @@ var BookmarkingUI = { } }, - onItemChanged: function BUI_onItemChanged(aItemId, aProperty, + onItemChanged: function (aItemId, aProperty, aIsAnnotationProperty, aNewValue) { if (aProperty == "uri") { let index = this._itemIds.indexOf(aItemId); diff --git a/application/palemoon/base/content/browser-plugins.js b/application/palemoon/base/content/browser-plugins.js index 838268203..b31793a4e 100644 --- a/application/palemoon/base/content/browser-plugins.js +++ b/application/palemoon/base/content/browser-plugins.js @@ -269,12 +269,12 @@ var gPluginHandler = { } }, - isKnownPlugin: function PH_isKnownPlugin(objLoadingContent) { + isKnownPlugin: function (objLoadingContent) { return (objLoadingContent.getContentTypeForMIMEType(objLoadingContent.actualType) == Ci.nsIObjectLoadingContent.TYPE_PLUGIN); }, - canActivatePlugin: function PH_canActivatePlugin(objLoadingContent) { + canActivatePlugin: function (objLoadingContent) { // if this isn't a known plugin, we can't activate it // (this also guards pluginHost.getPermissionStringForType against // unexpected input) @@ -307,7 +307,7 @@ var gPluginHandler = { overlay.style.visibility = "hidden"; }, - stopPlayPreview: function PH_stopPlayPreview(aPlugin, aPlayPlugin) { + stopPlayPreview: function (aPlugin, aPlayPlugin) { let objLoadingContent = aPlugin.QueryInterface(Ci.nsIObjectLoadingContent); if (objLoadingContent.activated) return; @@ -340,7 +340,7 @@ var gPluginHandler = { }, // Event listener for click-to-play plugins. - _handleClickToPlayEvent: function PH_handleClickToPlayEvent(aPlugin) { + _handleClickToPlayEvent: function (aPlugin) { let doc = aPlugin.ownerDocument; let browser = gBrowser.getBrowserForDocument(doc.defaultView.top.document); let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); @@ -372,7 +372,7 @@ var gPluginHandler = { }, _overlayClickListener: { - handleEvent: function PH_handleOverlayClick(aEvent) { + handleEvent: function (aEvent) { let plugin = document.getBindingParent(aEvent.target); let contentWindow = plugin.ownerDocument.defaultView.top; // gBrowser.getBrowserForDocument does not exist in the case where we @@ -399,7 +399,7 @@ var gPluginHandler = { } }, - _handlePlayPreviewEvent: function PH_handlePlayPreviewEvent(aPlugin) { + _handlePlayPreviewEvent: function (aPlugin) { let doc = aPlugin.ownerDocument; let browser = gBrowser.getBrowserForDocument(doc.defaultView.top.document); let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); @@ -441,7 +441,7 @@ var gPluginHandler = { } }, - reshowClickToPlayNotification: function PH_reshowClickToPlayNotification() { + reshowClickToPlayNotification: function () { let browser = gBrowser.selectedBrowser; let contentWindow = browser.contentWindow; let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor) @@ -459,7 +459,7 @@ var gPluginHandler = { gPluginHandler._showClickToPlayNotification(browser); }, - _clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) { + _clickToPlayNotificationEventCallback: function (event) { if (event == "showing") { gPluginHandler._makeCenterActions(this); } @@ -470,7 +470,7 @@ var gPluginHandler = { } }, - _makeCenterActions: function PH_makeCenterActions(notification) { + _makeCenterActions: function (notification) { let contentWindow = notification.browser.contentWindow; let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDOMWindowUtils); @@ -533,7 +533,7 @@ var gPluginHandler = { * and activate plugins if necessary. * aNewState should be either "allownow" "allowalways" or "block" */ - _updatePluginPermission: function PH_setPermissionForPlugins(aNotification, aPluginInfo, aNewState) { + _updatePluginPermission: function (aNotification, aPluginInfo, aNewState) { let permission; let expireType; let expireTime; @@ -598,7 +598,7 @@ var gPluginHandler = { } }, - _showClickToPlayNotification: function PH_showClickToPlayNotification(aBrowser, aPrimaryPlugin) { + _showClickToPlayNotification: function (aBrowser, aPrimaryPlugin) { let notification = PopupNotifications.getNotification("click-to-play-plugins", aBrowser); let contentWindow = aBrowser.contentWindow; diff --git a/application/palemoon/base/content/browser-syncui.js b/application/palemoon/base/content/browser-syncui.js index 86f6f48f1..1cf46951d 100644 --- a/application/palemoon/base/content/browser-syncui.js +++ b/application/palemoon/base/content/browser-syncui.js @@ -20,7 +20,7 @@ var gSyncUI = { _unloaded: false, - init: function SUI_init() { + init: function () { // Proceed to set up the UI if Sync has already started up. // Otherwise we'll do it when Sync is firing up. let xps = Components.classes["@mozilla.org/weave/service;1"] @@ -48,7 +48,7 @@ var gSyncUI = { }, false); }, - initUI: function SUI_initUI() { + initUI: function () { // If this is a browser window? if (gBrowser) { this._obs.push("weave:notification:added"); @@ -64,7 +64,7 @@ var gSyncUI = { this.updateUI(); }, - initNotifications: function SUI_initNotifications() { + initNotifications: function () { const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; let notificationbox = document.createElementNS(XULNS, "notificationbox"); notificationbox.id = "sync-notifications"; @@ -82,13 +82,13 @@ var gSyncUI = { _wasDelayed: false, - _needsSetup: function SUI__needsSetup() { + _needsSetup: function () { let firstSync = Services.prefs.getCharPref("services.sync.firstSync", ""); return Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED || firstSync == "notReady"; }, - updateUI: function SUI_updateUI() { + updateUI: function () { let needsSetup = this._needsSetup(); document.getElementById("sync-setup-state").hidden = !needsSetup; document.getElementById("sync-syncnow-state").hidden = needsSetup; @@ -116,7 +116,7 @@ var gSyncUI = { // Functions called by observers - onActivityStart: function SUI_onActivityStart() { + onActivityStart: function () { if (!gBrowser) return; @@ -128,7 +128,7 @@ var gSyncUI = { button.setAttribute("label", this._stringBundle.GetStringFromName("syncing2.label")); }, - onSyncDelay: function SUI_onSyncDelay() { + onSyncDelay: function () { // basically, we want to just inform users that stuff is going to take a while let title = this._stringBundle.GetStringFromName("error.sync.no_node_found.title"); let description = this._stringBundle.GetStringFromName("error.sync.no_node_found"); @@ -143,17 +143,17 @@ var gSyncUI = { this._wasDelayed = true; }, - onLoginFinish: function SUI_onLoginFinish() { + onLoginFinish: function () { // Clear out any login failure notifications let title = this._stringBundle.GetStringFromName("error.login.title"); this.clearError(title); }, - onSetupComplete: function SUI_onSetupComplete() { + onSetupComplete: function () { this.onLoginFinish(); }, - onLoginError: function SUI_onLoginError() { + onLoginError: function () { // if login fails, any other notifications are essentially moot Weave.Notifications.removeAll(); @@ -191,11 +191,11 @@ var gSyncUI = { this.updateUI(); }, - onLogout: function SUI_onLogout() { + onLogout: function () { this.updateUI(); }, - onStartOver: function SUI_onStartOver() { + onStartOver: function () { this.clearError(); }, @@ -220,11 +220,11 @@ var gSyncUI = { }, // Commands - doSync: function SUI_doSync() { + doSync: function () { setTimeout(function() Weave.Service.errorHandler.syncAndReportErrors(), 0); }, - handleToolbarButton: function SUI_handleStatusbarButton() { + handleToolbarButton: function () { if (this._needsSetup()) this.openSetup(); else @@ -244,7 +244,7 @@ var gSyncUI = { * "reset" -- reset sync */ - openSetup: function SUI_openSetup(wizardType) { + openSetup: function (wizardType) { let win = Services.wm.getMostRecentWindow("Weave:AccountSetup"); if (win) win.focus(); @@ -267,7 +267,7 @@ var gSyncUI = { "syncAddDevice", "centerscreen,chrome,resizable=no"); }, - openQuotaDialog: function SUI_openQuotaDialog() { + openQuotaDialog: function () { let win = Services.wm.getMostRecentWindow("Sync:ViewQuota"); if (win) win.focus(); @@ -277,13 +277,13 @@ var gSyncUI = { "centerscreen,chrome,dialog,modal"); }, - openPrefs: function SUI_openPrefs() { + openPrefs: function () { openPreferences("paneSync"); }, // Helpers - _updateLastSyncTime: function SUI__updateLastSyncTime() { + _updateLastSyncTime: function () { if (!gBrowser) return; @@ -305,12 +305,12 @@ var gSyncUI = { syncButton.setAttribute("tooltiptext", lastSyncLabel); }, - clearError: function SUI_clearError(errorString) { + clearError: function (errorString) { Weave.Notifications.removeAll(errorString); this.updateUI(); }, - onSyncFinish: function SUI_onSyncFinish() { + onSyncFinish: function () { let title = this._stringBundle.GetStringFromName("error.sync.title"); // Clear out sync failures on a successful sync @@ -323,7 +323,7 @@ var gSyncUI = { } }, - onSyncError: function SUI_onSyncError() { + onSyncError: function () { let title = this._stringBundle.GetStringFromName("error.sync.title"); if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) { @@ -404,7 +404,7 @@ var gSyncUI = { this.updateUI(); }, - observe: function SUI_observe(subject, topic, data) { + observe: function (subject, topic, data) { if (this._unloaded) { Cu.reportError("SyncUI observer called after unload: " + topic); return; diff --git a/application/palemoon/base/content/browser-tabPreviews.js b/application/palemoon/base/content/browser-tabPreviews.js index e0755b81d..2c71f14f6 100644 --- a/application/palemoon/base/content/browser-tabPreviews.js +++ b/application/palemoon/base/content/browser-tabPreviews.js @@ -22,7 +22,7 @@ var tabPreviews = { return this.height = Math.round(this.width * this.aspectRatio); }, - init: function tabPreviews_init() { + init: function () { if (this._selectedTab) return; this._selectedTab = gBrowser.selectedTab; @@ -31,7 +31,7 @@ var tabPreviews = { gBrowser.tabContainer.addEventListener("SSTabRestored", this, false); }, - get: function tabPreviews_get(aTab) { + get: function (aTab) { let uri = aTab.linkedBrowser.currentURI.spec; if (aTab.__thumbnail_lastURI && @@ -52,7 +52,7 @@ var tabPreviews = { return this.capture(aTab, !aTab.hasAttribute("busy")); }, - capture: function tabPreviews_capture(aTab, aStore) { + capture: function (aTab, aStore) { var thumbnail = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas"); thumbnail.mozOpaque = true; thumbnail.height = this.height; @@ -75,7 +75,7 @@ var tabPreviews = { return thumbnail; }, - handleEvent: function tabPreviews_handleEvent(event) { + handleEvent: function (event) { switch (event.type) { case "TabSelect": if (this._selectedTab && @@ -219,7 +219,7 @@ var ctrlTab = { return this._tabList = list; }, - init: function ctrlTab_init() { + init: function () { if (!this._recentlyUsedTabs) { tabPreviews.init(); @@ -228,13 +228,13 @@ var ctrlTab = { } }, - uninit: function ctrlTab_uninit() { + uninit: function () { this._recentlyUsedTabs = null; this._init(false); }, prefName: "browser.ctrlTab.previews", - readPref: function ctrlTab_readPref() { + readPref: function () { var enable = gPrefService.getBoolPref(this.prefName) && (!gPrefService.prefHasUserValue("browser.ctrlTab.disallowForScreenReaders") || @@ -249,7 +249,7 @@ var ctrlTab = { this.readPref(); }, - updatePreviews: function ctrlTab_updatePreviews() { + updatePreviews: function () { for (let i = 0; i < this.previews.length; i++) this.updatePreview(this.previews[i], this.tabList[i]); @@ -258,7 +258,7 @@ var ctrlTab = { PluralForm.get(this.tabCount, showAllLabel).replace("#1", this.tabCount); }, - updatePreview: function ctrlTab_updatePreview(aPreview, aTab) { + updatePreview: function (aPreview, aTab) { if (aPreview == this.showAllButton) return; @@ -292,7 +292,7 @@ var ctrlTab = { } }, - advanceFocus: function ctrlTab_advanceFocus(aForward) { + advanceFocus: function (aForward) { let selectedIndex = Array.indexOf(this.previews, this.selected); do { selectedIndex += aForward ? 1 : -1; @@ -316,12 +316,12 @@ var ctrlTab = { } }, - _mouseOverFocus: function ctrlTab_mouseOverFocus(aPreview) { + _mouseOverFocus: function (aPreview) { if (this._trackMouseOver) aPreview.focus(); }, - pick: function ctrlTab_pick(aPreview) { + pick: function (aPreview) { if (!this.tabCount) return; @@ -333,17 +333,17 @@ var ctrlTab = { this.close(select._tab); }, - showAllTabs: function ctrlTab_showAllTabs(aPreview) { + showAllTabs: function (aPreview) { this.close(); document.getElementById("Browser:ShowAllTabs").doCommand(); }, - remove: function ctrlTab_remove(aPreview) { + remove: function (aPreview) { if (aPreview._tab) gBrowser.removeTab(aPreview._tab); }, - attachTab: function ctrlTab_attachTab(aTab, aPos) { + attachTab: function (aTab, aPos) { if (aPos == 0) this._recentlyUsedTabs.unshift(aTab); else if (aPos) @@ -351,13 +351,13 @@ var ctrlTab = { else this._recentlyUsedTabs.push(aTab); }, - detachTab: function ctrlTab_detachTab(aTab) { + detachTab: function (aTab) { var i = this._recentlyUsedTabs.indexOf(aTab); if (i >= 0) this._recentlyUsedTabs.splice(i, 1); }, - open: function ctrlTab_open() { + open: function () { if (this.isOpen) return; @@ -376,7 +376,7 @@ var ctrlTab = { }, 200, this); }, - _openPanel: function ctrlTab_openPanel() { + _openPanel: function () { tabPreviewPanelHelper.opening(this); this.panel.width = Math.min(screen.availWidth * .99, @@ -387,7 +387,7 @@ var ctrlTab = { false); }, - close: function ctrlTab_close(aTabToSelect) { + close: function (aTabToSelect) { if (!this.isOpen) return; @@ -404,7 +404,7 @@ var ctrlTab = { this.panel.hidePopup(); }, - setupGUI: function ctrlTab_setupGUI() { + setupGUI: function () { this.selected.focus(); this._selectedIndex = -1; @@ -417,7 +417,7 @@ var ctrlTab = { }, 0, this); }, - suspendGUI: function ctrlTab_suspendGUI() { + suspendGUI: function () { document.removeEventListener("keyup", this, true); Array.forEach(this.previews, function (preview) { @@ -427,7 +427,7 @@ var ctrlTab = { this._tabList = null; }, - onKeyPress: function ctrlTab_onKeyPress(event) { + onKeyPress: function (event) { var isOpen = this.isOpen; if (isOpen) { @@ -472,7 +472,7 @@ var ctrlTab = { } }, - removeClosingTabFromUI: function ctrlTab_removeClosingTabFromUI(aTab) { + removeClosingTabFromUI: function (aTab) { if (this.tabCount == 2) { this.close(); return; @@ -494,7 +494,7 @@ var ctrlTab = { } }, - handleEvent: function ctrlTab_handleEvent(event) { + handleEvent: function (event) { switch (event.type) { case "TabAttrModified": // tab attribute modified (e.g. label, crop, busy, image, selected) @@ -527,7 +527,7 @@ var ctrlTab = { } }, - _init: function ctrlTab__init(enable) { + _init: function (enable) { var toggleEventListener = enable ? "addEventListener" : "removeEventListener"; var tabContainer = gBrowser.tabContainer; @@ -578,7 +578,7 @@ var allTabs = { get previews () this.container.getElementsByClassName("allTabs-preview"), get isOpen () this.panel.state == "open" || this.panel.state == "showing", - init: function allTabs_init() { + init: function () { if (this._initiated) return; this._initiated = true; @@ -595,7 +595,7 @@ var allTabs = { gBrowser.tabContainer.addEventListener("TabClose", this, false); }, - uninit: function allTabs_uninit() { + uninit: function () { if (!this._initiated) return; @@ -611,7 +611,7 @@ var allTabs = { }, prefName: "browser.allTabs.previews", - readPref: function allTabs_readPref() { + readPref: function () { var allTabsButton = this.toolbarButton; if (!allTabsButton) return; @@ -629,7 +629,7 @@ var allTabs = { this.readPref(); }, - pick: function allTabs_pick(aPreview) { + pick: function (aPreview) { if (!aPreview) aPreview = this._firstVisiblePreview; if (aPreview) @@ -638,12 +638,12 @@ var allTabs = { this.close(); }, - closeTab: function allTabs_closeTab(event) { + closeTab: function (event) { this.filterField.focus(); gBrowser.removeTab(event.currentTarget._targetPreview._tab); }, - filter: function allTabs_filter() { + filter: function () { if (this._currentFilter == this.filterField.value) return; @@ -676,7 +676,7 @@ var allTabs = { this._reflow(); }, - open: function allTabs_open() { + open: function () { var allTabsButton = this.toolbarButton; if (allTabsButton && allTabsButton.getAttribute("type") == "menu") { @@ -704,11 +704,11 @@ var allTabs = { this.panel.openPopup(gBrowser, "overlap", 0, 0, false, true); }, - close: function allTabs_close() { + close: function () { this.panel.hidePopup(); }, - setupGUI: function allTabs_setupGUI() { + setupGUI: function () { this.filterField.focus(); this.filterField.placeholder = this.filterField.tooltipText; @@ -721,7 +721,7 @@ var allTabs = { document.getElementById("Browser:ShowAllTabs").setAttribute("disabled", "true"); }, - suspendGUI: function allTabs_suspendGUI() { + suspendGUI: function () { this.filterField.placeholder = ""; this.filterField.value = ""; this._currentFilter = null; @@ -737,7 +737,7 @@ var allTabs = { }, 300); }, - handleEvent: function allTabs_handleEvent(event) { + handleEvent: function (event) { if (event.type.startsWith("Tab")) { var tab = event.target; if (event.type != "TabOpen") @@ -810,7 +810,7 @@ var allTabs = { return null; }, - _reflow: function allTabs_reflow() { + _reflow: function () { this._updateTabCloseButton(); const CONTAINER_MAX_WIDTH = this._maxPanelWidth * .95; @@ -869,14 +869,14 @@ var allTabs = { this.container.maxHeight = rows * outerHeight; }, - _addPreview: function allTabs_addPreview(aTab) { + _addPreview: function (aTab) { var preview = document.createElement("button"); preview.className = "allTabs-preview"; preview._tab = aTab; this.container.lastChild.appendChild(preview); }, - _removePreview: function allTabs_removePreview(aPreview) { + _removePreview: function (aPreview) { var updateUI = (this.isOpen && !aPreview.hidden); aPreview._tab = null; aPreview.parentNode.removeChild(aPreview); @@ -887,7 +887,7 @@ var allTabs = { } }, - _getPreview: function allTabs_getPreview(aTab) { + _getPreview: function (aTab) { var previews = this.previews; for (let i = 0; i < previews.length; i++) if (previews[i]._tab == aTab) @@ -895,7 +895,7 @@ var allTabs = { return null; }, - _updateTabCloseButton: function allTabs_updateTabCloseButton(event) { + _updateTabCloseButton: function (event) { if (event && event.target == this.tabCloseButton) return; @@ -932,7 +932,7 @@ var allTabs = { } }, - _updatePreview: function allTabs_updatePreview(aPreview) { + _updatePreview: function (aPreview) { aPreview.setAttribute("label", aPreview._tab.label); aPreview.setAttribute("tooltiptext", aPreview._tab.label); aPreview.setAttribute("crop", aPreview._tab.crop); @@ -957,7 +957,7 @@ var allTabs = { aPreview.appendChild(thumbnail); }, - _onKeyPress: function allTabs_onKeyPress(event) { + _onKeyPress: function (event) { if (event.eventPhase == event.CAPTURING_PHASE) { this._onCapturingKeyPress(event); return; @@ -992,7 +992,7 @@ var allTabs = { } }, - _onCapturingKeyPress: function allTabs_onCapturingKeyPress(event) { + _onCapturingKeyPress: function (event) { switch (event.keyCode) { case event.DOM_VK_UP: case event.DOM_VK_DOWN: @@ -1010,7 +1010,7 @@ var allTabs = { } }, - _advanceFocusVertically: function allTabs_advanceFocusVertically(event) { + _advanceFocusVertically: function (event) { var preview = document.activeElement; if (!preview || preview.parentNode.parentNode != this.container) return; diff --git a/application/palemoon/base/content/browser-thumbnails.js b/application/palemoon/base/content/browser-thumbnails.js index 079b0ac1b..bab99a59b 100644 --- a/application/palemoon/base/content/browser-thumbnails.js +++ b/application/palemoon/base/content/browser-thumbnails.js @@ -30,7 +30,7 @@ var gBrowserThumbnails = { */ _tabEvents: ["TabClose", "TabSelect"], - init: function Thumbnails_init() { + init: function () { // Bug 863512 - Make page thumbnails work in electrolysis if (gMultiProcessBrowser) return; @@ -54,7 +54,7 @@ var gBrowserThumbnails = { this._timeouts = new WeakMap(); }, - uninit: function Thumbnails_uninit() { + uninit: function () { // Bug 863512 - Make page thumbnails work in electrolysis if (gMultiProcessBrowser) return; @@ -68,7 +68,7 @@ var gBrowserThumbnails = { }, this); }, - handleEvent: function Thumbnails_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "scroll": let browser = aEvent.currentTarget; @@ -85,13 +85,13 @@ var gBrowserThumbnails = { } }, - observe: function Thumbnails_observe() { + observe: function () { this._sslDiskCacheEnabled = Services.prefs.getBoolPref(this.PREF_DISK_CACHE_SSL); }, filterForThumbnailExpiration: - function Thumbnails_filterForThumbnailExpiration(aCallback) { + function (aCallback) { // Tycho: aCallback([browser.currentURI.spec for (browser of gBrowser.browsers)]); let result = []; for (let browser of gBrowser.browsers) { @@ -103,19 +103,19 @@ var gBrowserThumbnails = { /** * State change progress listener for all tabs. */ - onStateChange: function Thumbnails_onStateChange(aBrowser, aWebProgress, + onStateChange: function (aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) { if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP && aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) this._delayedCapture(aBrowser); }, - _capture: function Thumbnails_capture(aBrowser) { + _capture: function (aBrowser) { if (this._shouldCapture(aBrowser)) PageThumbs.captureAndStore(aBrowser); }, - _delayedCapture: function Thumbnails_delayedCapture(aBrowser) { + _delayedCapture: function (aBrowser) { if (this._timeouts.has(aBrowser)) clearTimeout(this._timeouts.get(aBrowser)); else @@ -129,7 +129,7 @@ var gBrowserThumbnails = { this._timeouts.set(aBrowser, timeout); }, - _shouldCapture: function Thumbnails_shouldCapture(aBrowser) { + _shouldCapture: function (aBrowser) { // Capture only if it's the currently selected tab. if (aBrowser != gBrowser.selectedBrowser) return false; @@ -193,7 +193,7 @@ var gBrowserThumbnails = { return true; }, - _clearTimeout: function Thumbnails_clearTimeout(aBrowser) { + _clearTimeout: function (aBrowser) { if (this._timeouts.has(aBrowser)) { aBrowser.removeEventListener("scroll", this, false); clearTimeout(this._timeouts.get(aBrowser)); diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index 2a202c41f..4fe300ebb 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -2502,7 +2502,7 @@ function BrowserOnAboutPageLoad(doc) { * Handle command events bubbling up from error page content */ var BrowserOnClick = { - handleEvent: function BrowserOnClick_handleEvent(aEvent) { + handleEvent: function (aEvent) { if (!aEvent.isTrusted || // Don't trust synthetic events aEvent.button == 2 || aEvent.target.localName != "button") { return; @@ -2524,7 +2524,7 @@ var BrowserOnClick = { } }, - onAboutCertError: function BrowserOnClick_onAboutCertError(aTargetElm, aOwnerDoc) { + onAboutCertError: function (aTargetElm, aOwnerDoc) { let elmId = aTargetElm.getAttribute("id"); let isTopFrame = (aOwnerDoc.defaultView.parent === aOwnerDoc.defaultView); @@ -2565,14 +2565,14 @@ var BrowserOnClick = { } }, - onAboutNetError: function BrowserOnClick_onAboutNetError(aTargetElm, aOwnerDoc) { + onAboutNetError: function (aTargetElm, aOwnerDoc) { let elmId = aTargetElm.getAttribute("id"); if (elmId != "errorTryAgain" || !/e=netOffline/.test(aOwnerDoc.documentURI)) return; Services.io.offline = false; }, - onAboutHome: function BrowserOnClick_onAboutHome(aTargetElm, aOwnerDoc) { + onAboutHome: function (aTargetElm, aOwnerDoc) { let elmId = aTargetElm.getAttribute("id"); switch (elmId) { @@ -3113,7 +3113,7 @@ const BrowserSearch = { * the default engine's search form otherwise. For Mac, opens a new window * or focuses an existing window, if necessary. */ - webSearch: function BrowserSearch_webSearch() { + webSearch: function () { #ifdef XP_MACOSX if (window.location.href != getBrowserURL()) { var win = getTopWin(); @@ -3164,7 +3164,7 @@ const BrowserSearch = { * @return string Name of the search engine used to perform a search or null * if a search was not performed. */ - loadSearch: function BrowserSearch_search(searchText, useNewTab, purpose) { + loadSearch: function (searchText, useNewTab, purpose) { var engine; // If the search bar is visible, use the current engine, otherwise, fall @@ -3211,7 +3211,7 @@ const BrowserSearch = { return document.getElementById("searchbar"); }, - loadAddEngines: function BrowserSearch_loadAddEngines() { + loadAddEngines: function () { var newWindowPref = gPrefService.getIntPref("browser.link.open_newwindow"); var where = newWindowPref == 3 ? "tab" : "window"; var searchEnginesURL = formatURL("browser.search.searchEnginesURL", true); @@ -3637,7 +3637,7 @@ function updateCharacterEncodingMenuState() } } -var XULBrowserWindow = { +var XULBrowserWindow = { // Stored Status, Link and Loading values status: "", defaultStatus: "", @@ -4130,7 +4130,7 @@ var XULBrowserWindow = { }, // simulate all change notifications after switching tabs - onUpdateCurrentBrowser: function XWB_onUpdateCurrentBrowser(aStateFlags, aStatus, aMessage, aTotalProgress) { + onUpdateCurrentBrowser: function (aStateFlags, aStatus, aMessage, aTotalProgress) { if (FullZoom.updateBackgroundTabs) FullZoom.onLocationChange(gBrowser.currentURI, true); var nsIWebProgressListener = Components.interfaces.nsIWebProgressListener; @@ -4654,7 +4654,7 @@ var AudioIndicator = { } var TabsOnTop = { - init: function TabsOnTop_init() { + init: function () { Services.prefs.addObserver(this._prefName, this, false); // Pale Moon: Stop Being a Derp, Mozilla (#3) // Only show the toggle UI if the user disabled tabs on top. @@ -4664,7 +4664,7 @@ var TabsOnTop = { // } }, - uninit: function TabsOnTop_uninit() { + uninit: function () { Services.prefs.removeObserver(this._prefName, this); }, @@ -6940,7 +6940,7 @@ function getBrowser() gBrowser; function getNavToolbox() gNavToolbox; var gPrivateBrowsingUI = { - init: function PBUI_init() { + init: function () { // Do nothing for normal windows if (!PrivateBrowsingUtils.isWindowPrivate(window)) { return; diff --git a/application/palemoon/base/content/nsContextMenu.js b/application/palemoon/base/content/nsContextMenu.js index 916dd2637..43e659375 100644 --- a/application/palemoon/base/content/nsContextMenu.js +++ b/application/palemoon/base/content/nsContextMenu.js @@ -13,7 +13,7 @@ function nsContextMenu(aXulMenu, aIsShift) { // Prototype for nsContextMenu "class." nsContextMenu.prototype = { - initMenu: function CM_initMenu(aXulMenu, aIsShift) { + initMenu: function (aXulMenu, aIsShift) { // Get contextual info. this.setTarget(document.popupNode, document.popupRangeParent, document.popupRangeOffset); @@ -40,14 +40,14 @@ nsContextMenu.prototype = { this.initItems(); }, - hiding: function CM_hiding() { + hiding: function () { gContextMenuContentData = null; InlineSpellCheckerUI.clearSuggestionsFromMenu(); InlineSpellCheckerUI.clearDictionaryListFromMenu(); InlineSpellCheckerUI.uninit(); }, - initItems: function CM_initItems() { + initItems: function () { this.initPageMenuSeparator(); this.initOpenItems(); this.initNavigationItems(); @@ -61,11 +61,11 @@ nsContextMenu.prototype = { this.initClickToPlayItems(); }, - initPageMenuSeparator: function CM_initPageMenuSeparator() { + initPageMenuSeparator: function () { this.showItem("page-menu-separator", this.hasPageMenu); }, - initOpenItems: function CM_initOpenItems() { + initOpenItems: function () { var isMailtoInternal = false; if (this.onMailtoLink) { var mailtoHandler = Cc["@mozilla.org/uriloader/external-protocol-service;1"]. @@ -114,7 +114,7 @@ nsContextMenu.prototype = { this.showItem("context-sep-open", shouldShow); }, - initNavigationItems: function CM_initNavigationItems() { + initNavigationItems: function () { var shouldShow = !(this.isContentSelected || this.onLink || this.onImage || this.onCanvas || this.onVideo || this.onAudio || this.onTextInput); @@ -136,7 +136,7 @@ nsContextMenu.prototype = { //this.setItemAttrFromNode( "context-stop", "disabled", "canStop" ); }, - initLeaveDOMFullScreenItems: function CM_initLeaveFullScreenItem() { + initLeaveDOMFullScreenItems: function () { // only show the option if the user is in DOM fullscreen var shouldShow = (this.target.ownerDocument.mozFullScreenElement != null); this.showItem("context-leave-dom-fullscreen", shouldShow); @@ -146,7 +146,7 @@ nsContextMenu.prototype = { this.showItem("context-media-sep-commands", true); }, - initSaveItems: function CM_initSaveItems() { + initSaveItems: function () { var shouldShow = !(this.onTextInput || this.onLink || this.isContentSelected || this.onImage || this.onCanvas || this.onVideo || this.onAudio); @@ -172,7 +172,7 @@ nsContextMenu.prototype = { this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL); }, - initViewItems: function CM_initViewItems() { + initViewItems: function () { // View source is always OK, unless in directory listing. this.showItem("context-viewpartialsource-selection", this.isContentSelected); @@ -236,7 +236,7 @@ nsContextMenu.prototype = { this.showItem("context-viewimageinfo", this.onImage); }, - initMiscItems: function CM_initMiscItems() { + initMiscItems: function () { // Use "Bookmark This Link" if on a link. this.showItem("context-bookmarkpage", !(this.isContentSelected || this.onTextInput || this.onLink || @@ -426,7 +426,7 @@ nsContextMenu.prototype = { this.showItem("context-sep-ctp", this.onCTPPlugin); }, - inspectNode: function CM_inspectNode() { + inspectNode: function () { let {devtools} = Cu.import("resource://devtools/shared/Loader.jsm", {}); let gBrowser = this.browser.ownerDocument.defaultView.gBrowser; let target = devtools.TargetFactory.forTab(gBrowser.selectedTab); @@ -1027,7 +1027,7 @@ nsContextMenu.prototype = { saveAsListener.prototype = { extListener: null, - onStartRequest: function saveLinkAs_onStartRequest(aRequest, aContext) { + onStartRequest: function (aRequest, aContext) { // if the timer fired, the error status will have been caused by that, // and we'll be restarting in onStopRequest, so no reason to notify @@ -1065,7 +1065,7 @@ nsContextMenu.prototype = { this.extListener.onStartRequest(aRequest, aContext); }, - onStopRequest: function saveLinkAs_onStopRequest(aRequest, aContext, + onStopRequest: function (aRequest, aContext, aStatusCode) { if (aStatusCode == NS_ERROR_SAVE_LINK_AS_TIMEOUT) { // do it the old fashioned way, which will pick the best filename @@ -1076,7 +1076,7 @@ nsContextMenu.prototype = { this.extListener.onStopRequest(aRequest, aContext, aStatusCode); }, - onDataAvailable: function saveLinkAs_onDataAvailable(aRequest, aContext, + onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount) { this.extListener.onDataAvailable(aRequest, aContext, aInputStream, @@ -1086,7 +1086,7 @@ nsContextMenu.prototype = { function callbacks() {} callbacks.prototype = { - getInterface: function sLA_callbacks_getInterface(aIID) { + getInterface: function (aIID) { if (aIID.equals(Ci.nsIAuthPrompt) || aIID.equals(Ci.nsIAuthPrompt2)) { // If the channel demands authentication prompt, we must cancel it // because the save-as-timer would expire and cancel the channel @@ -1105,7 +1105,7 @@ nsContextMenu.prototype = { // we give up waiting for the filename. function timerCallback() {} timerCallback.prototype = { - notify: function sLA_timer_notify(aTimer) { + notify: function (aTimer) { channel.cancel(NS_ERROR_SAVE_LINK_AS_TIMEOUT); return; } @@ -1465,11 +1465,11 @@ nsContextMenu.prototype = { openUILinkIn(uri, where); }, - bookmarkThisPage: function CM_bookmarkThisPage() { + bookmarkThisPage: function () { window.top.PlacesCommandHook.bookmarkPage(this.browser, PlacesUtils.bookmarksMenuFolderId, true); }, - bookmarkLink: function CM_bookmarkLink() { + bookmarkLink: function () { var linkText; // If selected text is found to match valid URL pattern. if (this.onPlainTextLink) @@ -1480,7 +1480,7 @@ nsContextMenu.prototype = { linkText); }, - addBookmarkForFrame: function CM_addBookmarkForFrame() { + addBookmarkForFrame: function () { var doc = this.target.ownerDocument; var uri = doc.documentURIObject; @@ -1507,23 +1507,23 @@ nsContextMenu.prototype = { } }, - savePageAs: function CM_savePageAs() { + savePageAs: function () { saveDocument(this.browser.contentDocument); }, - sendPage: function CM_sendPage() { + sendPage: function () { MailIntegration.sendLinkForWindow(this.browser.contentWindow); }, - printFrame: function CM_printFrame() { + printFrame: function () { PrintUtils.print(this.target.ownerDocument.defaultView); }, - switchPageDirection: function CM_switchPageDirection() { + switchPageDirection: function () { SwitchDocumentDirection(this.browser.contentWindow); }, - mediaCommand : function CM_mediaCommand(command, data) { + mediaCommand : function (command, data) { var media = this.target; switch (command) { diff --git a/application/palemoon/base/content/sanitizeDialog.js b/application/palemoon/base/content/sanitizeDialog.js index 786113288..905c9f207 100644 --- a/application/palemoon/base/content/sanitizeDialog.js +++ b/application/palemoon/base/content/sanitizeDialog.js @@ -589,7 +589,7 @@ var gContiguousSelectionTreeHelper = { * view * @return The new view */ - setTree: function CSTH_setTree(aTreeElement, aProtoTreeView) + setTree: function (aTreeElement, aProtoTreeView) { this._tree = aTreeElement; var newView = this._makeTreeView(aProtoTreeView || aTreeElement.view); @@ -604,7 +604,7 @@ var gContiguousSelectionTreeHelper = { * * @return The row index of the grippy */ - getGrippyRow: function CSTH_getGrippyRow() + getGrippyRow: function () { var sel = this.tree.view.selection; var rangeCount = sel.getRangeCount(); @@ -626,7 +626,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed dragover event */ - ondragover: function CSTH_ondragover(aEvent) + ondragover: function (aEvent) { // Without this when dragging on Windows the mouse cursor is a "no" sign. // This makes it a drop symbol. @@ -653,7 +653,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed dragstart event */ - ondragstart: function CSTH_ondragstart(aEvent) + ondragstart: function (aEvent) { var tbo = this.tree.treeBoxObject; var clickedRow = tbo.getRowAt(aEvent.clientX, aEvent.clientY); @@ -688,7 +688,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed keypress event */ - onkeypress: function CSTH_onkeypress(aEvent) + onkeypress: function (aEvent) { var grippyRow = this.getGrippyRow(); var tbo = this.tree.treeBoxObject; @@ -749,7 +749,7 @@ var gContiguousSelectionTreeHelper = { * @param aEvent * The observed mousedown event */ - onmousedown: function CSTH_onmousedown(aEvent) + onmousedown: function (aEvent) { var tbo = this.tree.treeBoxObject; var clickedRow = tbo.getRowAt(aEvent.clientX, aEvent.clientY); @@ -771,7 +771,7 @@ var gContiguousSelectionTreeHelper = { * @param aEndRow * The range [0, aEndRow] will be selected. */ - rangedSelect: function CSTH_rangedSelect(aEndRow) + rangedSelect: function (aEndRow) { var tbo = this.tree.treeBoxObject; if (aEndRow < 0) @@ -784,7 +784,7 @@ var gContiguousSelectionTreeHelper = { /** * Scrolls the tree so that the grippy row is in the center of the view. */ - scrollToGrippy: function CSTH_scrollToGrippy() + scrollToGrippy: function () { var rowCount = this.tree.view.rowCount; var tbo = this.tree.treeBoxObject; @@ -817,14 +817,14 @@ var gContiguousSelectionTreeHelper = { * @param aProtoTreeView * Used as the new view's prototype if specified */ - _makeTreeView: function CSTH__makeTreeView(aProtoTreeView) + _makeTreeView: function (aProtoTreeView) { var view = aProtoTreeView; var that = this; //XXXadw: When Alex gets the grippy icon done, this may or may not change, // depending on how we style it. - view.isSeparator = function CSTH_View_isSeparator(aRow) + view.isSeparator = function (aRow) { return aRow === that.getGrippyRow(); }; @@ -832,7 +832,7 @@ var gContiguousSelectionTreeHelper = { // rowCount includes the grippy row. view.__defineGetter__("_rowCount", view.__lookupGetter__("rowCount")); view.__defineGetter__("rowCount", - function CSTH_View_rowCount() + function () { return this._rowCount + 1; }); diff --git a/application/palemoon/components/distribution.js b/application/palemoon/components/distribution.js index 121e55b1b..c9ea92845 100644 --- a/application/palemoon/components/distribution.js +++ b/application/palemoon/components/distribution.js @@ -63,12 +63,12 @@ DistributionCustomizer.prototype = { return this._ioSvc; }, - _makeURI: function DIST__makeURI(spec) { + _makeURI: function (spec) { return this._ioSvc.newURI(spec, null, null); }, _parseBookmarksSection: - function DIST_parseBookmarksSection(parentId, section) { + function (parentId, section) { let keys = []; for (let i in enumerate(this._ini.getKeys(section))) keys.push(i); @@ -177,7 +177,7 @@ DistributionCustomizer.prototype = { }, _customizationsApplied: false, - applyCustomizations: function DIST_applyCustomizations() { + applyCustomizations: function () { this._customizationsApplied = true; if (!this._iniFile) return this._checkCustomizationComplete(); @@ -190,7 +190,7 @@ DistributionCustomizer.prototype = { }, _bookmarksApplied: false, - applyBookmarks: function DIST_applyBookmarks() { + applyBookmarks: function () { this._bookmarksApplied = true; if (!this._iniFile) return this._checkCustomizationComplete(); @@ -230,7 +230,7 @@ DistributionCustomizer.prototype = { }, _prefDefaultsApplied: false, - applyPrefDefaults: function DIST_applyPrefDefaults() { + applyPrefDefaults: function () { this._prefDefaultsApplied = true; if (!this._iniFile) return this._checkCustomizationComplete(); @@ -321,7 +321,7 @@ DistributionCustomizer.prototype = { return this._checkCustomizationComplete(); }, - _checkCustomizationComplete: function DIST__checkCustomizationComplete() { + _checkCustomizationComplete: function () { let prefDefaultsApplied = this._prefDefaultsApplied || !this._iniFile; if (this._customizationsApplied && this._bookmarksApplied && prefDefaultsApplied) { diff --git a/application/palemoon/components/downloads/DownloadsCommon.jsm b/application/palemoon/components/downloads/DownloadsCommon.jsm index efe31ce05..afe8361e0 100644 --- a/application/palemoon/components/downloads/DownloadsCommon.jsm +++ b/application/palemoon/components/downloads/DownloadsCommon.jsm @@ -97,7 +97,7 @@ const kPrefBranch = Services.prefs.getBranch("browser.download."); var PrefObserver = { QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]), - getPref: function PO_getPref(name) { + getPref: function (name) { try { switch (typeof this.prefs[name]) { case "boolean": @@ -106,12 +106,12 @@ var PrefObserver = { } catch (ex) { } return this.prefs[name]; }, - observe: function PO_observe(aSubject, aTopic, aData) { + observe: function (aSubject, aTopic, aData) { if (this.prefs.hasOwnProperty(aData)) { return this[aData] = this.getPref(aData); } }, - register: function PO_register(prefs) { + register: function (prefs) { this.prefs = prefs; kPrefBranch.addObserver("", this, true); for (let key in prefs) { @@ -138,9 +138,9 @@ PrefObserver.register({ * and provides shared methods for all the instances of the user interface. */ this.DownloadsCommon = { - log: function DC_log(...aMessageArgs) { + log: function (...aMessageArgs) { delete this.log; - this.log = function DC_log(...aMessageArgs) { + this.log = function (...aMessageArgs) { if (!PrefObserver.debug) { return; } @@ -149,9 +149,9 @@ this.DownloadsCommon = { this.log.apply(this, aMessageArgs); }, - error: function DC_error(...aMessageArgs) { + error: function (...aMessageArgs) { delete this.error; - this.error = function DC_error(...aMessageArgs) { + this.error = function (...aMessageArgs) { if (!PrefObserver.debug) { return; } @@ -205,7 +205,7 @@ this.DownloadsCommon = { * @return Formatted string, for example "30s" or "2h". The returned value is * maximum three characters long, at least in English. */ - formatTimeLeft: function DC_formatTimeLeft(aSeconds) + formatTimeLeft: function (aSeconds) { // Decide what text to show for the time let seconds = Math.round(aSeconds); @@ -259,7 +259,7 @@ this.DownloadsCommon = { * @param aWindow * The browser window which owns the download button. */ - getData: function DC_getData(aWindow) { + getData: function (aWindow) { if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { @@ -277,7 +277,7 @@ this.DownloadsCommon = { * called, and we must ensure to register our listeners before the * getService call for the Download Manager returns. */ - initializeAllDataLinks: function DC_initializeAllDataLinks(aDownloadManagerService) { + initializeAllDataLinks: function (aDownloadManagerService) { DownloadsData.initializeDataLink(aDownloadManagerService); PrivateDownloadsData.initializeDataLink(aDownloadManagerService); }, @@ -286,7 +286,7 @@ this.DownloadsCommon = { * Terminates the data link for both the private and non-private downloads * data objects. */ - terminateAllDataLinks: function DC_terminateAllDataLinks() { + terminateAllDataLinks: function () { DownloadsData.terminateDataLink(); PrivateDownloadsData.terminateDataLink(); }, @@ -299,7 +299,7 @@ this.DownloadsCommon = { * True to load only active downloads from the database. */ ensureAllPersistentDataLoaded: - function DC_ensureAllPersistentDataLoaded(aActiveOnly) { + function (aActiveOnly) { DownloadsData.ensurePersistentDataLoaded(aActiveOnly); }, @@ -308,7 +308,7 @@ this.DownloadsCommon = { * PrivateDownloadsIndicatorData objects, depending on the privacy status of * the window in question. */ - getIndicatorData: function DC_getIndicatorData(aWindow) { + getIndicatorData: function (aWindow) { if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { @@ -326,7 +326,7 @@ this.DownloadsCommon = { * The number of items on the top of the downloads list to exclude * from the summary. */ - getSummary: function DC_getSummary(aWindow, aNumToExclude) + getSummary: function (aWindow, aNumToExclude) { if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { if (this._privateSummary) { @@ -465,7 +465,7 @@ this.DownloadsCommon = { * downloads. This is a floating point value to help get sub-second * accuracy for current and future estimates. */ - smoothSeconds: function DC_smoothSeconds(aSeconds, aLastSeconds) + smoothSeconds: function (aSeconds, aLastSeconds) { // We apply an algorithm similar to the DownloadUtils.getTimeLeft function, // though tailored to a single time estimation for all downloads. We never @@ -503,7 +503,7 @@ this.DownloadsCommon = { * @param aOwnerWindow * the window with which this action is associated. */ - openDownloadedFile: function DC_openDownloadedFile(aFile, aMimeInfo, aOwnerWindow) { + openDownloadedFile: function (aFile, aMimeInfo, aOwnerWindow) { if (!(aFile instanceof Ci.nsIFile)) throw new Error("aFile must be a nsIFile object"); if (aMimeInfo && !(aMimeInfo instanceof Ci.nsIMIMEInfo)) @@ -572,7 +572,7 @@ this.DownloadsCommon = { * @param aFile * a downloaded file. */ - showDownloadedFile: function DC_showDownloadedFile(aFile) { + showDownloadedFile: function (aFile) { if (!(aFile instanceof Ci.nsIFile)) throw new Error("aFile must be a nsIFile object"); try { @@ -669,7 +669,7 @@ DownloadsDataCtor.prototype = { /** * Stops receiving events for current downloads and cancels any pending read. */ - terminateDataLink: function DD_terminateDataLink() + terminateDataLink: function () { Cu.reportError("terminateDataLink not applicable with JS Transfers"); return; @@ -698,7 +698,7 @@ DownloadsDataCtor.prototype = { /** * Asks the back-end to remove finished downloads from the list. */ - removeFinished: function DD_removeFinished() + removeFinished: function () { let promiseList = Downloads.getList(this._isPrivate ? Downloads.PRIVATE : Downloads.PUBLIC); @@ -804,7 +804,7 @@ DownloadsDataCtor.prototype = { * DownloadsView object to be added. This reference must be passed to * removeView before termination. */ - addView: function DD_addView(aView) + addView: function (aView) { this._views.push(aView); this._updateView(aView); @@ -816,7 +816,7 @@ DownloadsDataCtor.prototype = { * @param aView * DownloadsView object to be removed. */ - removeView: function DD_removeView(aView) + removeView: function (aView) { let index = this._views.indexOf(aView); if (index != -1) { @@ -830,7 +830,7 @@ DownloadsDataCtor.prototype = { * @param aView * DownloadsView object to be initialized. */ - _updateView: function DD_updateView(aView) + _updateView: function (aView) { // Indicate to the view that a batch loading operation is in progress. aView.onDataLoadStarting(); @@ -857,7 +857,7 @@ DownloadsDataCtor.prototype = { /** * Clears the loaded data. */ - clear: function DD_clear() + clear: function () { this._terminateDataAccess(); this.dataItems = {}; @@ -890,7 +890,7 @@ DownloadsDataCtor.prototype = { * @return New or existing data item, or null if the item was deleted from the * list of available downloads. */ - _getOrAddDataItem: function DD_getOrAddDataItem(aSource, aMayReuseGUID) + _getOrAddDataItem: function (aSource, aMayReuseGUID) { let downloadGuid = (aSource instanceof Ci.nsIDownload) ? aSource.guid @@ -920,7 +920,7 @@ DownloadsDataCtor.prototype = { * * This method can be called at most once per download identifier. */ - _removeDataItem: function DD_removeDataItem(aDownloadId) + _removeDataItem: function (aDownloadId) { if (aDownloadId in this.dataItems) { let dataItem = this.dataItems[aDownloadId]; @@ -961,7 +961,7 @@ DownloadsDataCtor.prototype = { * True to load only active downloads from the database. */ ensurePersistentDataLoaded: - function DD_ensurePersistentDataLoaded(aActiveOnly) + function (aActiveOnly) { if (this == PrivateDownloadsData) { Cu.reportError("ensurePersistentDataLoaded should not be called on PrivateDownloadsData"); @@ -1022,7 +1022,7 @@ DownloadsDataCtor.prototype = { /** * Cancels any pending data access and ensures views are notified. */ - _terminateDataAccess: function DD_terminateDataAccess() + _terminateDataAccess: function () { if (this._pendingStatement) { this._pendingStatement.cancel(); @@ -1039,7 +1039,7 @@ DownloadsDataCtor.prototype = { ////////////////////////////////////////////////////////////////////////////// //// mozIStorageStatementCallback - handleResult: function DD_handleResult(aResultSet) + handleResult: function (aResultSet) { for (let row = aResultSet.getNextRow(); row; @@ -1051,13 +1051,13 @@ DownloadsDataCtor.prototype = { } }, - handleError: function DD_handleError(aError) + handleError: function (aError) { DownloadsCommon.error("Database statement execution error (", aError.result, "): ", aError.message); }, - handleCompletion: function DD_handleCompletion(aReason) + handleCompletion: function (aReason) { DownloadsCommon.log("Loading all downloads from database completed with reason:", aReason); @@ -1083,7 +1083,7 @@ DownloadsDataCtor.prototype = { ////////////////////////////////////////////////////////////////////////////// //// nsIObserver - observe: function DD_observe(aSubject, aTopic, aData) + observe: function (aSubject, aTopic, aData) { switch (aTopic) { case "download-manager-remove-download-guid": @@ -1121,7 +1121,7 @@ DownloadsDataCtor.prototype = { ////////////////////////////////////////////////////////////////////////////// //// nsIDownloadProgressListener - onDownloadStateChange: function DD_onDownloadStateChange(aOldState, aDownload) + onDownloadStateChange: function (aOldState, aDownload) { if (aDownload.isPrivate != this._isPrivate) { // Ignore the downloads with a privacy status other than what we are @@ -1202,7 +1202,7 @@ DownloadsDataCtor.prototype = { } }, - onProgressChange: function DD_onProgressChange(aWebProgress, aRequest, + onProgressChange: function (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, @@ -1259,7 +1259,7 @@ DownloadsDataCtor.prototype = { * @param aType * Set to "start" for new downloads, "finish" for completed downloads. */ - _notifyDownloadEvent: function DD_notifyDownloadEvent(aType) + _notifyDownloadEvent: function (aType) { DownloadsCommon.log("Attempting to notify that a new download has started or finished."); if (DownloadsCommon.useToolkitUI) { @@ -1329,7 +1329,7 @@ const DownloadsViewPrototype = { * View object to be added. This reference must be * passed to removeView before termination. */ - addView: function DVP_addView(aView) + addView: function (aView) { // Start receiving events when the first of our views is registered. if (this._views.length == 0) { @@ -1350,7 +1350,7 @@ const DownloadsViewPrototype = { * @param aView * View object to be updated. */ - refreshView: function DVP_refreshView(aView) + refreshView: function (aView) { // Update immediately even if we are still loading data asynchronously. // Subclasses must provide these two functions! @@ -1364,7 +1364,7 @@ const DownloadsViewPrototype = { * @param aView * View object to be removed. */ - removeView: function DVP_removeView(aView) + removeView: function (aView) { let index = this._views.indexOf(aView); if (index != -1) { @@ -1392,7 +1392,7 @@ const DownloadsViewPrototype = { /** * Called before multiple downloads are about to be loaded. */ - onDataLoadStarting: function DVP_onDataLoadStarting() + onDataLoadStarting: function () { this._loading = true; }, @@ -1400,7 +1400,7 @@ const DownloadsViewPrototype = { /** * Called after data loading finished. */ - onDataLoadCompleted: function DVP_onDataLoadCompleted() + onDataLoadCompleted: function () { this._loading = false; }, @@ -1412,7 +1412,7 @@ const DownloadsViewPrototype = { * * @note Subclasses should override this. */ - onDataInvalidated: function DVP_onDataInvalidated() + onDataInvalidated: function () { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; }, @@ -1481,7 +1481,7 @@ const DownloadsViewPrototype = { * * @note Subclasses should override this. */ - _refreshProperties: function DID_refreshProperties() + _refreshProperties: function () { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; }, @@ -1491,7 +1491,7 @@ const DownloadsViewPrototype = { * * @note Subclasses should override this. */ - _updateView: function DID_updateView() + _updateView: function () { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; } @@ -1523,7 +1523,7 @@ DownloadsIndicatorDataCtor.prototype = { * @param aView * DownloadsIndicatorView object to be removed. */ - removeView: function DID_removeView(aView) + removeView: function (aView) { DownloadsViewPrototype.removeView.call(this, aView); @@ -1535,7 +1535,7 @@ DownloadsIndicatorDataCtor.prototype = { ////////////////////////////////////////////////////////////////////////////// //// Callback functions from DownloadsData - onDataLoadCompleted: function DID_onDataLoadCompleted() + onDataLoadCompleted: function () { DownloadsViewPrototype.onDataLoadCompleted.call(this); this._updateViews(); @@ -1546,7 +1546,7 @@ DownloadsIndicatorDataCtor.prototype = { * entered Private Browsing Mode and the database backend changed). * References to existing data should be discarded. */ - onDataInvalidated: function DID_onDataInvalidated() + onDataInvalidated: function () { this._itemCount = 0; }, @@ -1612,7 +1612,7 @@ DownloadsIndicatorDataCtor.prototype = { /** * Computes aggregate values and propagates the changes to our views. */ - _updateViews: function DID_updateViews() + _updateViews: function () { // Do not update the status indicators during batch loads of download items. if (this._loading) { @@ -1629,7 +1629,7 @@ DownloadsIndicatorDataCtor.prototype = { * @param aView * DownloadsIndicatorView object to be updated. */ - _updateView: function DID_updateView(aView) + _updateView: function (aView) { aView.hasDownloads = this._hasDownloads; aView.counter = this._counter; @@ -1681,7 +1681,7 @@ DownloadsIndicatorDataCtor.prototype = { /** * Computes aggregate values based on the current state of downloads. */ - _refreshProperties: function DID_refreshProperties() + _refreshProperties: function () { let summary = DownloadsCommon.summarizeDownloads(this._activeDownloads()); @@ -1780,7 +1780,7 @@ DownloadsSummaryData.prototype = { * @param aView * DownloadsSummary view to be removed. */ - removeView: function DSD_removeView(aView) + removeView: function (aView) { DownloadsViewPrototype.removeView.call(this, aView); @@ -1796,13 +1796,13 @@ DownloadsSummaryData.prototype = { //// DownloadsViewPrototype for more information on what these functions //// are used for. - onDataLoadCompleted: function DSD_onDataLoadCompleted() + onDataLoadCompleted: function () { DownloadsViewPrototype.onDataLoadCompleted.call(this); this._updateViews(); }, - onDataInvalidated: function DSD_onDataInvalidated() + onDataInvalidated: function () { this._dataItems = []; }, @@ -1839,7 +1839,7 @@ DownloadsSummaryData.prototype = { /** * Computes aggregate values and propagates the changes to our views. */ - _updateViews: function DSD_updateViews() + _updateViews: function () { // Do not update the status indicators during batch loads of download items. if (this._loading) { @@ -1856,7 +1856,7 @@ DownloadsSummaryData.prototype = { * @param aView * DownloadsIndicatorView object to be updated. */ - _updateView: function DSD_updateView(aView) + _updateView: function (aView) { aView.showingProgress = this._showingProgress; aView.percentComplete = this._percentComplete; @@ -1885,7 +1885,7 @@ DownloadsSummaryData.prototype = { /** * Computes aggregate values based on the current state of downloads. */ - _refreshProperties: function DSD_refreshProperties() + _refreshProperties: function () { // Pre-load summary with default values. let summary = diff --git a/application/palemoon/components/downloads/DownloadsLogger.jsm b/application/palemoon/components/downloads/DownloadsLogger.jsm index 1218539c9..52572781a 100644 --- a/application/palemoon/components/downloads/DownloadsLogger.jsm +++ b/application/palemoon/components/downloads/DownloadsLogger.jsm @@ -24,7 +24,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); this.DownloadsLogger = { - _generateLogMessage: function _generateLogMessage(args) { + _generateLogMessage: function (args) { // create a string representation of a list of arbitrary things let strings = []; @@ -51,7 +51,7 @@ this.DownloadsLogger = { * * Enable with about:config pref browser.download.debug */ - log: function DL_log(...args) { + log: function (...args) { let output = this._generateLogMessage(args); dump(output + "\n"); @@ -63,7 +63,7 @@ this.DownloadsLogger = { * reportError() - report an error through component utils as well as * our log function */ - reportError: function DL_reportError(...aArgs) { + reportError: function (...aArgs) { // Report the error in the browser let output = this._generateLogMessage(aArgs); Cu.reportError(output); diff --git a/application/palemoon/components/downloads/DownloadsStartup.js b/application/palemoon/components/downloads/DownloadsStartup.js index e1dd207ef..e2715e1ea 100644 --- a/application/palemoon/components/downloads/DownloadsStartup.js +++ b/application/palemoon/components/downloads/DownloadsStartup.js @@ -82,7 +82,7 @@ DownloadsStartup.prototype = { ////////////////////////////////////////////////////////////////////////////// //// nsIObserver - observe: function DS_observe(aSubject, aTopic, aData) + observe: function (aSubject, aTopic, aData) { switch (aTopic) { case "profile-after-change": @@ -259,7 +259,7 @@ DownloadsStartup.prototype = { /** * Ensures that persistent download data is reloaded at the appropriate time. */ - _ensureDataLoaded: function DS_ensureDataLoaded() + _ensureDataLoaded: function () { if (!this._downloadsServiceInitialized) { return; diff --git a/application/palemoon/components/downloads/DownloadsUI.js b/application/palemoon/components/downloads/DownloadsUI.js index afdbda834..d6493a78a 100644 --- a/application/palemoon/components/downloads/DownloadsUI.js +++ b/application/palemoon/components/downloads/DownloadsUI.js @@ -60,7 +60,7 @@ DownloadsUI.prototype = { ////////////////////////////////////////////////////////////////////////////// //// nsIDownloadManagerUI - show: function DUI_show(aWindowContext, aDownload, aReason, aUsePrivateUI) + show: function (aWindowContext, aDownload, aReason, aUsePrivateUI) { if (DownloadsCommon.useToolkitUI && !PrivateBrowsingUtils.isWindowPrivate(aWindowContext)) { this._toolkitUI.show(aWindowContext, aDownload, aReason, aUsePrivateUI); @@ -101,7 +101,7 @@ DownloadsUI.prototype = { return DownloadsCommon.useToolkitUI ? this._toolkitUI.visible : true; }, - getAttention: function DUI_getAttention() + getAttention: function () { if (DownloadsCommon.useToolkitUI) { this._toolkitUI.getAttention(); @@ -112,7 +112,7 @@ DownloadsUI.prototype = { * Helper function that opens the download manager UI. */ _showDownloadManagerUI: - function DUI_showDownloadManagerUI(aWindowContext, aUsePrivateUI) + function (aWindowContext, aUsePrivateUI) { // If we weren't given a window context, try to find a browser window // to use as our parent - and if that doesn't work, error out and give up. diff --git a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js index 4830f2128..ce6deca72 100644 --- a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js +++ b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js @@ -213,7 +213,7 @@ HistoryDownloadElementShell.prototype = { * be activated when entering the visible area. Session downloads are always * active. */ - ensureActive: function DES_ensureActive() { + ensureActive: function () { if (!this._active) { this._active = true; this.element.setAttribute("active", true); @@ -305,7 +305,7 @@ HistoryDownloadElementShell.prototype = { }, /* nsIController */ - isCommandEnabled: function DES_isCommandEnabled(aCommand) { + isCommandEnabled: function (aCommand) { // The only valid command for inactive elements is cmd_delete. if (!this.active && aCommand != "cmd_delete") return false; @@ -340,7 +340,7 @@ HistoryDownloadElementShell.prototype = { }, /* nsIController */ - doCommand: function DES_doCommand(aCommand) { + doCommand: function (aCommand) { switch (aCommand) { case "downloadsCmd_open": { let file = new FileUtils.File(this.download.target.path); @@ -391,7 +391,7 @@ HistoryDownloadElementShell.prototype = { // Returns whether or not the download handled by this shell should // show up in the search results for the given term. Both the display // name for the download and the url are searched. - matchesSearchTerm: function DES_matchesSearchTerm(aTerm) { + matchesSearchTerm: function (aTerm) { if (!aTerm) return true; aTerm = aTerm.toLowerCase(); @@ -401,7 +401,7 @@ HistoryDownloadElementShell.prototype = { // Handles return keypress on the element (the keypress listener is // set in the DownloadsPlacesView object). - doDefaultCommand: function DES_doDefaultCommand() { + doDefaultCommand: function () { function getDefaultCommandForState(aState) { switch (aState) { case nsIDM.DOWNLOAD_FINISHED: @@ -435,7 +435,7 @@ HistoryDownloadElementShell.prototype = { * existence of the target file already, we can do it now and then update * the commands as needed. */ - onSelect: function DES_onSelect() { + onSelect: function () { if (!this.active) return; @@ -775,7 +775,7 @@ DownloadsPlacesView.prototype = { } }, - _removeElement: function DPV__removeElement(aElement) { + _removeElement: function (aElement) { // If the element was selected exclusively, select its next // sibling first, if not, try for previous sibling, if any. if ((aElement.nextSibling || aElement.previousSibling) && @@ -796,7 +796,7 @@ DownloadsPlacesView.prototype = { }, _removeHistoryDownloadFromView: - function DPV__removeHistoryDownloadFromView(aPlacesNode) { + function (aPlacesNode) { let downloadURI = aPlacesNode.uri; let shellsForURI = this._downloadElementsShellsForURI.get(downloadURI); if (shellsForURI) { @@ -857,7 +857,7 @@ DownloadsPlacesView.prototype = { }, _ensureVisibleElementsAreActive: - function DPV__ensureVisibleElementsAreActive() { + function () { if (!this.active || this._ensureVisibleTimer || !this._richlistbox.firstChild) return; @@ -964,12 +964,12 @@ DownloadsPlacesView.prototype = { get hasSelection() this.selectedNodes.length > 0, containerStateChanged: - function DPV_containerStateChanged(aNode, aOldState, aNewState) { + function (aNode, aOldState, aNewState) { this.invalidateContainer(aNode) }, invalidateContainer: - function DPV_invalidateContainer(aContainer) { + function (aContainer) { if (aContainer != this._resultNode) throw new Error("Unexpected container node"); if (!aContainer.containerOpen) @@ -1015,7 +1015,7 @@ DownloadsPlacesView.prototype = { goUpdateDownloadCommands(); }, - _appendDownloadsFragment: function DPV__appendDownloadsFragment(aDOMFragment) { + _appendDownloadsFragment: function (aDOMFragment) { // Workaround multiple reflows hang by removing the richlistbox // and adding it back when we're done. @@ -1037,11 +1037,11 @@ DownloadsPlacesView.prototype = { } }, - nodeInserted: function DPV_nodeInserted(aParent, aPlacesNode) { + nodeInserted: function (aParent, aPlacesNode) { this._addDownloadData(null, aPlacesNode); }, - nodeRemoved: function DPV_nodeRemoved(aParent, aPlacesNode, aOldIndex) { + nodeRemoved: function (aParent, aPlacesNode, aOldIndex) { this._removeHistoryDownloadFromView(aPlacesNode); }, @@ -1086,7 +1086,7 @@ DownloadsPlacesView.prototype = { * data is done loading. However, if the selection has changed in-between, * we assume the user has already started using the view and give up. */ - _ensureInitialSelection: function DPV__ensureInitialSelection() { + _ensureInitialSelection: function () { // Either they're both null, or the selection has not changed in between. if (this._richlistbox.selectedItem == this._initiallySelectedElement) { let firstDownloadElement = this._richlistbox.firstChild; @@ -1106,7 +1106,7 @@ DownloadsPlacesView.prototype = { }, onDataLoadStarting: function() { }, - onDataLoadCompleted: function DPV_onDataLoadCompleted() { + onDataLoadCompleted: function () { this._ensureInitialSelection(); }, @@ -1126,7 +1126,7 @@ DownloadsPlacesView.prototype = { this._removeSessionDownloadFromView(download); }, - supportsCommand: function DPV_supportsCommand(aCommand) { + supportsCommand: function (aCommand) { if (DOWNLOAD_VIEW_SUPPORTED_COMMANDS.indexOf(aCommand) != -1) { // The clear-downloads command may be performed by the toolbar-button, // which can be focused on OS X. Thus enable this command even if the @@ -1144,7 +1144,7 @@ DownloadsPlacesView.prototype = { return false; }, - isCommandEnabled: function DPV_isCommandEnabled(aCommand) { + isCommandEnabled: function (aCommand) { switch (aCommand) { case "cmd_copy": return this._richlistbox.selectedItems.length > 0; @@ -1161,7 +1161,7 @@ DownloadsPlacesView.prototype = { } }, - _canClearDownloads: function DPV__canClearDownloads() { + _canClearDownloads: function () { // Downloads can be cleared if there's at least one removable download in // the list (either a history download or a completed session download). // Because history downloads are always removable and are listed after the @@ -1177,7 +1177,7 @@ DownloadsPlacesView.prototype = { }, _copySelectedDownloadsToClipboard: - function DPV__copySelectedDownloadsToClipboard() { + function () { let urls = [for (element of this._richlistbox.selectedItems) element._shell.download.source.url]; @@ -1186,7 +1186,7 @@ DownloadsPlacesView.prototype = { .copyString(urls.join("\n"), document); }, - _getURLFromClipboardData: function DPV__getURLFromClipboardData() { + _getURLFromClipboardData: function () { let trans = Cc["@mozilla.org/widget/transferable;1"]. createInstance(Ci.nsITransferable); trans.init(null); @@ -1210,19 +1210,19 @@ DownloadsPlacesView.prototype = { return ["", ""]; }, - _canDownloadClipboardURL: function DPV__canDownloadClipboardURL() { + _canDownloadClipboardURL: function () { let [url, name] = this._getURLFromClipboardData(); return url != ""; }, - _downloadURLFromClipboard: function DPV__downloadURLFromClipboard() { + _downloadURLFromClipboard: function () { let [url, name] = this._getURLFromClipboardData(); let browserWin = RecentWindow.getMostRecentBrowserWindow(); let initiatingDoc = browserWin ? browserWin.document : document; DownloadURL(url, name, initiatingDoc); }, - doCommand: function DPV_doCommand(aCommand) { + doCommand: function (aCommand) { // Commands may be invoked with keyboard shortcuts even if disabled. if (!this.isCommandEnabled(aCommand)) { return; @@ -1263,7 +1263,7 @@ DownloadsPlacesView.prototype = { onEvent: function() { }, - onContextMenu: function DPV_onContextMenu(aEvent) + onContextMenu: function (aEvent) { let element = this._richlistbox.selectedItem; if (!element || !element._shell) @@ -1283,7 +1283,7 @@ DownloadsPlacesView.prototype = { return true; }, - onKeyPress: function DPV_onKeyPress(aEvent) { + onKeyPress: function (aEvent) { let selectedElements = this._richlistbox.selectedItems; if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN) { // In the content tree, opening bookmarks by pressing return is only @@ -1304,7 +1304,7 @@ DownloadsPlacesView.prototype = { } }, - onDoubleClick: function DPV_onDoubleClick(aEvent) { + onDoubleClick: function (aEvent) { if (aEvent.button != 0) return; @@ -1317,11 +1317,11 @@ DownloadsPlacesView.prototype = { element._shell.doDefaultCommand(); }, - onScroll: function DPV_onScroll() { + onScroll: function () { this._ensureVisibleElementsAreActive(); }, - onSelect: function DPV_onSelect() { + onSelect: function () { goUpdateDownloadCommands(); let selectedElements = this._richlistbox.selectedItems; @@ -1331,7 +1331,7 @@ DownloadsPlacesView.prototype = { } }, - onDragStart: function DPV_onDragStart(aEvent) { + onDragStart: function (aEvent) { // TODO Bug 831358: Support d&d for multiple selection. // For now, we just drag the first element. let selectedItem = this._richlistbox.selectedItem; @@ -1357,7 +1357,7 @@ DownloadsPlacesView.prototype = { dt.addElement(selectedItem); }, - onDragOver: function DPV_onDragOver(aEvent) { + onDragOver: function (aEvent) { let types = aEvent.dataTransfer.types; if (types.contains("text/uri-list") || types.contains("text/x-moz-url") || @@ -1366,7 +1366,7 @@ DownloadsPlacesView.prototype = { } }, - onDrop: function DPV_onDrop(aEvent) { + onDrop: function (aEvent) { let dt = aEvent.dataTransfer; // If dragged item is from our source, do not try to // redownload already downloaded file. diff --git a/application/palemoon/components/downloads/content/contentAreaDownloadsView.js b/application/palemoon/components/downloads/content/contentAreaDownloadsView.js index fbb18ab04..2a43246cc 100644 --- a/application/palemoon/components/downloads/content/contentAreaDownloadsView.js +++ b/application/palemoon/components/downloads/content/contentAreaDownloadsView.js @@ -5,7 +5,7 @@ Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm"); var ContentAreaDownloadsView = { - init: function CADV_init() { + init: function () { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows if (!PrivateBrowsingUtils.isWindowPrivate(window)) { diff --git a/application/palemoon/components/downloads/content/downloads.js b/application/palemoon/components/downloads/content/downloads.js index ee1c6902e..2c935ba65 100644 --- a/application/palemoon/components/downloads/content/downloads.js +++ b/application/palemoon/components/downloads/content/downloads.js @@ -122,7 +122,7 @@ const DownloadsPanel = { * @param aCallback * Called when initialization is complete. */ - initialize: function DP_initialize(aCallback) + initialize: function (aCallback) { DownloadsCommon.log("Attempting to initialize DownloadsPanel for a window."); if (this._state != this.kStateUninitialized) { @@ -164,7 +164,7 @@ const DownloadsPanel = { * downloads. The downloads panel can be reopened later, even after this * function has been called. */ - terminate: function DP_terminate() + terminate: function () { DownloadsCommon.log("Attempting to terminate DownloadsPanel for a window."); if (this._state == this.kStateUninitialized) { @@ -214,7 +214,7 @@ const DownloadsPanel = { * initialized the first time this method is called, and the panel is shown * only when data is ready. */ - showPanel: function DP_showPanel() + showPanel: function () { DownloadsCommon.log("Opening the downloads panel."); @@ -240,7 +240,7 @@ const DownloadsPanel = { * Hides the downloads panel, if visible, but keeps the internal state so that * the panel can be reopened quickly if required. */ - hidePanel: function DP_hidePanel() + hidePanel: function () { DownloadsCommon.log("Closing the downloads panel."); @@ -297,7 +297,7 @@ const DownloadsPanel = { * Handles the mousemove event for the panel, which disables focusring * visualization. */ - handleEvent: function DP_handleEvent(aEvent) + handleEvent: function (aEvent) { if (aEvent.type == "mousemove") { this.keyFocusing = false; @@ -310,7 +310,7 @@ const DownloadsPanel = { /** * Called after data loading finished. */ - onViewLoadCompleted: function DP_onViewLoadCompleted() + onViewLoadCompleted: function () { this._openPopupIfDataReady(); }, @@ -318,13 +318,13 @@ const DownloadsPanel = { ////////////////////////////////////////////////////////////////////////////// //// User interface event functions - onWindowUnload: function DP_onWindowUnload() + onWindowUnload: function () { // This function is registered as an event listener, we can't use "this". DownloadsPanel.terminate(); }, - onPopupShown: function DP_onPopupShown(aEvent) + onPopupShown: function (aEvent) { // Ignore events raised by nested popups. if (aEvent.target != aEvent.currentTarget) { @@ -346,7 +346,7 @@ const DownloadsPanel = { this._focusPanel(); }, - onPopupHidden: function DP_onPopupHidden(aEvent) + onPopupHidden: function (aEvent) { // Ignore events raised by nested popups. if (aEvent.target != aEvent.currentTarget) { @@ -375,7 +375,7 @@ const DownloadsPanel = { /** * Shows or focuses the user interface dedicated to downloads history. */ - showDownloadsHistory: function DP_showDownloadsHistory() + showDownloadsHistory: function () { DownloadsCommon.log("Showing download history."); // Hide the panel before showing another window, otherwise focus will return @@ -393,7 +393,7 @@ const DownloadsPanel = { * removed in _unattachEventListeners. This is called automatically after the * panel has successfully loaded. */ - _attachEventListeners: function DP__attachEventListeners() + _attachEventListeners: function () { // Handle keydown to support accel-V. this.panel.addEventListener("keydown", this._onKeyDown.bind(this), false); @@ -406,7 +406,7 @@ const DownloadsPanel = { * Unattach event listeners that were added in _attachEventListeners. This * is called automatically on panel termination. */ - _unattachEventListeners: function DP__unattachEventListeners() + _unattachEventListeners: function () { this.panel.removeEventListener("keydown", this._onKeyDown.bind(this), false); @@ -414,7 +414,7 @@ const DownloadsPanel = { false); }, - _onKeyPress: function DP__onKeyPress(aEvent) + _onKeyPress: function (aEvent) { // Handle unmodified keys only. if (aEvent.altKey || aEvent.ctrlKey || aEvent.shiftKey || aEvent.metaKey) { @@ -462,7 +462,7 @@ const DownloadsPanel = { * as the the accel-V "paste" event, which initiates a file download if the * pasted item can be resolved to a URI. */ - _onKeyDown: function DP__onKeyDown(aEvent) + _onKeyDown: function (aEvent) { // If the footer is focused and the downloads list has at least 1 element // in it, focus the last element in the list when going up. @@ -516,7 +516,7 @@ const DownloadsPanel = { * Move focus to the main element in the downloads panel, unless another * element in the panel is already focused. */ - _focusPanel: function DP_focusPanel() + _focusPanel: function () { // We may be invoked while the panel is still waiting to be shown. if (this._state != this.kStateShown) { @@ -539,7 +539,7 @@ const DownloadsPanel = { /** * Opens the downloads panel when data is ready to be displayed. */ - _openPopupIfDataReady: function DP_openPopupIfDataReady() + _openPopupIfDataReady: function () { // We don't want to open the popup if we already displayed it, or if we are // still loading data. @@ -627,7 +627,7 @@ const DownloadsOverlayLoader = { * Invoked when loading is completed. If the overlay is already * loaded, the function is called immediately. */ - ensureOverlayLoaded: function DOL_ensureOverlayLoaded(aOverlay, aCallback) + ensureOverlayLoaded: function (aOverlay, aCallback) { // The overlay is already loaded, invoke the callback immediately. if (aOverlay in this._loadedOverlays) { @@ -663,7 +663,7 @@ const DownloadsOverlayLoader = { * and/or loading more overlays as needed. In most cases, there will be a * single request for one overlay, that will be processed immediately. */ - processPendingRequests: function DOL_processPendingRequests() + processPendingRequests: function () { // Re-process all the currently pending requests, yet allow more requests // to be appended at the end of the array if we're not ready for them. @@ -721,7 +721,7 @@ const DownloadsView = { /** * Called when the number of items in the list changes. */ - _itemCountChanged: function DV_itemCountChanged() + _itemCountChanged: function () { DownloadsCommon.log("The downloads item count has changed - we are tracking", this._downloads.length, "downloads in total."); @@ -766,7 +766,7 @@ const DownloadsView = { /** * Called before multiple downloads are about to be loaded. */ - onDataLoadStarting: function DV_onDataLoadStarting() + onDataLoadStarting: function () { DownloadsCommon.log("onDataLoadStarting called for DownloadsView."); this.loading = true; @@ -775,7 +775,7 @@ const DownloadsView = { /** * Called after data loading finished. */ - onDataLoadCompleted: function DV_onDataLoadCompleted() + onDataLoadCompleted: function () { DownloadsCommon.log("onDataLoadCompleted called for DownloadsView."); @@ -795,7 +795,7 @@ const DownloadsView = { * entering Private Browsing Mode). References to existing data should be * discarded. */ - onDataInvalidated: function DV_onDataInvalidated() + onDataInvalidated: function () { DownloadsCommon.log("Downloads data has been invalidated. Cleaning up", "DownloadsView."); @@ -952,7 +952,7 @@ const DownloadsView = { * @param aCommand * The command to be performed. */ - onDownloadCommand: function DV_onDownloadCommand(aEvent, aCommand) + onDownloadCommand: function (aEvent, aCommand) { let target = aEvent.target; while (target.nodeName != "richlistitem") { @@ -961,7 +961,7 @@ const DownloadsView = { DownloadsView.controllerForElement(target).doCommand(aCommand); }, - onDownloadClick: function DV_onDownloadClick(aEvent) + onDownloadClick: function (aEvent) { // Handle primary clicks only, and exclude the action button. if (aEvent.button == 0 && @@ -973,7 +973,7 @@ const DownloadsView = { /** * Handles keypress events on a download item. */ - onDownloadKeyPress: function DV_onDownloadKeyPress(aEvent) + onDownloadKeyPress: function (aEvent) { // Pressing the key on buttons should not invoke the action because the // event has already been handled by the button itself. @@ -997,12 +997,12 @@ const DownloadsView = { /** * Mouse listeners to handle selection on hover. */ - onDownloadMouseOver: function DV_onDownloadMouseOver(aEvent) + onDownloadMouseOver: function (aEvent) { if (aEvent.originalTarget.parentNode == this.richListBox) this.richListBox.selectedItem = aEvent.originalTarget; }, - onDownloadMouseOut: function DV_onDownloadMouseOut(aEvent) + onDownloadMouseOut: function (aEvent) { if (aEvent.originalTarget.parentNode == this.richListBox) { // If the destination element is outside of the richlistitem, clear the @@ -1016,7 +1016,7 @@ const DownloadsView = { } }, - onDownloadContextMenu: function DV_onDownloadContextMenu(aEvent) + onDownloadContextMenu: function (aEvent) { let element = this.richListBox.selectedItem; if (!element) { @@ -1030,7 +1030,7 @@ const DownloadsView = { contextMenu.setAttribute("state", element.getAttribute("state")); }, - onDownloadDragStart: function DV_onDownloadDragStart(aEvent) + onDownloadDragStart: function (aEvent) { let element = this.richListBox.selectedItem; if (!element) { @@ -1113,12 +1113,12 @@ const DownloadsViewController = { ////////////////////////////////////////////////////////////////////////////// //// Initialization and termination - initialize: function DVC_initialize() + initialize: function () { window.controllers.insertControllerAt(0, this); }, - terminate: function DVC_terminate() + terminate: function () { window.controllers.removeController(this); }, @@ -1126,7 +1126,7 @@ const DownloadsViewController = { ////////////////////////////////////////////////////////////////////////////// //// nsIController - supportsCommand: function DVC_supportsCommand(aCommand) + supportsCommand: function (aCommand) { // Firstly, determine if this is a command that we can handle. if (!(aCommand in this.commands) && @@ -1143,7 +1143,7 @@ const DownloadsViewController = { return !!element; }, - isCommandEnabled: function DVC_isCommandEnabled(aCommand) + isCommandEnabled: function (aCommand) { // Handle commands that are not selection-specific. if (aCommand == "downloadsCmd_clearList") { @@ -1156,7 +1156,7 @@ const DownloadsViewController = { .isCommandEnabled(aCommand); }, - doCommand: function DVC_doCommand(aCommand) + doCommand: function (aCommand) { // If this command is not selection-specific, execute it. if (aCommand in this.commands) { @@ -1177,7 +1177,7 @@ const DownloadsViewController = { ////////////////////////////////////////////////////////////////////////////// //// Other functions - updateCommands: function DVC_updateCommands() + updateCommands: function () { Object.keys(this.commands).forEach(goUpdateCommand); Object.keys(DownloadsViewItemController.prototype.commands) @@ -1192,7 +1192,7 @@ const DownloadsViewController = { * the currently selected item in the list. */ commands: { - downloadsCmd_clearList: function DVC_downloadsCmd_clearList() + downloadsCmd_clearList: function () { DownloadsCommon.getData(window).removeFinished(); } @@ -1213,7 +1213,7 @@ function DownloadsViewItemController(download) { } DownloadsViewItemController.prototype = { - isCommandEnabled: function DVIC_isCommandEnabled(aCommand) + isCommandEnabled: function (aCommand) { switch (aCommand) { case "downloadsCmd_open": { @@ -1252,7 +1252,7 @@ DownloadsViewItemController.prototype = { return false; }, - doCommand: function DVIC_doCommand(aCommand) + doCommand: function (aCommand) { if (this.isCommandEnabled(aCommand)) { this.commands[aCommand].apply(this); @@ -1268,20 +1268,20 @@ DownloadsViewItemController.prototype = { * In commands, the "this" identifier points to the controller item. */ commands: { - cmd_delete: function DVIC_cmd_delete() + cmd_delete: function () { DownloadsCommon.removeAndFinalizeDownload(this.download); PlacesUtils.bhistory.removePage( NetUtil.newURI(this.download.source.url)); }, - downloadsCmd_cancel: function DVIC_downloadsCmd_cancel() + downloadsCmd_cancel: function () { this.download.cancel().catch(() => {}); this.download.removePartialData().catch(Cu.reportError); }, - downloadsCmd_open: function DVIC_downloadsCmd_open() + downloadsCmd_open: function () { this.download.launch().catch(Cu.reportError); @@ -1293,7 +1293,7 @@ DownloadsViewItemController.prototype = { DownloadsPanel.hidePanel(); }, - downloadsCmd_show: function DVIC_downloadsCmd_show() + downloadsCmd_show: function () { let file = new FileUtils.File(this.download.target.path); DownloadsCommon.showDownloadedFile(file); @@ -1306,7 +1306,7 @@ DownloadsViewItemController.prototype = { DownloadsPanel.hidePanel(); }, - downloadsCmd_pauseResume: function DVIC_downloadsCmd_pauseResume() + downloadsCmd_pauseResume: function () { if (this.download.stopped) { this.download.start(); @@ -1315,24 +1315,24 @@ DownloadsViewItemController.prototype = { } }, - downloadsCmd_retry: function DVIC_downloadsCmd_retry() + downloadsCmd_retry: function () { this.download.start().catch(() => {}); }, - downloadsCmd_openReferrer: function DVIC_downloadsCmd_openReferrer() + downloadsCmd_openReferrer: function () { openURL(this.download.source.referrer); }, - downloadsCmd_copyLocation: function DVIC_downloadsCmd_copyLocation() + downloadsCmd_copyLocation: function () { let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"] .getService(Ci.nsIClipboardHelper); clipboard.copyString(this.download.source.url, document); }, - downloadsCmd_doDefault: function DVIC_downloadsCmd_doDefault() + downloadsCmd_doDefault: function () { const nsIDM = Ci.nsIDownloadManager; @@ -1478,7 +1478,7 @@ const DownloadsSummary = { * @param aEvent * The keydown event being handled. */ - onKeyDown: function DS_onKeyDown(aEvent) + onKeyDown: function (aEvent) { if (aEvent.charCode == " ".charCodeAt(0) || aEvent.keyCode == KeyEvent.DOM_VK_ENTER || @@ -1493,7 +1493,7 @@ const DownloadsSummary = { * @param aEvent * The click event being handled. */ - onClick: function DS_onClick(aEvent) + onClick: function (aEvent) { DownloadsPanel.showDownloadsHistory(); }, @@ -1569,7 +1569,7 @@ const DownloadsFooter = { * is visible, focus it. If not, focus the "Show All Downloads" * button. */ - focus: function DF_focus() + focus: function () { if (this._showingSummary) { DownloadsSummary.focus(); diff --git a/application/palemoon/components/downloads/content/indicator.js b/application/palemoon/components/downloads/content/indicator.js index 1a2175a92..7503f7d04 100644 --- a/application/palemoon/components/downloads/content/indicator.js +++ b/application/palemoon/components/downloads/content/indicator.js @@ -59,7 +59,7 @@ const DownloadsButton = { * startup time, and in particular should not cause the Download Manager * service to start. */ - initializeIndicator: function DB_initializeIndicator() + initializeIndicator: function () { this._update(); }, @@ -77,7 +77,7 @@ const DownloadsButton = { * placeholder is an ordinary button defined in the browser window that can be * moved freely between the toolbars and the customization palette. */ - customizeStart: function DB_customizeStart() + customizeStart: function () { // Hide the indicator and prevent it to be displayed as a temporary anchor // during customization, even if requested using the getAnchor method. @@ -98,7 +98,7 @@ const DownloadsButton = { /** * This function is called when toolbar customization ends. */ - customizeDone: function DB_customizeDone() + customizeDone: function () { this._customizing = false; this._update(); @@ -114,7 +114,7 @@ const DownloadsButton = { * input/output it performs, and in particular should not cause the * Download Manager service to start. */ - _update: function DB_update() { + _update: function () { this._updatePositionInternal(); if (!DownloadsCommon.useToolkitUI) { @@ -131,7 +131,7 @@ const DownloadsButton = { * that the panel doesn't flicker because we move the DOM element to which * it's anchored. */ - updatePosition: function DB_updatePosition() + updatePosition: function () { if (!this._anchorRequested) { this._updatePositionInternal(); @@ -144,7 +144,7 @@ const DownloadsButton = { * * @return Anchor element, or null if the indicator is not visible. */ - _updatePositionInternal: function DB_updatePositionInternal() + _updatePositionInternal: function () { let indicator = DownloadsIndicatorView.indicator; if (!indicator) { @@ -187,7 +187,7 @@ const DownloadsButton = { * Called once the indicator overlay has loaded. Gets a boolean * argument representing the indicator visibility. */ - checkIsVisible: function DB_checkIsVisible(aCallback) + checkIsVisible: function (aCallback) { function DB_CEV_callback() { if (!this._placeholder) { @@ -215,7 +215,7 @@ const DownloadsButton = { * panel should be anchored, or null if an anchor is not available (for * example because both the tab bar and the navigation bar are hidden). */ - getAnchor: function DB_getAnchor(aCallback) + getAnchor: function (aCallback) { // Do not allow anchoring the panel to the element while customizing. if (this._customizing) { @@ -235,7 +235,7 @@ const DownloadsButton = { /** * Allows the temporary anchor to be hidden. */ - releaseAnchor: function DB_releaseAnchor() + releaseAnchor: function () { this._anchorRequested = false; this._updatePositionInternal(); @@ -284,7 +284,7 @@ const DownloadsIndicatorView = { /** * Prepares the downloads indicator to be displayed. */ - ensureInitialized: function DIV_ensureInitialized() + ensureInitialized: function () { if (this._initialized) { return; @@ -298,7 +298,7 @@ const DownloadsIndicatorView = { /** * Frees the internal resources related to the indicator. */ - ensureTerminated: function DIV_ensureTerminated() + ensureTerminated: function () { if (!this._initialized) { return; @@ -320,7 +320,7 @@ const DownloadsIndicatorView = { * Ensures that the user interface elements required to display the indicator * are loaded, then invokes the given callback. */ - _ensureOperational: function DIV_ensureOperational(aCallback) + _ensureOperational: function (aCallback) { if (this._operational) { aCallback(); @@ -359,7 +359,7 @@ const DownloadsIndicatorView = { * @param aType * Set to "start" for new downloads, "finish" for completed downloads. */ - showEventNotification: function DIV_showEventNotification(aType) + showEventNotification: function (aType) { if (!this._initialized) { return; @@ -516,13 +516,13 @@ const DownloadsIndicatorView = { ////////////////////////////////////////////////////////////////////////////// //// User interface event functions - onWindowUnload: function DIV_onWindowUnload() + onWindowUnload: function () { // This function is registered as an event listener, we can't use "this". DownloadsIndicatorView.ensureTerminated(); }, - onCommand: function DIV_onCommand(aEvent) + onCommand: function (aEvent) { if (DownloadsCommon.useToolkitUI) { // The panel won't suppress attention for us, we need to clear now. @@ -535,12 +535,12 @@ const DownloadsIndicatorView = { aEvent.stopPropagation(); }, - onDragOver: function DIV_onDragOver(aEvent) + onDragOver: function (aEvent) { browserDragAndDrop.dragOver(aEvent); }, - onDrop: function DIV_onDrop(aEvent) + onDrop: function (aEvent) { let dt = aEvent.dataTransfer; // If dragged item is from our source, do not try to diff --git a/application/palemoon/components/feeds/FeedConverter.js b/application/palemoon/components/feeds/FeedConverter.js index d0f573774..e41958cd8 100644 --- a/application/palemoon/components/feeds/FeedConverter.js +++ b/application/palemoon/components/feeds/FeedConverter.js @@ -127,7 +127,7 @@ FeedConverter.prototype = { /** * See nsIStreamConverter.idl */ - convert: function FC_convert(sourceStream, sourceType, destinationType, + convert: function (sourceStream, sourceType, destinationType, context) { throw Cr.NS_ERROR_NOT_IMPLEMENTED; }, @@ -135,7 +135,7 @@ FeedConverter.prototype = { /** * See nsIStreamConverter.idl */ - asyncConvertData: function FC_asyncConvertData(sourceType, destinationType, + asyncConvertData: function (sourceType, destinationType, listener, context) { this._listener = listener; }, @@ -148,7 +148,7 @@ FeedConverter.prototype = { /** * Release our references to various things once we're done using them. */ - _releaseHandles: function FC__releaseHandles() { + _releaseHandles: function () { this._listener = null; this._request = null; this._processor = null; @@ -157,7 +157,7 @@ FeedConverter.prototype = { /** * See nsIFeedResultListener.idl */ - handleResult: function FC_handleResult(result) { + handleResult: function (result) { // Feeds come in various content types, which our feed sniffer coerces to // the maybe.feed type. However, feeds are used as a transport for // different data types, e.g. news/blogs (traditional feed), video/audio @@ -270,7 +270,7 @@ FeedConverter.prototype = { /** * See nsIStreamListener.idl */ - onDataAvailable: function FC_onDataAvailable(request, context, inputStream, + onDataAvailable: function (request, context, inputStream, sourceOffset, count) { if (this._processor) this._processor.onDataAvailable(request, context, inputStream, @@ -280,7 +280,7 @@ FeedConverter.prototype = { /** * See nsIRequestObserver.idl */ - onStartRequest: function FC_onStartRequest(request, context) { + onStartRequest: function (request, context) { var channel = request.QueryInterface(Ci.nsIChannel); // Check for a header that tells us there was no sniffing @@ -323,7 +323,7 @@ FeedConverter.prototype = { /** * See nsIRequestObserver.idl */ - onStopRequest: function FC_onStopRequest(request, context, status) { + onStopRequest: function (request, context, status) { if (this._processor) this._processor.onStopRequest(request, context, status); }, @@ -331,7 +331,7 @@ FeedConverter.prototype = { /** * See nsISupports.idl */ - QueryInterface: function FC_QueryInterface(iid) { + QueryInterface: function (iid) { if (iid.equals(Ci.nsIFeedResultListener) || iid.equals(Ci.nsIStreamConverter) || iid.equals(Ci.nsIStreamListener) || @@ -366,7 +366,7 @@ FeedResultService.prototype = { /** * See nsIFeedResultService.idl */ - addToClientReader: function FRS_addToClientReader(spec, title, subtitle, feedType) { + addToClientReader: function (spec, title, subtitle, feedType) { var prefs = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefBranch); @@ -432,7 +432,7 @@ FeedResultService.prototype = { /** * See nsIFeedResultService.idl */ - addFeedResult: function FRS_addFeedResult(feedResult) { + addFeedResult: function (feedResult) { NS_ASSERT(feedResult.uri != null, "null URI!"); NS_ASSERT(feedResult.uri != null, "null feedResult!"); var spec = feedResult.uri.spec; @@ -444,7 +444,7 @@ FeedResultService.prototype = { /** * See nsIFeedResultService.idl */ - getFeedResult: function RFS_getFeedResult(uri) { + getFeedResult: function (uri) { NS_ASSERT(uri != null, "null URI!"); var resultList = this._results[uri.spec]; for (var i in resultList) { @@ -457,7 +457,7 @@ FeedResultService.prototype = { /** * See nsIFeedResultService.idl */ - removeFeedResult: function FRS_removeFeedResult(uri) { + removeFeedResult: function (uri) { NS_ASSERT(uri != null, "null URI!"); var resultList = this._results[uri.spec]; if (!resultList) @@ -478,13 +478,13 @@ FeedResultService.prototype = { delete this._results[uri.spec]; }, - createInstance: function FRS_createInstance(outer, iid) { + createInstance: function (outer, iid) { if (outer != null) throw Cr.NS_ERROR_NO_AGGREGATION; return this.QueryInterface(iid); }, - QueryInterface: function FRS_QueryInterface(iid) { + QueryInterface: function (iid) { if (iid.equals(Ci.nsIFeedResultService) || iid.equals(Ci.nsIFactory) || iid.equals(Ci.nsISupports)) @@ -500,7 +500,7 @@ FeedResultService.prototype = { function GenericProtocolHandler() { } GenericProtocolHandler.prototype = { - _init: function GPH_init(scheme) { + _init: function (scheme) { var ios = Cc["@mozilla.org/network/io-service;1"]. getService(Ci.nsIIOService); @@ -520,11 +520,11 @@ GenericProtocolHandler.prototype = { return this._http.defaultPort; }, - allowPort: function GPH_allowPort(port, scheme) { + allowPort: function (port, scheme) { return this._http.allowPort(port, scheme); }, - newURI: function GPH_newURI(spec, originalCharset, baseURI) { + newURI: function (spec, originalCharset, baseURI) { // Feed URIs can be either nested URIs of the form feed:realURI (in which // case we create a nested URI for the realURI) or feed://example.com, in // which case we create a nested URI for the real protocol which is http. @@ -548,7 +548,7 @@ GenericProtocolHandler.prototype = { return uri; }, - newChannel2: function GPH_newChannel(aUri, aLoadInfo) { + newChannel2: function (aUri, aLoadInfo) { var inner = aUri.QueryInterface(Ci.nsINestedURI).innerURI; var channel = Cc["@mozilla.org/network/io-service;1"]. getService(Ci.nsIIOService). @@ -562,7 +562,7 @@ GenericProtocolHandler.prototype = { }, - QueryInterface: function GPH_QueryInterface(iid) { + QueryInterface: function (iid) { if (iid.equals(Ci.nsIProtocolHandler) || iid.equals(Ci.nsISupports)) return this; diff --git a/application/palemoon/components/feeds/FeedWriter.js b/application/palemoon/components/feeds/FeedWriter.js index facde5815..048da1fe6 100644 --- a/application/palemoon/components/feeds/FeedWriter.js +++ b/application/palemoon/components/feeds/FeedWriter.js @@ -149,12 +149,12 @@ FeedWriter.prototype = { _mimeSvc : Cc["@mozilla.org/mime;1"]. getService(Ci.nsIMIMEService), - _getPropertyAsBag: function FW__getPropertyAsBag(container, property) { + _getPropertyAsBag: function (container, property) { return container.fields.getProperty(property). QueryInterface(Ci.nsIPropertyBag2); }, - _getPropertyAsString: function FW__getPropertyAsString(container, property) { + _getPropertyAsString: function (container, property) { try { return container.fields.getPropertyAsAString(property); } @@ -163,7 +163,7 @@ FeedWriter.prototype = { return ""; }, - _setContentText: function FW__setContentText(id, text) { + _setContentText: function (id, text) { this._contentSandbox.element = this._document.getElementById(id); this._contentSandbox.textNode = text.createDocumentFragment(this._contentSandbox.element); var codeStr = @@ -190,7 +190,7 @@ FeedWriter.prototype = { * The URI spec to set as the href */ _safeSetURIAttribute: - function FW__safeSetURIAttribute(element, attribute, uri) { + function (element, attribute, uri) { var secman = Cc["@mozilla.org/scriptsecuritymanager;1"]. getService(Ci.nsIScriptSecurityManager); const flags = Ci.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL; @@ -243,7 +243,7 @@ FeedWriter.prototype = { * @param aElement * the XUL element to call doCommand() on. */ - _safeDoCommand: function FW___safeDoCommand(aElement) { + _safeDoCommand: function (aElement) { this._contentSandbox.element = aElement; Cu.evalInSandbox("element.doCommand();", this._contentSandbox); this._contentSandbox.element = null; @@ -268,16 +268,16 @@ FeedWriter.prototype = { return this.__bundle; }, - _getFormattedString: function FW__getFormattedString(key, params) { + _getFormattedString: function (key, params) { return this._bundle.formatStringFromName(key, params, params.length); }, - _getString: function FW__getString(key) { + _getString: function (key) { return this._bundle.GetStringFromName(key); }, /* Magic helper methods to be used instead of xbl properties */ - _getSelectedItemFromMenulist: function FW__getSelectedItemFromList(aList) { + _getSelectedItemFromMenulist: function (aList) { var node = aList.firstChild.firstChild; while (node) { if (node.localName == "menuitem" && node.getAttribute("selected") == "true") @@ -289,7 +289,7 @@ FeedWriter.prototype = { return null; }, - _setCheckboxCheckedState: function FW__setCheckboxCheckedState(aCheckbox, aValue) { + _setCheckboxCheckedState: function (aCheckbox, aValue) { // see checkbox.xml, xbl bindings are not applied within the sandbox! this._contentSandbox.checkbox = aCheckbox; var codeStr; @@ -315,7 +315,7 @@ FeedWriter.prototype = { * @param dateString * A date as extracted from a feed entry. (entry.updated) */ - _parseDate: function FW__parseDate(dateString) { + _parseDate: function (dateString) { // Convert the date into the user's local time zone dateObj = new Date(dateString); @@ -334,7 +334,7 @@ FeedWriter.prototype = { * Returns the feed type. */ __feedType: null, - _getFeedType: function FW__getFeedType() { + _getFeedType: function () { if (this.__feedType != null) return this.__feedType; @@ -352,7 +352,7 @@ FeedWriter.prototype = { /** * Maps a feed type to a maybe-feed mimetype. */ - _getMimeTypeForFeedType: function FW__getMimeTypeForFeedType() { + _getMimeTypeForFeedType: function () { switch (this._getFeedType()) { case Ci.nsIFeed.TYPE_VIDEO: return TYPE_MAYBE_VIDEO_FEED; @@ -370,7 +370,7 @@ FeedWriter.prototype = { * @param container * The feed container */ - _setTitleText: function FW__setTitleText(container) { + _setTitleText: function (container) { if (container.title) { var title = container.title.plainText(); this._setContentText(TITLE_ID, container.title); @@ -390,7 +390,7 @@ FeedWriter.prototype = { * @param container * The feed container */ - _setTitleImage: function FW__setTitleImage(container) { + _setTitleImage: function (container) { try { var parts = container.image; @@ -432,7 +432,7 @@ FeedWriter.prototype = { * @param container * The container of entries in the feed */ - _writeFeedContent: function FW__writeFeedContent(container) { + _writeFeedContent: function (container) { // Build the actual feed content var feed = container.QueryInterface(Ci.nsIFeed); if (feed.items.length == 0) @@ -532,7 +532,7 @@ FeedWriter.prototype = { * The URL string from which to create a display name * @returns a string */ - _getURLDisplayName: function FW__getURLDisplayName(aURL) { + _getURLDisplayName: function (aURL) { var url = makeURI(aURL); url.QueryInterface(Ci.nsIURL); if (url == null || url.fileName.length == 0) @@ -548,7 +548,7 @@ FeedWriter.prototype = { * FeedEntry with enclosures * @returns element */ - _buildEnclosureDiv: function FW__buildEnclosureDiv(entry) { + _buildEnclosureDiv: function (entry) { var enclosuresDiv = this._document.createElementNS(HTML_NS, "div"); enclosuresDiv.className = "enclosures"; @@ -628,7 +628,7 @@ FeedWriter.prototype = { * @returns A valid nsIFeedContainer object containing the contents of * the feed. */ - _getContainer: function FW__getContainer(result) { + _getContainer: function (result) { var feedService = Cc["@mozilla.org/browser/feeds/result-service;1"]. getService(Ci.nsIFeedResultService); @@ -668,7 +668,7 @@ FeedWriter.prototype = { * A nsIFile to look up the name of * @returns The display name of the application represented by the file. */ - _getFileDisplayName: function FW__getFileDisplayName(file) { + _getFileDisplayName: function (file) { #ifdef XP_WIN if (file instanceof Ci.nsILocalFileWin) { try { @@ -710,7 +710,7 @@ FeedWriter.prototype = { * Helper method to get an element in the XBL binding where the handler * selection UI lives */ - _getUIElement: function FW__getUIElement(id) { + _getUIElement: function (id) { return this._document.getAnonymousElementByAttribute( this._document.getElementById("feedSubscribeLine"), "anonid", id); }, @@ -720,7 +720,7 @@ FeedWriter.prototype = { * @param aCallback the callback method, passes in true if a feed reader was * selected, false otherwise. */ - _chooseClientApp: function FW__chooseClientApp(aCallback) { + _chooseClientApp: function (aCallback) { try { let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); let fpCallback = function fpCallback_done(aResult) { @@ -766,7 +766,7 @@ FeedWriter.prototype = { } }, - _setAlwaysUseCheckedState: function FW__setAlwaysUseCheckedState(feedType) { + _setAlwaysUseCheckedState: function (feedType) { var checkbox = this._getUIElement("alwaysUse"); if (checkbox) { var alwaysUse = false; @@ -781,7 +781,7 @@ FeedWriter.prototype = { } }, - _setSubscribeUsingLabel: function FW__setSubscribeUsingLabel() { + _setSubscribeUsingLabel: function () { var stringLabel = "subscribeFeedUsing"; switch (this._getFeedType()) { case Ci.nsIFeed.TYPE_VIDEO: @@ -800,7 +800,7 @@ FeedWriter.prototype = { Cu.evalInSandbox(codeStr, this._contentSandbox); }, - _setAlwaysUseLabel: function FW__setAlwaysUseLabel() { + _setAlwaysUseLabel: function () { var checkbox = this._getUIElement("alwaysUse"); if (checkbox) { if (this._handlersMenuList) { @@ -864,7 +864,7 @@ FeedWriter.prototype = { } }, - _setSelectedHandler: function FW__setSelectedHandler(feedType) { + _setSelectedHandler: function (feedType) { var prefs = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefBranch); @@ -927,7 +927,7 @@ FeedWriter.prototype = { } }, - _initSubscriptionUI: function FW__initSubscriptionUI() { + _initSubscriptionUI: function () { var handlersMenuPopup = this._getUIElement("handlersMenuPopup"); if (!handlersMenuPopup) return; @@ -1105,7 +1105,7 @@ FeedWriter.prototype = { * @param aWindow * The window of the document invoking the BrowserFeedWriter */ - _getOriginalURI: function FW__getOriginalURI(aWindow) { + _getOriginalURI: function (aWindow) { var chan = aWindow.QueryInterface(Ci.nsIInterfaceRequestor). getInterface(Ci.nsIWebNavigation). QueryInterface(Ci.nsIDocShell).currentDocumentChannel; @@ -1135,7 +1135,7 @@ FeedWriter.prototype = { _handlersMenuList: null, // BrowserFeedWriter WebIDL methods - init: function FW_init(aWindow) { + init: function (aWindow) { var window = aWindow; this._feedURI = this._getOriginalURI(window); if (!this._feedURI) @@ -1171,7 +1171,7 @@ FeedWriter.prototype = { prefs.addObserver(PREF_AUDIO_SELECTED_APP, this, false); }, - writeContent: function FW_writeContent() { + writeContent: function () { if (!this._window) return; @@ -1190,7 +1190,7 @@ FeedWriter.prototype = { } }, - close: function FW_close() { + close: function () { this._getUIElement("handlersMenuPopup") .removeEventListener("command", this, false); this._getUIElement("subscribeButton") @@ -1220,7 +1220,7 @@ FeedWriter.prototype = { this.__contentSandbox = null; }, - _removeFeedFromCache: function FW__removeFeedFromCache() { + _removeFeedFromCache: function () { if (this._feedURI) { var feedService = Cc["@mozilla.org/browser/feeds/result-service;1"]. getService(Ci.nsIFeedResultService); @@ -1229,7 +1229,7 @@ FeedWriter.prototype = { } }, - subscribe: function FW_subscribe() { + subscribe: function () { var feedType = this._getFeedType(); // Subscribe to the feed using the selected handler and save prefs @@ -1313,7 +1313,7 @@ FeedWriter.prototype = { }, // nsIObserver - observe: function FW_observe(subject, topic, data) { + observe: function (subject, topic, data) { if (!this._window) { // this._window is null unless this.init was called with a trusted // window object. @@ -1356,7 +1356,7 @@ FeedWriter.prototype = { * to the icon url. See Bug 358878 for details. */ _setFaviconForWebReader: - function FW__setFaviconForWebReader(aReaderUrl, aMenuItem) { + function (aReaderUrl, aMenuItem) { var readerURI = makeURI(aReaderUrl); if (!/^https?$/.test(readerURI.scheme)) { // Don't try to get a favicon for non http(s) URIs. diff --git a/application/palemoon/components/feeds/WebContentConverter.js b/application/palemoon/components/feeds/WebContentConverter.js index 42e2edee0..0ade02114 100644 --- a/application/palemoon/components/feeds/WebContentConverter.js +++ b/application/palemoon/components/feeds/WebContentConverter.js @@ -73,19 +73,19 @@ const NS_ERROR_DOM_SYNTAX_ERR = NS_ERROR_MODULE_DOM + 12; function WebContentConverter() { } WebContentConverter.prototype = { - convert: function WCC_convert() { }, - asyncConvertData: function WCC_asyncConvertData() { }, - onDataAvailable: function WCC_onDataAvailable() { }, - onStopRequest: function WCC_onStopRequest() { }, + convert: function () { }, + asyncConvertData: function () { }, + onDataAvailable: function () { }, + onStopRequest: function () { }, - onStartRequest: function WCC_onStartRequest(request, context) { + onStartRequest: function (request, context) { var wccr = Cc[WCCR_CONTRACTID]. getService(Ci.nsIWebContentConverterService); wccr.loadPreferredHandler(request); }, - QueryInterface: function WCC_QueryInterface(iid) { + QueryInterface: function (iid) { if (iid.equals(Ci.nsIStreamConverter) || iid.equals(Ci.nsIStreamListener) || iid.equals(Ci.nsISupports)) @@ -95,13 +95,13 @@ WebContentConverter.prototype = { }; var WebContentConverterFactory = { - createInstance: function WCCF_createInstance(outer, iid) { + createInstance: function (outer, iid) { if (outer != null) throw Cr.NS_ERROR_NO_AGGREGATION; return new WebContentConverter().QueryInterface(iid); }, - QueryInterface: function WCC_QueryInterface(iid) { + QueryInterface: function (iid) { if (iid.equals(Ci.nsIFactory) || iid.equals(Ci.nsISupports)) return this; @@ -125,7 +125,7 @@ ServiceInfo.prototype = { /** * See nsIHandlerApp */ - equals: function SI_equals(aHandlerApp) { + equals: function (aHandlerApp) { if (!aHandlerApp) throw Cr.NS_ERROR_NULL_POINTER; @@ -154,11 +154,11 @@ ServiceInfo.prototype = { /** * See nsIWebContentHandlerInfo */ - getHandlerURI: function SI_getHandlerURI(uri) { + getHandlerURI: function (uri) { return this._uri.replace(/%s/gi, encodeURIComponent(uri)); }, - QueryInterface: function SI_QueryInterface(iid) { + QueryInterface: function (iid) { if (iid.equals(Ci.nsIWebContentHandlerInfo) || iid.equals(Ci.nsISupports)) return this; @@ -180,11 +180,11 @@ WebContentConverterRegistrar.prototype = { return WebContentConverterRegistrar.prototype.stringBundle = sb; }, - _getFormattedString: function WCCR__getFormattedString(key, params) { + _getFormattedString: function (key, params) { return this.stringBundle.formatStringFromName(key, params, params.length); }, - _getString: function WCCR_getString(key) { + _getString: function (key) { return this.stringBundle.GetStringFromName(key); }, @@ -192,7 +192,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ getAutoHandler: - function WCCR_getAutoHandler(contentType) { + function (contentType) { contentType = this._resolveContentType(contentType); if (contentType in this._autoHandleContentTypes) return this._autoHandleContentTypes[contentType]; @@ -203,7 +203,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ setAutoHandler: - function WCCR_setAutoHandler(contentType, handler) { + function (contentType, handler) { if (handler && !this._typeIsRegistered(contentType, handler.uri)) throw Cr.NS_ERROR_NOT_AVAILABLE; @@ -226,7 +226,7 @@ WebContentConverterRegistrar.prototype = { * Update the internal data structure (not persistent) */ _setAutoHandler: - function WCCR__setAutoHandler(contentType, handler) { + function (contentType, handler) { if (handler) this._autoHandleContentTypes[contentType] = handler; else if (contentType in this._autoHandleContentTypes) @@ -237,7 +237,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ getWebContentHandlerByURI: - function WCCR_getWebContentHandlerByURI(contentType, uri) { + function (contentType, uri) { var handlers = this.getContentHandlers(contentType, { }); for (var i = 0; i < handlers.length; ++i) { if (handlers[i].uri == uri) @@ -250,7 +250,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ loadPreferredHandler: - function WCCR_loadPreferredHandler(request) { + function (request) { var channel = request.QueryInterface(Ci.nsIChannel); var contentType = this._resolveContentType(channel.contentType); var handler = this.getAutoHandler(contentType); @@ -269,7 +269,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ removeProtocolHandler: - function WCCR_removeProtocolHandler(aProtocol, aURITemplate) { + function (aProtocol, aURITemplate) { var eps = Cc["@mozilla.org/uriloader/external-protocol-service;1"]. getService(Ci.nsIExternalProtocolService); var handlerInfo = eps.getProtocolHandlerInfo(aProtocol); @@ -292,7 +292,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ removeContentHandler: - function WCCR_removeContentHandler(contentType, uri) { + function (contentType, uri) { function notURI(serviceInfo) { return serviceInfo.uri != uri; } @@ -326,7 +326,7 @@ WebContentConverterRegistrar.prototype = { * @returns The resolved contentType value. */ _resolveContentType: - function WCCR__resolveContentType(contentType) { + function (contentType) { if (contentType in this._mappings) return this._mappings[contentType]; return contentType; @@ -339,7 +339,7 @@ WebContentConverterRegistrar.prototype = { }, _checkAndGetURI: - function WCCR_checkAndGetURI(aURIString, aContentWindow) + function (aURIString, aContentWindow) { try { let baseURI = aContentWindow.document.baseURIObject; @@ -382,7 +382,7 @@ WebContentConverterRegistrar.prototype = { * @return true if it is already registered, false otherwise. */ _protocolHandlerRegistered: - function WCCR_protocolHandlerRegistered(aProtocol, aURITemplate) { + function (aProtocol, aURITemplate) { var eps = Cc["@mozilla.org/uriloader/external-protocol-service;1"]. getService(Ci.nsIExternalProtocolService); var handlerInfo = eps.getProtocolHandlerInfo(aProtocol); @@ -401,7 +401,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentHandlerRegistrar */ registerProtocolHandler: - function WCCR_registerProtocolHandler(aProtocol, aURIString, aTitle, aContentWindow) { + function (aProtocol, aURIString, aTitle, aContentWindow) { LOG("registerProtocolHandler(" + aProtocol + "," + aURIString + "," + aTitle + ")"); var uri = this._checkAndGetURI(aURIString, aContentWindow); @@ -455,7 +455,7 @@ WebContentConverterRegistrar.prototype = { protocolInfo: { protocol: aProtocol, uri: uri.spec, name: aTitle }, callback: - function WCCR_addProtocolHandlerButtonCallback(aNotification, aButtonInfo) { + function (aNotification, aButtonInfo) { var protocol = aButtonInfo.protocolInfo.protocol; var uri = aButtonInfo.protocolInfo.uri; var name = aButtonInfo.protocolInfo.name; @@ -496,7 +496,7 @@ WebContentConverterRegistrar.prototype = { * prompt the user to confirm the registration. */ registerContentHandler: - function WCCR_registerContentHandler(aContentType, aURIString, aTitle, aContentWindow) { + function (aContentType, aURIString, aTitle, aContentWindow) { LOG("registerContentHandler(" + aContentType + "," + aURIString + "," + aTitle + ")"); // Check against the type blacklist. @@ -526,7 +526,7 @@ WebContentConverterRegistrar.prototype = { * Returns the browser chrome window in which the content window is in */ _getBrowserWindowForContentWindow: - function WCCR__getBrowserWindowForContentWindow(aContentWindow) { + function (aContentWindow) { return aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIWebNavigation) .QueryInterface(Ci.nsIDocShellTreeItem) @@ -547,7 +547,7 @@ WebContentConverterRegistrar.prototype = { * (i.e. the content window of a frame/iframe). */ _getBrowserForContentWindow: - function WCCR__getBrowserForContentWindow(aBrowserWindow, aContentWindow) { + function (aBrowserWindow, aContentWindow) { // This depends on pseudo APIs of browser.js and tabbrowser.xml aContentWindow = aContentWindow.top; var browsers = aBrowserWindow.gBrowser.browsers; @@ -579,7 +579,7 @@ WebContentConverterRegistrar.prototype = { * @return true if a notification has been appended, false otherwise. */ _appendFeedReaderNotification: - function WCCR__appendFeedReaderNotification(aURI, aName, aNotificationBox) { + function (aURI, aName, aNotificationBox) { var uriSpec = aURI.spec; var notificationValue = "feed reader notification: " + uriSpec; var notificationIcon = aURI.prePath + "/favicon.ico"; @@ -603,7 +603,7 @@ WebContentConverterRegistrar.prototype = { /* static */ callback: - function WCCR__addFeedReaderButtonCallback(aNotification, aButtonInfo) { + function (aNotification, aButtonInfo) { var uri = aButtonInfo.feedReaderInfo.uri; var name = aButtonInfo.feedReaderInfo.name; var outer = aButtonInfo._outer; @@ -645,7 +645,7 @@ WebContentConverterRegistrar.prototype = { * browser.contentHandlers.title0 = Foo 2.0alphr */ _saveContentHandlerToPrefs: - function WCCR__saveContentHandlerToPrefs(contentType, uri, title) { + function (contentType, uri, title) { var ps = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefService); @@ -685,7 +685,7 @@ WebContentConverterRegistrar.prototype = { * @param uri * The uri of the */ - _typeIsRegistered: function WCCR__typeIsRegistered(contentType, uri) { + _typeIsRegistered: function (contentType, uri) { if (!(contentType in this._contentTypes)) return false; @@ -705,7 +705,7 @@ WebContentConverterRegistrar.prototype = { * @returns A contract id to construct a converter to convert between the * contentType and *\/*. */ - _getConverterContractID: function WCCR__getConverterContractID(contentType) { + _getConverterContractID: function (contentType) { const template = "@mozilla.org/streamconv;1?from=%s&to=*/*"; return template.replace(/%s/, contentType); }, @@ -721,7 +721,7 @@ WebContentConverterRegistrar.prototype = { * the human readable name of the web service */ _registerContentHandler: - function WCCR__registerContentHandler(contentType, uri, title) { + function (contentType, uri, title) { this._updateContentTypeHandlerMap(contentType, uri, title); this._saveContentHandlerToPrefs(contentType, uri, title); @@ -754,7 +754,7 @@ WebContentConverterRegistrar.prototype = { * The human readable name of the web service */ _updateContentTypeHandlerMap: - function WCCR__updateContentTypeHandlerMap(contentType, uri, title) { + function (contentType, uri, title) { if (!(contentType in this._contentTypes)) this._contentTypes[contentType] = []; @@ -776,7 +776,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ getContentHandlers: - function WCCR_getContentHandlers(contentType, countRef) { + function (contentType, countRef) { countRef.value = 0; if (!(contentType in this._contentTypes)) return []; @@ -790,7 +790,7 @@ WebContentConverterRegistrar.prototype = { * See nsIWebContentConverterService */ resetHandlersForType: - function WCCR_resetHandlersForType(contentType) { + function (contentType) { // currently unused within the tree, so only useful for extensions; previous // impl. was buggy (and even infinite-looped!), so I argue that this is a // definite improvement @@ -833,7 +833,7 @@ WebContentConverterRegistrar.prototype = { * Load the auto handler, content handler and protocol tables from * preferences. */ - _init: function WCCR__init() { + _init: function () { var ps = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefService); @@ -883,7 +883,7 @@ WebContentConverterRegistrar.prototype = { /** * See nsIObserver */ - observe: function WCCR_observe(subject, topic, data) { + observe: function (subject, topic, data) { var os = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -901,7 +901,7 @@ WebContentConverterRegistrar.prototype = { /** * See nsIFactory */ - createInstance: function WCCR_createInstance(outer, iid) { + createInstance: function (outer, iid) { if (outer != null) throw Cr.NS_ERROR_NO_AGGREGATION; return this.QueryInterface(iid); diff --git a/application/palemoon/components/feeds/content/subscribe.js b/application/palemoon/components/feeds/content/subscribe.js index ab2eac4eb..7cf7a9e19 100644 --- a/application/palemoon/components/feeds/content/subscribe.js +++ b/application/palemoon/components/feeds/content/subscribe.js @@ -9,15 +9,15 @@ var SubscribeHandler = { */ _feedWriter: null, - init: function SH_init() { + init: function () { this._feedWriter = new BrowserFeedWriter(); }, - writeContent: function SH_writeContent() { + writeContent: function () { this._feedWriter.writeContent(); }, - uninit: function SH_uninit() { + uninit: function () { this._feedWriter.close(); } }; diff --git a/application/palemoon/components/fuel/fuelApplication.js b/application/palemoon/components/fuel/fuelApplication.js index bc3a091ea..be0b23667 100644 --- a/application/palemoon/components/fuel/fuelApplication.js +++ b/application/palemoon/components/fuel/fuelApplication.js @@ -49,14 +49,14 @@ var Utilities = { return this.windowMediator; }, - makeURI: function fuelutil_makeURI(aSpec) { + makeURI: function (aSpec) { if (!aSpec) return null; var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); return ios.newURI(aSpec, null, null); }, - free: function fuelutil_free() { + free: function () { delete this.bookmarks; delete this.bookmarksObserver; delete this.annotations; @@ -103,12 +103,12 @@ Window.prototype = { * Helper used to setup event handlers on the XBL element. Note that the events * are actually dispatched to tabs, so we capture them. */ - _watch: function win_watch(aType) { + _watch: function (aType) { this._tabbrowser.tabContainer.addEventListener(aType, this, /* useCapture = */ true); }, - handleEvent: function win_handleEvent(aEvent) { + handleEvent: function (aEvent) { this._events.dispatch(aEvent.type, getBrowserTab(this, aEvent.originalTarget.linkedBrowser)); }, @@ -124,7 +124,7 @@ Window.prototype = { return getBrowserTab(this, this._tabbrowser.selectedBrowser); }, - open: function win_open(aURI) { + open: function (aURI) { return getBrowserTab(this, this._tabbrowser.addTab(aURI.spec).linkedBrowser); }, @@ -192,12 +192,12 @@ BrowserTab.prototype = { /* * Helper used to setup event handlers on the XBL element */ - _watch: function bt_watch(aType) { + _watch: function (aType) { this._browser.addEventListener(aType, this, /* useCapture = */ true); }, - handleEvent: function bt_handleEvent(aEvent) { + handleEvent: function (aEvent) { if (aEvent.type == "load") { if (!(aEvent.originalTarget instanceof Ci.nsIDOMDocument)) return; @@ -211,29 +211,29 @@ BrowserTab.prototype = { /* * Helper used to determine the index offset of the browsertab */ - _getTab: function bt_gettab() { + _getTab: function () { var tabs = this._tabbrowser.tabs; return tabs[this.index] || null; }, - load: function bt_load(aURI) { + load: function (aURI) { this._browser.loadURI(aURI.spec, null, null); }, - focus: function bt_focus() { + focus: function () { this._tabbrowser.selectedTab = this._getTab(); this._tabbrowser.focus(); }, - close: function bt_close() { + close: function () { this._tabbrowser.removeTab(this._getTab()); }, - moveBefore: function bt_movebefore(aBefore) { + moveBefore: function (aBefore) { this._tabbrowser.moveTabTo(this._getTab(), aBefore.index); }, - moveToEnd: function bt_moveend() { + moveToEnd: function () { this._tabbrowser.moveTabTo(this._getTab(), this._tabbrowser.browsers.length); }, @@ -252,21 +252,21 @@ Annotations.prototype = { return Utilities.annotations.getItemAnnotationNames(this._id); }, - has: function ann_has(aName) { + has: function (aName) { return Utilities.annotations.itemHasAnnotation(this._id, aName); }, - get: function ann_get(aName) { + get: function (aName) { if (this.has(aName)) return Utilities.annotations.getItemAnnotation(this._id, aName); return null; }, - set: function ann_set(aName, aValue, aExpiration) { + set: function (aName, aValue, aExpiration) { Utilities.annotations.setItemAnnotation(this._id, aName, aValue, 0, aExpiration); }, - remove: function ann_remove(aName) { + remove: function (aName) { if (aName) Utilities.annotations.removeItemAnnotation(this._id, aName); }, @@ -308,33 +308,33 @@ BookmarksObserver.prototype = { onEndUpdateBatch: function () {}, onItemVisited: function () {}, - onItemAdded: function bo_onItemAdded(aId, aFolder, aIndex, aItemType, aURI) { + onItemAdded: function (aId, aFolder, aIndex, aItemType, aURI) { this._rootEvents.dispatch("add", aId); this._dispatchToEvents("addchild", aId, this._folderEventsDict[aFolder]); }, - onItemRemoved: function bo_onItemRemoved(aId, aFolder, aIndex) { + onItemRemoved: function (aId, aFolder, aIndex) { this._rootEvents.dispatch("remove", aId); this._dispatchToEvents("remove", aId, this._eventsDict[aId]); this._dispatchToEvents("removechild", aId, this._folderEventsDict[aFolder]); }, - onItemChanged: function bo_onItemChanged(aId, aProperty, aIsAnnotationProperty, aValue) { + onItemChanged: function (aId, aProperty, aIsAnnotationProperty, aValue) { this._rootEvents.dispatch("change", aProperty); this._dispatchToEvents("change", aProperty, this._eventsDict[aId]); }, - onItemMoved: function bo_onItemMoved(aId, aOldParent, aOldIndex, aNewParent, aNewIndex) { + onItemMoved: function (aId, aOldParent, aOldIndex, aNewParent, aNewIndex) { this._dispatchToEvents("move", aId, this._eventsDict[aId]); }, - _dispatchToEvents: function bo_dispatchToEvents(aEvent, aData, aEvents) { + _dispatchToEvents: function (aEvent, aData, aEvents) { if (aEvents) { aEvents.dispatch(aEvent, aData); } }, - _addListenerToDict: function bo_addListenerToDict(aId, aEvent, aListener, aDict) { + _addListenerToDict: function (aId, aEvent, aListener, aDict) { var events = aDict[aId]; if (!events) { events = new Events(); @@ -343,7 +343,7 @@ BookmarksObserver.prototype = { events.addListener(aEvent, aListener); }, - _removeListenerFromDict: function bo_removeListenerFromDict(aId, aEvent, aListener, aDict) { + _removeListenerFromDict: function (aId, aEvent, aListener, aDict) { var events = aDict[aId]; if (!events) { return; @@ -354,27 +354,27 @@ BookmarksObserver.prototype = { } }, - addListener: function bo_addListener(aId, aEvent, aListener) { + addListener: function (aId, aEvent, aListener) { this._addListenerToDict(aId, aEvent, aListener, this._eventsDict); }, - removeListener: function bo_removeListener(aId, aEvent, aListener) { + removeListener: function (aId, aEvent, aListener) { this._removeListenerFromDict(aId, aEvent, aListener, this._eventsDict); }, - addFolderListener: function addFolderListener(aId, aEvent, aListener) { + addFolderListener: function (aId, aEvent, aListener) { this._addListenerToDict(aId, aEvent, aListener, this._folderEventsDict); }, - removeFolderListener: function removeFolderListener(aId, aEvent, aListener) { + removeFolderListener: function (aId, aEvent, aListener) { this._removeListenerFromDict(aId, aEvent, aListener, this._folderEventsDict); }, - addRootListener: function addRootListener(aEvent, aListener) { + addRootListener: function (aEvent, aListener) { this._rootEvents.addListener(aEvent, aListener); }, - removeRootListener: function removeRootListener(aEvent, aListener) { + removeRootListener: function (aEvent, aListener) { this._rootEvents.removeListener(aEvent, aListener); }, @@ -408,10 +408,10 @@ function Bookmark(aId, aParent, aType) { // Our _events object forwards to bookmarksObserver. var self = this; this._events = { - addListener: function bookmarkevents_al(aEvent, aListener) { + addListener: function (aEvent, aListener) { Utilities.bookmarksObserver.addListener(self._id, aEvent, aListener); }, - removeListener: function bookmarkevents_rl(aEvent, aListener) { + removeListener: function (aEvent, aListener) { Utilities.bookmarksObserver.removeListener(self._id, aEvent, aListener); }, QueryInterface: XPCOMUtils.generateQI([Ci.extIEvents]) @@ -479,7 +479,7 @@ Bookmark.prototype = { return this._events; }, - remove : function bm_remove() { + remove : function () { Utilities.bookmarks.removeItem(this._id); }, @@ -528,7 +528,7 @@ function BookmarkFolder(aId, aParent) { var self = this; this._events = { - addListener: function bmfevents_al(aEvent, aListener) { + addListener: function (aEvent, aListener) { if (self._parent) { if (/child$/.test(aEvent)) { Utilities.bookmarksObserver.addFolderListener(self._id, aEvent, aListener); @@ -541,7 +541,7 @@ function BookmarkFolder(aId, aParent) { Utilities.bookmarksObserver.addRootListener(aEvent, aListener); } }, - removeListener: function bmfevents_rl(aEvent, aListener) { + removeListener: function (aEvent, aListener) { if (self._parent) { if (/child$/.test(aEvent)) { Utilities.bookmarksObserver.removeFolderListener(self._id, aEvent, aListener); @@ -633,25 +633,25 @@ BookmarkFolder.prototype = { return items; }, - addBookmark: function bmf_addbm(aTitle, aUri) { + addBookmark: function (aTitle, aUri) { var newBookmarkID = Utilities.bookmarks.insertBookmark(this._id, aUri, Utilities.bookmarks.DEFAULT_INDEX, aTitle); var newBookmark = new Bookmark(newBookmarkID, this, "bookmark"); return newBookmark; }, - addSeparator: function bmf_addsep() { + addSeparator: function () { var newBookmarkID = Utilities.bookmarks.insertSeparator(this._id, Utilities.bookmarks.DEFAULT_INDEX); var newBookmark = new Bookmark(newBookmarkID, this, "separator"); return newBookmark; }, - addFolder: function bmf_addfolder(aTitle) { + addFolder: function (aTitle) { var newFolderID = Utilities.bookmarks.createFolder(this._id, aTitle, Utilities.bookmarks.DEFAULT_INDEX); var newFolder = new BookmarkFolder(newFolderID, this); return newFolder; }, - remove: function bmf_remove() { + remove: function () { Utilities.bookmarks.removeItem(this._id); }, @@ -662,7 +662,7 @@ BookmarkFolder.prototype = { onItemRemoved : function () {}, onItemChanged : function () {}, - onItemMoved: function bf_onItemMoved(aId, aOldParent, aOldIndex, aNewParent, aNewIndex) { + onItemMoved: function (aId, aOldParent, aOldIndex, aNewParent, aNewIndex) { if (this._id == aId) { this._parent = new BookmarkFolder(aNewParent, Utilities.bookmarks.getFolderIdForItem(aNewParent)); } @@ -718,7 +718,7 @@ BookmarkRoots.prototype = { // See bug 386535. var gSingleton = null; var ApplicationFactory = { - createInstance: function af_ci(aOuter, aIID) { + createInstance: function (aOuter, aIID) { if (aOuter != null) throw Components.results.NS_ERROR_NO_AGGREGATION; diff --git a/application/palemoon/components/newtab/cells.js b/application/palemoon/components/newtab/cells.js index 47d4ef52d..731917515 100644 --- a/application/palemoon/components/newtab/cells.js +++ b/application/palemoon/components/newtab/cells.js @@ -81,7 +81,7 @@ Cell.prototype = { * Checks whether the cell contains a pinned site. * @return Whether the cell contains a pinned site. */ - containsPinnedSite: function Cell_containsPinnedSite() { + containsPinnedSite: function () { let site = this.site; return site && site.isPinned(); }, @@ -90,14 +90,14 @@ Cell.prototype = { * Checks whether the cell contains a site (is empty). * @return Whether the cell is empty. */ - isEmpty: function Cell_isEmpty() { + isEmpty: function () { return !this.site; }, /** * Handles all cell events. */ - handleEvent: function Cell_handleEvent(aEvent) { + handleEvent: function (aEvent) { // We're not responding to external drag/drop events // when our parent window is in private browsing mode. if (inPrivateBrowsingMode() && !gDrag.draggedSite) diff --git a/application/palemoon/components/newtab/drag.js b/application/palemoon/components/newtab/drag.js index e3928ebd0..ac4f09abf 100644 --- a/application/palemoon/components/newtab/drag.js +++ b/application/palemoon/components/newtab/drag.js @@ -33,7 +33,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'dragstart' event. */ - start: function Drag_start(aSite, aEvent) { + start: function (aSite, aEvent) { this._draggedSite = aSite; // Mark nodes as being dragged. @@ -66,7 +66,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'drag' event. */ - drag: function Drag_drag(aSite, aEvent) { + drag: function (aSite, aEvent) { // Get the viewport size. let {clientWidth, clientHeight} = document.documentElement; @@ -90,7 +90,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'dragend' event. */ - end: function Drag_end(aSite, aEvent) { + end: function (aSite, aEvent) { let nodes = gGrid.node.querySelectorAll("[dragged]") for (let i = 0; i < nodes.length; i++) nodes[i].removeAttribute("dragged"); @@ -106,7 +106,7 @@ var gDrag = { * @param aEvent The drag event to check. * @return Whether we should handle this drag and drop operation. */ - isValid: function Drag_isValid(aEvent) { + isValid: function (aEvent) { let link = gDragDataHelper.getLinkFromDragEvent(aEvent); // Check that the drag data is non-empty. @@ -125,7 +125,7 @@ var gDrag = { * @param aSite The site that's being dragged. * @param aEvent The 'dragstart' event. */ - _setDragData: function Drag_setDragData(aSite, aEvent) { + _setDragData: function (aSite, aEvent) { let {url, title} = aSite; let dt = aEvent.dataTransfer; diff --git a/application/palemoon/components/newtab/dragDataHelper.js b/application/palemoon/components/newtab/dragDataHelper.js index 675ff2671..c8a70f76d 100644 --- a/application/palemoon/components/newtab/dragDataHelper.js +++ b/application/palemoon/components/newtab/dragDataHelper.js @@ -9,7 +9,7 @@ var gDragDataHelper = { return "text/x-moz-url"; }, - getLinkFromDragEvent: function DragDataHelper_getLinkFromDragEvent(aEvent) { + getLinkFromDragEvent: function (aEvent) { let dt = aEvent.dataTransfer; if (!dt || !dt.types.includes(this.mimeType)) { return null; diff --git a/application/palemoon/components/newtab/drop.js b/application/palemoon/components/newtab/drop.js index 748652455..d9601866b 100644 --- a/application/palemoon/components/newtab/drop.js +++ b/application/palemoon/components/newtab/drop.js @@ -21,7 +21,7 @@ var gDrop = { * Handles the 'dragenter' event. * @param aCell The drop target cell. */ - enter: function Drop_enter(aCell) { + enter: function (aCell) { this._delayedRearrange(aCell); }, @@ -30,7 +30,7 @@ var gDrop = { * @param aCell The drop target cell. * @param aEvent The 'dragexit' event. */ - exit: function Drop_exit(aCell, aEvent) { + exit: function (aCell, aEvent) { if (aEvent.dataTransfer && !aEvent.dataTransfer.mozUserCancelled) { this._delayedRearrange(); } else { @@ -45,7 +45,7 @@ var gDrop = { * @param aCell The drop target cell. * @param aEvent The 'dragexit' event. */ - drop: function Drop_drop(aCell, aEvent) { + drop: function (aCell, aEvent) { // The cell that is the drop target could contain a pinned site. We need // to find out where that site has gone and re-pin it there. if (aCell.containsPinnedSite()) @@ -64,7 +64,7 @@ var gDrop = { * Re-pins all pinned sites in their (new) positions. * @param aCell The drop target cell. */ - _repinSitesAfterDrop: function Drop_repinSitesAfterDrop(aCell) { + _repinSitesAfterDrop: function (aCell) { let sites = gDropPreview.rearrange(aCell); // Filter out pinned sites. @@ -81,7 +81,7 @@ var gDrop = { * @param aCell The drop target cell. * @param aEvent The 'dragexit' event. */ - _pinDraggedSite: function Drop_pinDraggedSite(aCell, aEvent) { + _pinDraggedSite: function (aCell, aEvent) { let index = aCell.index; let draggedSite = gDrag.draggedSite; @@ -105,7 +105,7 @@ var gDrop = { * Time a rearrange with a little delay. * @param aCell The drop target cell. */ - _delayedRearrange: function Drop_delayedRearrange(aCell) { + _delayedRearrange: function (aCell) { // The last drop target didn't change so there's no need to re-arrange. if (this._lastDropTarget == aCell) return; @@ -127,7 +127,7 @@ var gDrop = { /** * Cancels a timed rearrange, if any. */ - _cancelDelayedArrange: function Drop_cancelDelayedArrange() { + _cancelDelayedArrange: function () { if (this._rearrangeTimeout) { clearTimeout(this._rearrangeTimeout); this._rearrangeTimeout = null; @@ -138,7 +138,7 @@ var gDrop = { * Rearrange all sites in the grid depending on the current drop target. * @param aCell The drop target cell. */ - _rearrange: function Drop_rearrange(aCell) { + _rearrange: function (aCell) { let sites = gGrid.sites; // We need to rearrange the grid only if there's a current drop target. diff --git a/application/palemoon/components/newtab/dropPreview.js b/application/palemoon/components/newtab/dropPreview.js index fd7587a35..9baa9410d 100644 --- a/application/palemoon/components/newtab/dropPreview.js +++ b/application/palemoon/components/newtab/dropPreview.js @@ -16,7 +16,7 @@ var gDropPreview = { * @param aCell The drop target cell. * @return The re-arranged array of sites. */ - rearrange: function DropPreview_rearrange(aCell) { + rearrange: function (aCell) { let sites = gGrid.sites; // Insert the dragged site into the current grid. @@ -34,7 +34,7 @@ var gDropPreview = { * @param aSites The array of sites to insert into. * @param aCell The drop target cell. */ - _insertDraggedSite: function DropPreview_insertDraggedSite(aSites, aCell) { + _insertDraggedSite: function (aSites, aCell) { let dropIndex = aCell.index; let draggedSite = gDrag.draggedSite; @@ -61,7 +61,7 @@ var gDropPreview = { * @param aCell The drop target cell. */ _repositionPinnedSites: - function DropPreview_repositionPinnedSites(aSites, aCell) { + function (aSites, aCell) { // Collect all pinned sites. let pinnedSites = this._filterPinnedSites(aSites, aCell); @@ -85,7 +85,7 @@ var gDropPreview = { * @param aCell The drop target cell. * @return The filtered array of sites. */ - _filterPinnedSites: function DropPreview_filterPinnedSites(aSites, aCell) { + _filterPinnedSites: function (aSites, aCell) { let draggedSite = gDrag.draggedSite; // When dropping on a cell that contains a pinned site make sure that all @@ -109,7 +109,7 @@ var gDropPreview = { * @param aCell The drop target cell. * @return The range of pinned cells. */ - _getPinnedRange: function DropPreview_getPinnedRange(aCell) { + _getPinnedRange: function (aCell) { let dropIndex = aCell.index; let range = {start: dropIndex, end: dropIndex}; @@ -139,7 +139,7 @@ var gDropPreview = { * @return Whether there is an overflowed pinned cell. */ _hasOverflowedPinnedSite: - function DropPreview_hasOverflowedPinnedSite(aSites, aCell) { + function (aSites, aCell) { // If the drop target isn't pinned there's no way a pinned site has been // pushed out of the grid so we can just exit here. @@ -166,7 +166,7 @@ var gDropPreview = { * @param aCell The drop target cell. */ _repositionOverflowedPinnedSite: - function DropPreview_repositionOverflowedPinnedSite(aSites, aCell) { + function (aSites, aCell) { // Try to find a lower-priority cell (empty or containing an unpinned site). let index = this._indexOfLowerPrioritySite(aSites, aCell); @@ -197,7 +197,7 @@ var gDropPreview = { * @return The cell's index. */ _indexOfLowerPrioritySite: - function DropPreview_indexOfLowerPrioritySite(aSites, aCell) { + function (aSites, aCell) { let cells = gGrid.cells; let dropIndex = aCell.index; diff --git a/application/palemoon/components/newtab/dropTargetShim.js b/application/palemoon/components/newtab/dropTargetShim.js index 57a97fa00..d3998cd16 100644 --- a/application/palemoon/components/newtab/dropTargetShim.js +++ b/application/palemoon/components/newtab/dropTargetShim.js @@ -204,7 +204,7 @@ var gDropTargetShim = { * Gets the positions of all cell nodes. * @return The (cached) cell positions. */ - _getCellPositions: function DropTargetShim_getCellPositions() { + _getCellPositions: function () { if (this._cellPositions) return this._cellPositions; diff --git a/application/palemoon/components/newtab/grid.js b/application/palemoon/components/newtab/grid.js index e63ea54a6..fcb466d8a 100644 --- a/application/palemoon/components/newtab/grid.js +++ b/application/palemoon/components/newtab/grid.js @@ -48,7 +48,7 @@ var gGrid = { * Initializes the grid. * @param aSelector The query selector of the grid. */ - init: function Grid_init() { + init: function () { this._node = document.getElementById("newtab-grid"); this._gridDefaultContent = this._node.lastChild; this._createSiteFragment(); @@ -65,7 +65,7 @@ var gGrid = { * @param aCell The cell that will contain the new site. * @return The newly created site. */ - createSite: function Grid_createSite(aLink, aCell) { + createSite: function (aLink, aCell) { let node = aCell.node; node.appendChild(this._siteFragment.cloneNode(true)); return new Site(node.firstElementChild, aLink); @@ -74,21 +74,21 @@ var gGrid = { /** * Handles all grid events. */ - handleEvent: function Grid_handleEvent(aEvent) { + handleEvent: function (aEvent) { // Any specific events should go here. }, /** * Locks the grid to block all pointer events. */ - lock: function Grid_lock() { + lock: function () { this.node.setAttribute("locked", "true"); }, /** * Unlocks the grid to allow all pointer events. */ - unlock: function Grid_unlock() { + unlock: function () { this.node.removeAttribute("locked"); }, @@ -142,7 +142,7 @@ var gGrid = { /** * Creates the DOM fragment that is re-used when creating sites. */ - _createSiteFragment: function Grid_createSiteFragment() { + _createSiteFragment: function () { let site = document.createElementNS(HTML_NAMESPACE, "div"); site.classList.add("newtab-site"); site.setAttribute("draggable", "true"); @@ -167,7 +167,7 @@ var gGrid = { * Test a tile at a given position for being pinned or history * @param position Position in sites array */ - _isHistoricalTile: function Grid_isHistoricalTile(aPos) { + _isHistoricalTile: function (aPos) { let site = this.sites[aPos]; return site && (site.isPinned() || site.link && site.link.type == "history"); } diff --git a/application/palemoon/components/newtab/page.js b/application/palemoon/components/newtab/page.js index 34387fd44..fe9fd3455 100644 --- a/application/palemoon/components/newtab/page.js +++ b/application/palemoon/components/newtab/page.js @@ -15,7 +15,7 @@ var gPage = { /** * Initializes the page. */ - init: function Page_init() { + init: function () { // Add ourselves to the list of pages to receive notifications. gAllPages.register(this); @@ -42,7 +42,7 @@ var gPage = { /** * Listens for notifications specific to this page. */ - observe: function Page_observe(aSubject, aTopic, aData) { + observe: function (aSubject, aTopic, aData) { if (aTopic == "nsPref:changed") { let enabled = gAllPages.enabled; this._updateAttributes(enabled); @@ -102,7 +102,7 @@ var gPage = { * Internally initializes the page. This runs only when/if the feature * is/gets enabled. */ - _init: function Page_init() { + _init: function () { if (this._initialized) return; @@ -136,7 +136,7 @@ var gPage = { * Updates the 'page-disabled' attributes of the respective DOM nodes. * @param aValue Whether the New Tab Page is enabled or not. */ - _updateAttributes: function Page_updateAttributes(aValue) { + _updateAttributes: function (aValue) { // Set the nodes' states. let nodeSelector = "#newtab-grid, #searchContainer"; for (let node of document.querySelectorAll(nodeSelector)) { @@ -159,14 +159,14 @@ var gPage = { /** * Handles unload event */ - _handleUnloadEvent: function Page_handleUnloadEvent() { + _handleUnloadEvent: function () { gAllPages.unregister(this); }, /** * Handles all page events. */ - handleEvent: function Page_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "load": this.onPageVisibleAndLoaded(); diff --git a/application/palemoon/components/newtab/sites.js b/application/palemoon/components/newtab/sites.js index cb5675238..c2ea00197 100644 --- a/application/palemoon/components/newtab/sites.js +++ b/application/palemoon/components/newtab/sites.js @@ -55,7 +55,7 @@ Site.prototype = { * @param aIndex The pinned index (optional). * @return true if link changed type after pin */ - pin: function Site_pin(aIndex) { + pin: function (aIndex) { if (typeof aIndex == "undefined") aIndex = this.cell.index; @@ -71,7 +71,7 @@ Site.prototype = { /** * Unpins the site and calls the given callback when done. */ - unpin: function Site_unpin() { + unpin: function () { if (this.isPinned()) { this._updateAttributes(false); gPinnedLinks.unpin(this._link); @@ -83,7 +83,7 @@ Site.prototype = { * Checks whether this site is pinned. * @return Whether this site is pinned. */ - isPinned: function Site_isPinned() { + isPinned: function () { return gPinnedLinks.isPinned(this._link); }, @@ -91,7 +91,7 @@ Site.prototype = { * Blocks the site (removes it from the grid) and calls the given callback * when done. */ - block: function Site_block() { + block: function () { if (!gBlockedLinks.isBlocked(this._link)) { gUndoDialog.show(this); gBlockedLinks.block(this._link); @@ -104,7 +104,7 @@ Site.prototype = { * @param aSelector The query selector. * @return The DOM node we found. */ - _querySelector: function Site_querySelector(aSelector) { + _querySelector: function (aSelector) { return this.node.querySelector(aSelector); }, @@ -139,7 +139,7 @@ Site.prototype = { /** * Checks for and modifies link at campaign end time */ - _checkLinkEndTime: function Site_checkLinkEndTime() { + _checkLinkEndTime: function () { if (this.link.endTime && this.link.endTime < Date.now()) { let oldUrl = this.url; // chop off the path part from url @@ -155,7 +155,7 @@ Site.prototype = { /** * Renders the site's data (fills the HTML fragment). */ - _render: function Site_render() { + _render: function () { // first check for end time, as it may modify the link this._checkLinkEndTime(); // setup display variables @@ -189,7 +189,7 @@ Site.prototype = { * Since the newtab may be preloaded long before it's displayed, * check for changed conditions and re-render if needed */ - onFirstVisible: function Site_onFirstVisible() { + onFirstVisible: function () { if (this.link.endTime && this.link.endTime < Date.now()) { // site needs to change landing url and background image this._render(); @@ -203,7 +203,7 @@ Site.prototype = { * Captures the site's thumbnail in the background, but only if there's no * existing thumbnail and the page allows background captures. */ - captureIfMissing: function Site_captureIfMissing() { + captureIfMissing: function () { if (!document.hidden && !this.link.imageURI) { BackgroundPageThumbs.captureIfMissing(this.url); } @@ -212,7 +212,7 @@ Site.prototype = { /** * Refreshes the thumbnail for the site. */ - refreshThumbnail: function Site_refreshThumbnail() { + refreshThumbnail: function () { let link = this.link; let thumbnail = this._querySelector(".newtab-thumbnail.thumbnail"); @@ -249,7 +249,7 @@ Site.prototype = { /** * Adds event handlers for the site and its buttons. */ - _addEventHandlers: function Site_addEventHandlers() { + _addEventHandlers: function () { // Register drag-and-drop event handlers. this._node.addEventListener("dragstart", this, false); this._node.addEventListener("dragend", this, false); @@ -259,7 +259,7 @@ Site.prototype = { /** * Speculatively opens a connection to the current site. */ - _speculativeConnect: function Site_speculativeConnect() { + _speculativeConnect: function () { let sc = Services.io.QueryInterface(Ci.nsISpeculativeConnect); let uri = Services.io.newURI(this.url, null, null); try { @@ -272,7 +272,7 @@ Site.prototype = { /** * Record interaction with site using telemetry. */ - _recordSiteClicked: function Site_recordSiteClicked(aIndex) { + _recordSiteClicked: function (aIndex) { if (Services.prefs.prefHasUserValue("browser.newtabpage.rows") || Services.prefs.prefHasUserValue("browser.newtabpage.columns") || aIndex > 8) { @@ -297,7 +297,7 @@ Site.prototype = { /** * Handles site click events. */ - onClick: function Site_onClick(aEvent) { + onClick: function (aEvent) { let action; let pinned = this.isPinned(); let tileIndex = this.cell.index; @@ -336,7 +336,7 @@ Site.prototype = { /** * Handles all site events. */ - handleEvent: function Site_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "mouseover": this._node.removeEventListener("mouseover", this, false); diff --git a/application/palemoon/components/newtab/transformations.js b/application/palemoon/components/newtab/transformations.js index f7db0ad84..e9dafcd33 100644 --- a/application/palemoon/components/newtab/transformations.js +++ b/application/palemoon/components/newtab/transformations.js @@ -33,7 +33,7 @@ var gTransformation = { * @param aNode The DOM node. * @return A Rect instance with the position. */ - getNodePosition: function Transformation_getNodePosition(aNode) { + getNodePosition: function (aNode) { let {left, top, width, height} = aNode.getBoundingClientRect(); return new Rect(left + scrollX, top + scrollY, width, height); }, @@ -43,7 +43,7 @@ var gTransformation = { * @param aNode The node to fade. * @param aCallback The callback to call when finished. */ - fadeNodeIn: function Transformation_fadeNodeIn(aNode, aCallback) { + fadeNodeIn: function (aNode, aCallback) { this._setNodeOpacity(aNode, 1, function () { // Clear the style property. aNode.style.opacity = ""; @@ -58,7 +58,7 @@ var gTransformation = { * @param aNode The node to fade. * @param aCallback The callback to call when finished. */ - fadeNodeOut: function Transformation_fadeNodeOut(aNode, aCallback) { + fadeNodeOut: function (aNode, aCallback) { this._setNodeOpacity(aNode, 0, aCallback); }, @@ -67,7 +67,7 @@ var gTransformation = { * @param aSite The site to fade. * @param aCallback The callback to call when finished. */ - showSite: function Transformation_showSite(aSite, aCallback) { + showSite: function (aSite, aCallback) { this.fadeNodeIn(aSite.node, aCallback); }, @@ -76,7 +76,7 @@ var gTransformation = { * @param aSite The site to fade. * @param aCallback The callback to call when finished. */ - hideSite: function Transformation_hideSite(aSite, aCallback) { + hideSite: function (aSite, aCallback) { this.fadeNodeOut(aSite.node, aCallback); }, @@ -85,7 +85,7 @@ var gTransformation = { * @param aSite The site to re-position. * @param aPosition The desired position for the given site. */ - setSitePosition: function Transformation_setSitePosition(aSite, aPosition) { + setSitePosition: function (aSite, aPosition) { let style = aSite.node.style; let {top, left} = aPosition; @@ -97,7 +97,7 @@ var gTransformation = { * Freezes a site in its current position by positioning it absolute. * @param aSite The site to freeze. */ - freezeSitePosition: function Transformation_freezeSitePosition(aSite) { + freezeSitePosition: function (aSite) { if (this._isFrozen(aSite)) return; @@ -114,7 +114,7 @@ var gTransformation = { * Unfreezes a site by removing its absolute positioning. * @param aSite The site to unfreeze. */ - unfreezeSitePosition: function Transformation_unfreezeSitePosition(aSite) { + unfreezeSitePosition: function (aSite) { if (!this._isFrozen(aSite)) return; @@ -131,7 +131,7 @@ var gTransformation = { * unfreeze - unfreeze the site after sliding * callback - the callback to call when finished */ - slideSiteTo: function Transformation_slideSiteTo(aSite, aTarget, aOptions) { + slideSiteTo: function (aSite, aTarget, aOptions) { let currentPosition = this.getNodePosition(aSite.node); let targetPosition = this.getNodePosition(aTarget.node) let callback = aOptions && aOptions.callback; @@ -168,7 +168,7 @@ var gTransformation = { * unfreeze - unfreeze the site after rearranging * callback - the callback to call when finished */ - rearrangeSites: function Transformation_rearrangeSites(aSites, aOptions) { + rearrangeSites: function (aSites, aOptions) { let batch = []; let cells = gGrid.cells; let callback = aOptions && aOptions.callback; @@ -206,7 +206,7 @@ var gTransformation = { * @param aCallback The callback to call when finished. */ _whenTransitionEnded: - function Transformation_whenTransitionEnded(aNode, aProperties, aCallback) { + function (aNode, aProperties, aCallback) { let props = new Set(aProperties); aNode.addEventListener("transitionend", function onEnd(e) { @@ -222,7 +222,7 @@ var gTransformation = { * @param aNode The node to get the opacity value from. * @return The node's opacity value. */ - _getNodeOpacity: function Transformation_getNodeOpacity(aNode) { + _getNodeOpacity: function (aNode) { let cstyle = window.getComputedStyle(aNode, null); return cstyle.getPropertyValue("opacity"); }, @@ -234,7 +234,7 @@ var gTransformation = { * @param aCallback The callback to call when finished. */ _setNodeOpacity: - function Transformation_setNodeOpacity(aNode, aOpacity, aCallback) { + function (aNode, aOpacity, aCallback) { if (this._getNodeOpacity(aNode) == aOpacity) { if (aCallback) @@ -254,7 +254,7 @@ var gTransformation = { * @param aIndex The target cell's index. * @param aOptions Options that are directly passed to slideSiteTo(). */ - _moveSite: function Transformation_moveSite(aSite, aIndex, aOptions) { + _moveSite: function (aSite, aIndex, aOptions) { this.freezeSitePosition(aSite); this.slideSiteTo(aSite, gGrid.cells[aIndex], aOptions); }, @@ -264,7 +264,7 @@ var gTransformation = { * @param aSite The site to check. * @return Whether the given site is frozen. */ - _isFrozen: function Transformation_isFrozen(aSite) { + _isFrozen: function (aSite) { return aSite.node.hasAttribute("frozen"); } }; diff --git a/application/palemoon/components/newtab/undo.js b/application/palemoon/components/newtab/undo.js index b856914d2..6649e1cad 100644 --- a/application/palemoon/components/newtab/undo.js +++ b/application/palemoon/components/newtab/undo.js @@ -22,7 +22,7 @@ var gUndoDialog = { /** * Initializes the undo dialog. */ - init: function UndoDialog_init() { + init: function () { this._undoContainer = document.getElementById("newtab-undo-container"); this._undoContainer.addEventListener("click", this, false); this._undoButton = document.getElementById("newtab-undo-button"); @@ -34,7 +34,7 @@ var gUndoDialog = { * Shows the undo dialog. * @param aSite The site that just got removed. */ - show: function UndoDialog_show(aSite) { + show: function (aSite) { if (this._undoData) clearTimeout(this._undoData.timeout); @@ -54,7 +54,7 @@ var gUndoDialog = { /** * Hides the undo dialog. */ - hide: function UndoDialog_hide() { + hide: function () { if (!this._undoData) return; @@ -70,7 +70,7 @@ var gUndoDialog = { * The undo dialog event handler. * @param aEvent The event to handle. */ - handleEvent: function UndoDialog_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.target.id) { case "newtab-undo-button": this._undo(); @@ -87,7 +87,7 @@ var gUndoDialog = { /** * Undo the last blocked site. */ - _undo: function UndoDialog_undo() { + _undo: function () { if (!this._undoData) return; @@ -105,7 +105,7 @@ var gUndoDialog = { /** * Undo all blocked sites. */ - _undoAll: function UndoDialog_undoAll() { + _undoAll: function () { NewTabUtils.undoAll(function() { gUpdater.updateGrid(); this.hide(); diff --git a/application/palemoon/components/newtab/updater.js b/application/palemoon/components/newtab/updater.js index 2bab74d70..6af0dfa6a 100644 --- a/application/palemoon/components/newtab/updater.js +++ b/application/palemoon/components/newtab/updater.js @@ -14,7 +14,7 @@ var gUpdater = { * This removes old, moves existing and creates new sites to fill gaps. * @param aCallback The callback to call when finished. */ - updateGrid: function Updater_updateGrid(aCallback) { + updateGrid: function (aCallback) { let links = gLinks.getLinks().slice(0, gGrid.cells.length); // Find all sites that remain in the grid. @@ -50,7 +50,7 @@ var gUpdater = { * @param aLinks The array of links to find sites for. * @return Array of sites mapped to the given links (can contain null values). */ - _findRemainingSites: function Updater_findRemainingSites(aLinks) { + _findRemainingSites: function (aLinks) { let map = {}; // Create a map to easily retrieve the site for a given URL. @@ -69,7 +69,7 @@ var gUpdater = { * Freezes the given sites' positions. * @param aSites The array of sites to freeze. */ - _freezeSitePositions: function Updater_freezeSitePositions(aSites) { + _freezeSitePositions: function (aSites) { aSites.forEach(function (aSite) { if (aSite) gTransformation.freezeSitePosition(aSite); @@ -80,7 +80,7 @@ var gUpdater = { * Moves the given sites' DOM nodes to their new positions. * @param aSites The array of sites to move. */ - _moveSiteNodes: function Updater_moveSiteNodes(aSites) { + _moveSiteNodes: function (aSites) { let cells = gGrid.cells; // Truncate the given array of sites to not have more sites than cells. @@ -112,7 +112,7 @@ var gUpdater = { * @param aSites The array of sites to re-arrange. * @param aCallback The callback to call when finished. */ - _rearrangeSites: function Updater_rearrangeSites(aSites, aCallback) { + _rearrangeSites: function (aSites, aCallback) { let options = {callback: aCallback, unfreeze: true}; gTransformation.rearrangeSites(aSites, options); }, @@ -123,7 +123,7 @@ var gUpdater = { * @param aSites The array of sites remaining in the grid. * @param aCallback The callback to call when finished. */ - _removeLegacySites: function Updater_removeLegacySites(aSites, aCallback) { + _removeLegacySites: function (aSites, aCallback) { let batch = []; // Delete sites that were removed from the grid. @@ -152,7 +152,7 @@ var gUpdater = { * @param aLinks The array of links. * @param aCallback The callback to call when finished. */ - _fillEmptyCells: function Updater_fillEmptyCells(aLinks, aCallback) { + _fillEmptyCells: function (aLinks, aCallback) { let {cells, sites} = gGrid; // Find empty cells and fill them. diff --git a/application/palemoon/components/nsAboutRedirector.js b/application/palemoon/components/nsAboutRedirector.js index 4d99a78f5..754faf861 100644 --- a/application/palemoon/components/nsAboutRedirector.js +++ b/application/palemoon/components/nsAboutRedirector.js @@ -80,7 +80,7 @@ AboutRedirector.prototype = { /** * Gets the module name from the given URI. */ - _getModuleName: function AboutRedirector__getModuleName(aURI) { + _getModuleName: function (aURI) { // Strip out the first ? or #, and anything following it let name = (/[^?#]+/.exec(aURI.path))[0]; return name.toLowerCase(); diff --git a/application/palemoon/components/nsBrowserContentHandler.js b/application/palemoon/components/nsBrowserContentHandler.js index e7f1414c2..19ba2b253 100644 --- a/application/palemoon/components/nsBrowserContentHandler.js +++ b/application/palemoon/components/nsBrowserContentHandler.js @@ -278,7 +278,7 @@ nsBrowserContentHandler.prototype = { classID: Components.ID("{5d0ce354-df01-421a-83fb-7ead0990c24e}"), _xpcom_factory: { - createInstance: function bch_factory_ci(outer, iid) { + createInstance: function (outer, iid) { if (outer) throw Components.results.NS_ERROR_NO_AGGREGATION; return gBrowserContentHandler.QueryInterface(iid); @@ -308,7 +308,7 @@ nsBrowserContentHandler.prototype = { nsICommandLineValidator]), /* nsICommandLineHandler */ - handle : function bch_handle(cmdLine) { + handle : function (cmdLine) { if (cmdLine.handleFlag("browser", false)) { // Passing defaultArgs, so use NO_EXTERNAL_URIS openWindow(null, this.chromeURL, "_blank", @@ -601,7 +601,7 @@ nsBrowserContentHandler.prototype = { mFeatures : null, - getFeatures : function bch_features(cmdLine) { + getFeatures : function (cmdLine) { if (this.mFeatures === null) { this.mFeatures = ""; @@ -629,7 +629,7 @@ nsBrowserContentHandler.prototype = { /* nsIContentHandler */ - handleContent : function bch_handleContent(contentType, context, request) { + handleContent : function (contentType, context, request) { try { var webNavInfo = Components.classes["@mozilla.org/webnavigation-info;1"] .getService(nsIWebNavigationInfo); @@ -647,7 +647,7 @@ nsBrowserContentHandler.prototype = { }, /* nsICommandLineValidator */ - validate : function bch_validate(cmdLine) { + validate : function (cmdLine) { // Other handlers may use osint so only handle the osint flag if the url // flag is also present and the command line is valid. var osintFlagIdx = cmdLine.findFlag("osint", false); @@ -699,7 +699,7 @@ nsDefaultCommandLineHandler.prototype = { classID: Components.ID("{47cd0651-b1be-4a0f-b5c4-10e5a573ef71}"), /* nsISupports */ - QueryInterface : function dch_QI(iid) { + QueryInterface : function (iid) { if (!iid.equals(nsISupports) && !iid.equals(nsICommandLineHandler)) throw Components.results.NS_ERROR_NO_INTERFACE; @@ -712,7 +712,7 @@ nsDefaultCommandLineHandler.prototype = { #endif /* nsICommandLineHandler */ - handle : function dch_handle(cmdLine) { + handle : function (cmdLine) { var urilist = []; #ifdef XP_WIN diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js index 740b29363..79772c389 100644 --- a/application/palemoon/components/nsBrowserGlue.js +++ b/application/palemoon/components/nsBrowserGlue.js @@ -71,7 +71,7 @@ const BOOKMARKS_BACKUP_MAX_BACKUPS = 10; // Factory object const BrowserGlueServiceFactory = { _instance: null, - createInstance: function BGSF_createInstance(outer, iid) { + createInstance: function (outer, iid) { if (outer != null) throw Components.results.NS_ERROR_NO_AGGREGATION; return this._instance == null ? @@ -116,7 +116,7 @@ BrowserGlue.prototype = { _isPlacesDatabaseLocked: false, _migrationImportsDefaultBookmarks: false, - _setPrefToSaveSession: function BG__setPrefToSaveSession(aForce) { + _setPrefToSaveSession: function (aForce) { if (!this._saveSession && !aForce) return; @@ -129,7 +129,7 @@ BrowserGlue.prototype = { }, #ifdef MOZ_SERVICES_SYNC - _setSyncAutoconnectDelay: function BG__setSyncAutoconnectDelay() { + _setSyncAutoconnectDelay: function () { // Assume that a non-zero value for services.sync.autoconnectDelay should override if (Services.prefs.prefHasUserValue("services.sync.autoconnectDelay")) { let prefDelay = Services.prefs.getIntPref("services.sync.autoconnectDelay"); @@ -153,7 +153,7 @@ BrowserGlue.prototype = { #endif // nsIObserver implementation - observe: function BG_observe(subject, topic, data) { + observe: function (subject, topic, data) { switch (topic) { case "notifications-open-settings": this._openPermissions(subject); @@ -326,7 +326,7 @@ BrowserGlue.prototype = { }, // initialization (called on application startup) - _init: function BG__init() { + _init: function () { let os = Services.obs; os.addObserver(this, "notifications-open-settings", false); os.addObserver(this, "prefservice:after-app-defaults", false); @@ -359,7 +359,7 @@ BrowserGlue.prototype = { }, // cleanup (called on application shutdown) - _dispose: function BG__dispose() { + _dispose: function () { let os = Services.obs; os.removeObserver(this, "notifications-open-settings"); os.removeObserver(this, "prefservice:after-app-defaults"); @@ -394,7 +394,7 @@ BrowserGlue.prototype = { } catch (ex) {} }, - _onAppDefaults: function BG__onAppDefaults() { + _onAppDefaults: function () { // apply distribution customizations (prefs) // other customizations are applied in _finalUIStartup() this._distributionCustomizer.applyPrefDefaults(); @@ -402,7 +402,7 @@ BrowserGlue.prototype = { // runs on startup, before the first command line handler is invoked // (i.e. before the first window is opened) - _finalUIStartup: function BG__finalUIStartup() { + _finalUIStartup: function () { this._sanitizer.onStartup(); // check if we're in safe mode if (Services.appinfo.inSafeMode) { @@ -436,7 +436,7 @@ BrowserGlue.prototype = { Services.obs.notifyObservers(null, "browser-ui-startup-complete", ""); }, - _setUpUserAgentOverrides: function BG__setUpUserAgentOverrides() { + _setUpUserAgentOverrides: function () { UserAgentOverrides.init(); if (Services.prefs.getBoolPref("general.useragent.complexOverride.moodle")) { @@ -510,7 +510,7 @@ BrowserGlue.prototype = { }, // the first browser window has finished initializing - _onFirstWindowLoaded: function BG__onFirstWindowLoaded() { + _onFirstWindowLoaded: function () { #ifdef XP_WIN // For windows seven, initialize the jump list module. const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1"; @@ -532,7 +532,7 @@ BrowserGlue.prototype = { * All components depending on Places should be shut down in * _onPlacesShutdown() and not here. */ - _onProfileShutdown: function BG__onProfileShutdown() { + _onProfileShutdown: function () { BrowserNewTabPreloader.uninit(); UserAgentOverrides.uninit(); #ifdef MOZ_WEBRTC @@ -544,7 +544,7 @@ BrowserGlue.prototype = { }, // All initial windows have opened. - _onWindowsRestored: function BG__onWindowsRestored() { + _onWindowsRestored: function () { // Show update notification, if needed. if (Services.prefs.prefHasUserValue("app.update.postupdate")) this._showUpdateNotification(); @@ -649,7 +649,7 @@ BrowserGlue.prototype = { }} }, - _onQuitRequest: function BG__onQuitRequest(aCancelQuit, aQuitType) { + _onQuitRequest: function (aCancelQuit, aQuitType) { // If user has already dismissed quit request, then do nothing if ((aCancelQuit instanceof Ci.nsISupportsPRBool) && aCancelQuit.data) return; @@ -779,7 +779,7 @@ BrowserGlue.prototype = { } }, - _showUpdateNotification: function BG__showUpdateNotification() { + _showUpdateNotification: function () { Services.prefs.clearUserPref("app.update.postupdate"); var um = Cc["@mozilla.org/updates/update-manager;1"]. @@ -880,7 +880,7 @@ BrowserGlue.prototype = { } }, - _showPluginUpdatePage: function BG__showPluginUpdatePage() { + _showPluginUpdatePage: function () { // Pale Moon: disable this functionality from BrowserGlue, people are // already notified if they visit a page with an outdated plugin, and // they can check properly from the plugins page as well. @@ -915,7 +915,7 @@ BrowserGlue.prototype = { * Set to true by safe-mode dialog to indicate we must restore default * bookmarks. */ - _initPlaces: function BG__initPlaces(aInitialMigrationPerformed) { + _initPlaces: function (aInitialMigrationPerformed) { // We must instantiate the history service since it will tell us if we // need to import or restore bookmarks due to first-run, corruption or // forced migration (due to a major schema change). @@ -1081,7 +1081,7 @@ BrowserGlue.prototype = { * - export bookmarks as HTML, if so configured. * - finalize components depending on Places. */ - _onPlacesShutdown: function BG__onPlacesShutdown() { + _onPlacesShutdown: function () { this._sanitizer.onShutdown(); PageThumbs.uninit(); @@ -1137,7 +1137,7 @@ BrowserGlue.prototype = { * Determine whether to backup bookmarks or not. * @return true if bookmarks should be backed up, false if not. */ - _shouldBackupBookmarks: function BG__shouldBackupBookmarks() { + _shouldBackupBookmarks: function () { let lastBackupFile = PlacesBackups.getMostRecent(); // Should backup bookmarks if there are no backups or the maximum interval between @@ -1149,7 +1149,7 @@ BrowserGlue.prototype = { /** * Backup bookmarks. */ - _backupBookmarks: function BG__backupBookmarks() { + _backupBookmarks: function () { return Task.spawn(function() { // Backup bookmarks if there are no backups or the maximum interval between // backups elapsed. @@ -1166,7 +1166,7 @@ BrowserGlue.prototype = { /** * Show the notificationBox for a locked places database. */ - _showPlacesLockedNotificationBox: function BG__showPlacesLockedNotificationBox() { + _showPlacesLockedNotificationBox: function () { var applicationName = gBrandBundle.GetStringFromName("brandShortName"); var placesBundle = Services.strings.createBundle("chrome://browser/locale/places/places.properties"); var title = placesBundle.GetStringFromName("lockPrompt.title"); @@ -1200,7 +1200,7 @@ BrowserGlue.prototype = { notification.persistence = -1; // Until user closes it }, - _migrateUI: function BG__migrateUI() { + _migrateUI: function () { const UI_VERSION = 22; const BROWSER_DOCURL = "chrome://browser/content/browser.xul#"; let currentUIVersion = 0; @@ -1480,7 +1480,7 @@ BrowserGlue.prototype = { Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, - _hasExistingNotificationPermission: function BG__hasExistingNotificationPermission() { + _hasExistingNotificationPermission: function () { let enumerator = Services.perms.enumerator; while (enumerator.hasMoreElements()) { let permission = enumerator.getNext().QueryInterface(Ci.nsIPermission); @@ -1491,7 +1491,7 @@ BrowserGlue.prototype = { return false; }, - _notifyNotificationsUpgrade: function BG__notifyNotificationsUpgrade() { + _notifyNotificationsUpgrade: function () { if (!this._hasExistingNotificationPermission()) { return; } @@ -1536,14 +1536,14 @@ BrowserGlue.prototype = { return false; }, - _getPersist: function BG__getPersist(aSource, aProperty) { + _getPersist: function (aSource, aProperty) { var target = this._dataSource.GetTarget(aSource, aProperty, true); if (target instanceof Ci.nsIRDFLiteral) return target.Value; return null; }, - _setPersist: function BG__setPersist(aSource, aProperty, aTarget) { + _setPersist: function (aSource, aProperty, aTarget) { this._dirty = true; try { var oldTarget = this._dataSource.GetTarget(aSource, aProperty, true); @@ -1573,12 +1573,12 @@ BrowserGlue.prototype = { // public nsIBrowserGlue members // ------------------------------ - sanitize: function BG_sanitize(aParentWindow) { + sanitize: function (aParentWindow) { this._sanitizer.sanitize(aParentWindow); }, ensurePlacesDefaultQueriesInitialized: - function BG_ensurePlacesDefaultQueriesInitialized() { + function () { // This is actual version of the smart bookmarks, must be increased every // time smart bookmarks change. // When adding a new smart bookmark below, its newInVersion property must @@ -1602,7 +1602,7 @@ BrowserGlue.prototype = { } let batch = { - runBatched: function BG_EPDQI_runBatched() { + runBatched: function () { let menuIndex = 0; let toolbarIndex = 0; let bundle = Services.strings.createBundle("chrome://browser/locale/places/places.properties"); @@ -1724,7 +1724,7 @@ BrowserGlue.prototype = { }, // this returns the most recent non-popup browser window - getMostRecentBrowserWindow: function BG_getMostRecentBrowserWindow() { + getMostRecentBrowserWindow: function () { return RecentWindow.getMostRecentBrowserWindow(); }, @@ -1740,7 +1740,7 @@ BrowserGlue.prototype = { * lesser evil than sending a tab to a specific device (from e.g. Fennec) * and having nothing happen on the receiving end. */ - _onDisplaySyncURI: function _onDisplaySyncURI(data) { + _onDisplaySyncURI: function (data) { try { let tabbrowser = RecentWindow.getMostRecentBrowserWindow({private: false}).gBrowser; @@ -1770,7 +1770,7 @@ ContentPermissionPrompt.prototype = { QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionPrompt]), - _getChromeWindow: function CPP_getChromeWindow(aWindow) { + _getChromeWindow: function (aWindow) { var chromeWin = aWindow .QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIWebNavigation) @@ -1806,7 +1806,7 @@ ContentPermissionPrompt.prototype = { * @param aAnchorId The id for the PopupNotification anchor. * @param aOptions Options for the PopupNotification */ - _showPrompt: function CPP_showPrompt(aRequest, aMessage, aPermission, aActions, + _showPrompt: function (aRequest, aMessage, aPermission, aActions, aNotificationId, aAnchorId, aOptions) { function onFullScreen() { popup.remove(); @@ -1997,7 +1997,7 @@ ContentPermissionPrompt.prototype = { "web-notifications-notification-icon", options); }, - _promptPointerLock: function CPP_promtPointerLock(aRequest, autoAllow) { + _promptPointerLock: function (aRequest, autoAllow) { let requestingURI = aRequest.principal.URI; let originString = requestingURI.schemeIs("file") ? requestingURI.path : requestingURI.host; @@ -2034,7 +2034,7 @@ ContentPermissionPrompt.prototype = { "pointerLock-notification-icon", null); }, - prompt: function CPP_prompt(request) { + prompt: function (request) { // Only allow exactly one permission rquest here. let types = request.types.QueryInterface(Ci.nsIArray); if (types.length != 1) { diff --git a/application/palemoon/components/pageinfo/permissions.js b/application/palemoon/components/pageinfo/permissions.js index 4f8382f66..15cb2cb3e 100644 --- a/application/palemoon/components/pageinfo/permissions.js +++ b/application/palemoon/components/pageinfo/permissions.js @@ -18,21 +18,21 @@ var gPrefs; var gUsageRequest; var gPermObj = { - image: function getImageDefaultPermission() + image: function () { if (gPrefs.getIntPref("permissions.default.image") == IMAGE_DENY) { return DENY; } return ALLOW; }, - popup: function getPopupDefaultPermission() + popup: function () { if (gPrefs.getBoolPref("dom.disable_open_during_load")) { return DENY; } return ALLOW; }, - cookie: function getCookieDefaultPermission() + cookie: function () { if (gPrefs.getIntPref("network.cookie.cookieBehavior") == COOKIE_DENY) { return DENY; @@ -42,28 +42,28 @@ var gPermObj = { } return ALLOW; }, - "desktop-notification": function getNotificationDefaultPermission() + "desktop-notification": function () { if (!gPrefs.getBoolPref("dom.webnotifications.enabled")) { return DENY; } return UNKNOWN; }, - install: function getInstallDefaultPermission() + install: function () { if (Services.prefs.getBoolPref("xpinstall.whitelist.required")) { return DENY; } return ALLOW; }, - geo: function getGeoDefaultPermissions() + geo: function () { if (!gPrefs.getBoolPref("geo.enabled")) { return DENY; } return ALLOW; }, - plugins: function getPluginsDefaultPermissions() + plugins: function () { return UNKNOWN; }, diff --git a/application/palemoon/components/places/PlacesUIUtils.jsm b/application/palemoon/components/places/PlacesUIUtils.jsm index e3a9e1322..ae9825a07 100644 --- a/application/palemoon/components/places/PlacesUIUtils.jsm +++ b/application/palemoon/components/places/PlacesUIUtils.jsm @@ -42,11 +42,11 @@ this.PlacesUIUtils = { * The string spec of the URI * @returns A URI object for the spec. */ - createFixedURI: function PUIU_createFixedURI(aSpec) { + createFixedURI: function (aSpec) { return URIFixup.createFixupURI(aSpec, Ci.nsIURIFixup.FIXUP_FLAG_NONE); }, - getFormattedString: function PUIU_getFormattedString(key, params) { + getFormattedString: function (key, params) { return bundle.formatStringFromName(key, params, params.length); }, @@ -65,7 +65,7 @@ this.PlacesUIUtils = { * @see https://developer.mozilla.org/en/Localization_and_Plurals * @return The localized plural string. */ - getPluralString: function PUIU_getPluralString(aKey, aNumber, aParams) { + getPluralString: function (aKey, aNumber, aParams) { let str = PluralForm.get(aNumber, bundle.GetStringFromName(aKey)); // Replace #1 with aParams[0], #2 with aParams[1], and so on. @@ -75,7 +75,7 @@ this.PlacesUIUtils = { }); }, - getString: function PUIU_getString(key) { + getString: function (key) { return bundle.GetStringFromName(key); }, @@ -103,7 +103,7 @@ this.PlacesUIUtils = { * @see this._copyableAnnotations for the list of copyable annotations. */ _getURIItemCopyTransaction: - function PUIU__getURIItemCopyTransaction(aData, aContainer, aIndex) + function (aData, aContainer, aIndex) { let transactions = []; if (aData.dateAdded) { @@ -257,7 +257,7 @@ this.PlacesUIUtils = { * @see this._copyableAnnotations for the list of copyable annotations. */ _getLivemarkCopyTransaction: - function PUIU__getLivemarkCopyTransaction(aData, aContainer, aIndex) + function (aData, aContainer, aIndex) { if (!aData.livemark || !aData.annos) { throw new Error("node is not a livemark"); @@ -291,11 +291,11 @@ this.PlacesUIUtils = { * @note Maybe this should be removed later, see bug 1072833. */ _isLivemark: - function PUIU__isLivemark(aItemId) + function (aItemId) { // Since this check may be done on each dragover event, it's worth maintaining // a cache. - let self = PUIU__isLivemark; + let self = this._isLivemark; if (!("ids" in self)) { const LIVEMARK_ANNO = PlacesUtils.LMANNO_FEEDURI; @@ -344,7 +344,7 @@ this.PlacesUIUtils = { * the move/insert. */ makeTransaction: - function PUIU_makeTransaction(data, type, container, index, copy) + function (data, type, container, index, copy) { switch (data.type) { case PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER: @@ -399,7 +399,7 @@ this.PlacesUIUtils = { * @return true if any transaction has been performed, false otherwise. */ showBookmarkDialog: - function PUIU_showBookmarkDialog(aInfo, aParentWindow) { + function (aInfo, aParentWindow) { // Preserve size attributes differently based on the fact the dialog has // a folder picker or not, since it needs more horizontal space than the // other controls. @@ -415,7 +415,7 @@ this.PlacesUIUtils = { return ("performed" in aInfo && aInfo.performed); }, - _getTopBrowserWin: function PUIU__getTopBrowserWin() { + _getTopBrowserWin: function () { return RecentWindow.getMostRecentBrowserWindow(); }, @@ -425,7 +425,7 @@ this.PlacesUIUtils = { * a DOM node * @return the closet ancestor places view if exists, null otherwsie. */ - getViewForNode: function PUIU_getViewForNode(aNode) { + getViewForNode: function (aNode) { let node = aNode; // The view for a of which its associated menupopup is a places @@ -454,7 +454,7 @@ this.PlacesUIUtils = { * organizer. If this is not called visits will be marked as * TRANSITION_LINK. */ - markPageAsTyped: function PUIU_markPageAsTyped(aURL) { + markPageAsTyped: function (aURL) { PlacesUtils.history.markPageAsTyped(this.createFixedURI(aURL)); }, @@ -465,7 +465,7 @@ this.PlacesUIUtils = { * personal toolbar, and bookmarks from within the places organizer. * If this is not called visits will be marked as TRANSITION_LINK. */ - markPageAsFollowedBookmark: function PUIU_markPageAsFollowedBookmark(aURL) { + markPageAsFollowedBookmark: function (aURL) { PlacesUtils.history.markPageAsFollowedBookmark(this.createFixedURI(aURL)); }, @@ -475,7 +475,7 @@ this.PlacesUIUtils = { * This is actually used to distinguish user-initiated visits in frames * so automatic visits can be correctly ignored. */ - markPageAsFollowedLink: function PUIU_markPageAsFollowedLink(aURL) { + markPageAsFollowedLink: function (aURL) { PlacesUtils.history.markPageAsFollowedLink(this.createFixedURI(aURL)); }, @@ -489,7 +489,7 @@ this.PlacesUIUtils = { * @return true if it's safe to open the node in the browser, false otherwise. * */ - checkURLSecurity: function PUIU_checkURLSecurity(aURINode, aWindow) { + checkURLSecurity: function (aURINode, aWindow) { if (PlacesUtils.nodeIsBookmark(aURINode)) return true; @@ -516,7 +516,7 @@ this.PlacesUIUtils = { * @returns A description string if a META element was discovered with a * "description" or "httpequiv" attribute, empty string otherwise. */ - getDescriptionFromDocument: function PUIU_getDescriptionFromDocument(doc) { + getDescriptionFromDocument: function (doc) { var metaElements = doc.getElementsByTagName("META"); for (var i = 0; i < metaElements.length; ++i) { if (metaElements[i].name.toLowerCase() == "description" || @@ -534,7 +534,7 @@ this.PlacesUIUtils = { * @returns the description of the given item, or an empty string if it is * not set. */ - getItemDescription: function PUIU_getItemDescription(aItemId) { + getItemDescription: function (aItemId) { if (PlacesUtils.annotations.itemHasAnnotation(aItemId, this.DESCRIPTION_ANNO)) return PlacesUtils.annotations.getItemAnnotation(aItemId, this.DESCRIPTION_ANNO); return ""; @@ -631,7 +631,7 @@ this.PlacesUIUtils = { * Gives the user a chance to cancel loading lots of tabs at once */ _confirmOpenInTabs: - function PUIU__confirmOpenInTabs(numTabsToOpen, aWindow) { + function (numTabsToOpen, aWindow) { const WARN_ON_OPEN_PREF = "browser.tabs.warnOnOpen"; var reallyOpen = true; @@ -673,7 +673,7 @@ this.PlacesUIUtils = { /** aItemsToOpen needs to be an array of objects of the form: * {uri: string, isBookmark: boolean} */ - _openTabset: function PUIU__openTabset(aItemsToOpen, aEvent, aWindow) { + _openTabset: function (aItemsToOpen, aEvent, aWindow) { if (!aItemsToOpen.length) return; @@ -722,7 +722,7 @@ this.PlacesUIUtils = { }, openLiveMarkNodesInTabs: - function PUIU_openLiveMarkNodesInTabs(aNode, aEvent, aView) { + function (aNode, aEvent, aView) { let window = aView.ownerWindow; PlacesUtils.livemarks.getLivemark({id: aNode.itemId}) @@ -741,7 +741,7 @@ this.PlacesUIUtils = { }, openContainerNodeInTabs: - function PUIU_openContainerInTabs(aNode, aEvent, aView) { + function (aNode, aEvent, aView) { let window = aView.ownerWindow; let urlsToOpen = PlacesUtils.getURLsForContainerNode(aNode); @@ -750,7 +750,7 @@ this.PlacesUIUtils = { } }, - openURINodesInTabs: function PUIU_openURINodesInTabs(aNodes, aEvent, aView) { + openURINodesInTabs: function (aNodes, aEvent, aView) { let window = aView.ownerWindow; let urlsToOpen = []; @@ -775,7 +775,7 @@ this.PlacesUIUtils = { * The controller associated with aNode. */ openNodeWithEvent: - function PUIU_openNodeWithEvent(aNode, aEvent, aView) { + function (aNode, aEvent, aView) { let window = aView.ownerWindow; this._openNodeIn(aNode, window.whereToOpenLink(aEvent, false, true), window); }, @@ -785,12 +785,12 @@ this.PlacesUIUtils = { * web panel. * see also openUILinkIn */ - openNodeIn: function PUIU_openNodeIn(aNode, aWhere, aView, aPrivate) { + openNodeIn: function (aNode, aWhere, aView, aPrivate) { let window = aView.ownerWindow; this._openNodeIn(aNode, aWhere, window, aPrivate); }, - _openNodeIn: function PUIU_openNodeIn(aNode, aWhere, aWindow, aPrivate=false) { + _openNodeIn: function (aNode, aWhere, aWindow, aPrivate=false) { if (aNode && PlacesUtils.nodeIsURI(aNode) && this.checkURLSecurity(aNode, aWindow)) { let isBookmark = PlacesUtils.nodeIsBookmark(aNode); @@ -831,11 +831,11 @@ this.PlacesUIUtils = { * * @note this is not supposed be perfect, so use it only for UI purposes. */ - guessUrlSchemeForUI: function PUIU_guessUrlSchemeForUI(aUrlString) { + guessUrlSchemeForUI: function (aUrlString) { return aUrlString.substr(0, aUrlString.indexOf(":")); }, - getBestTitle: function PUIU_getBestTitle(aNode, aDoNotCutTitle) { + getBestTitle: function (aNode, aDoNotCutTitle) { var title; if (!aNode.title && PlacesUtils.nodeIsURI(aNode)) { // if node title is empty, try to set the label using host and filename @@ -1016,7 +1016,7 @@ this.PlacesUIUtils = { // Create a new left pane folder. var callback = { // Helper to create an organizer special query. - create_query: function CB_create_query(aQueryName, aParentId, aQueryUrl) { + create_query: function (aQueryName, aParentId, aQueryUrl) { let itemId = bs.insertBookmark(aParentId, PlacesUtils._uri(aQueryUrl), bs.DEFAULT_INDEX, @@ -1033,7 +1033,7 @@ this.PlacesUIUtils = { }, // Helper to create an organizer special folder. - create_folder: function CB_create_folder(aFolderName, aParentId, aIsRoot) { + create_folder: function (aFolderName, aParentId, aIsRoot) { // Left Pane Root Folder. let folderId = bs.createFolder(aParentId, queries[aFolderName].title, @@ -1057,7 +1057,7 @@ this.PlacesUIUtils = { return folderId; }, - runBatched: function CB_runBatched(aUserData) { + runBatched: function (aUserData) { delete PlacesUIUtils.leftPaneQueries; PlacesUIUtils.leftPaneQueries = { }; @@ -1125,7 +1125,7 @@ this.PlacesUIUtils = { * @param aItemId id of a container * @returns the name of the query, or empty string if not a left-pane query */ - getLeftPaneQueryNameFromId: function PUIU_getLeftPaneQueryNameFromId(aItemId) { + getLeftPaneQueryNameFromId: function (aItemId) { var queryName = ""; // If the let pane hasn't been built, use the annotation service // directly, to avoid building the left pane too early. @@ -1170,7 +1170,7 @@ this.PlacesUIUtils = { * @return The URL with the fragment at the end */ getImageURLForResolution: - function PUIU_getImageURLForResolution(aWindow, aURL, aWidth, aHeight) { + function (aWindow, aURL, aWidth, aHeight) { return aURL; } }; diff --git a/application/palemoon/components/places/content/bookmarkProperties.js b/application/palemoon/components/places/content/bookmarkProperties.js index e1d1077ab..5b479b02a 100644 --- a/application/palemoon/components/places/content/bookmarkProperties.js +++ b/application/palemoon/components/places/content/bookmarkProperties.js @@ -107,7 +107,7 @@ var BookmarkPropertiesPanel = { * This method returns the correct label for the dialog's "accept" * button based on the variant of the dialog. */ - _getAcceptLabel: function BPP__getAcceptLabel() { + _getAcceptLabel: function () { if (this._action == ACTION_ADD) { if (this._URIs.length) return this._strings.getString("dialogAcceptLabelAddMulti"); @@ -127,7 +127,7 @@ var BookmarkPropertiesPanel = { * This method returns the correct title for the current variant * of this dialog. */ - _getDialogTitle: function BPP__getDialogTitle() { + _getDialogTitle: function () { if (this._action == ACTION_ADD) { if (this._itemType == BOOKMARK_ITEM) return this._strings.getString("dialogTitleAddBookmark"); @@ -150,7 +150,7 @@ var BookmarkPropertiesPanel = { /** * Determines the initial data for the item edited or added by this dialog */ - _determineItemInfo: function BPP__determineItemInfo() { + _determineItemInfo: function () { var dialogInfo = window.arguments[0]; this._action = dialogInfo.action == "add" ? ACTION_ADD : ACTION_EDIT; this._hiddenRows = dialogInfo.hiddenRows ? dialogInfo.hiddenRows : []; @@ -294,7 +294,7 @@ var BookmarkPropertiesPanel = { * * @returns a title string */ - _getURITitleFromHistory: function BPP__getURITitleFromHistory(aURI) { + _getURITitleFromHistory: function (aURI) { NS_ASSERT(aURI instanceof Ci.nsIURI); // get the title from History @@ -305,7 +305,7 @@ var BookmarkPropertiesPanel = { * This method should be called by the onload of the Bookmark Properties * dialog to initialize the state of the panel. */ - onDialogLoad: Task.async(function* BPP_onDialogLoad() { + onDialogLoad: Task.async(function* () { this._determineItemInfo(); document.title = this._getDialogTitle(); @@ -390,7 +390,7 @@ var BookmarkPropertiesPanel = { }), // nsIDOMEventListener - handleEvent: function BPP_handleEvent(aEvent) { + handleEvent: function (aEvent) { var target = aEvent.target; switch (aEvent.type) { case "input": @@ -413,7 +413,7 @@ var BookmarkPropertiesPanel = { } }, - _beginBatch: function BPP__beginBatch() { + _beginBatch: function () { if (this._batching) return; @@ -421,7 +421,7 @@ var BookmarkPropertiesPanel = { this._batching = true; }, - _endBatch: function BPP__endBatch() { + _endBatch: function () { if (!this._batching) return; @@ -429,13 +429,13 @@ var BookmarkPropertiesPanel = { this._batching = false; }, - _fillEditProperties: function BPP__fillEditProperties() { + _fillEditProperties: function () { gEditItemOverlay.initPanel(this._itemId, { hiddenRows: this._hiddenRows, forceReadOnly: this._readOnly }); }, - _fillAddProperties: Task.async(function* BPP__fillAddProperties() { + _fillAddProperties: Task.async(function* () { yield this._createNewItem(); // Edit the new item gEditItemOverlay.initPanel(this._itemId, @@ -449,7 +449,7 @@ var BookmarkPropertiesPanel = { }), // nsISupports - QueryInterface: function BPP_QueryInterface(aIID) { + QueryInterface: function (aIID) { if (aIID.equals(Ci.nsIDOMEventListener) || aIID.equals(Ci.nsISupports)) return this; @@ -457,11 +457,11 @@ var BookmarkPropertiesPanel = { throw Cr.NS_NOINTERFACE; }, - _element: function BPP__element(aID) { + _element: function (aID) { return document.getElementById("editBMPanel_" + aID); }, - onDialogUnload: function BPP_onDialogUnload() { + onDialogUnload: function () { // gEditItemOverlay does not exist anymore here, so don't rely on it. this._mutationObserver.disconnect(); delete this._mutationObserver; @@ -478,7 +478,7 @@ var BookmarkPropertiesPanel = { .removeEventListener("input", this, false); }, - onDialogAccept: function BPP_onDialogAccept() { + onDialogAccept: function () { // We must blur current focused element to save its changes correctly document.commandDispatcher.focusedElement.blur(); // The order here is important! We have to uninit the panel first, otherwise @@ -488,7 +488,7 @@ var BookmarkPropertiesPanel = { window.arguments[0].performed = true; }, - onDialogCancel: function BPP_onDialogCancel() { + onDialogCancel: function () { // The order here is important! We have to uninit the panel first, otherwise // changes done as part of Undo may change the panel contents and by // that force it to commit more transactions. @@ -503,7 +503,7 @@ var BookmarkPropertiesPanel = { * * @returns true if the input is valid, false otherwise */ - _inputIsValid: function BPP__inputIsValid() { + _inputIsValid: function () { if (this._itemType == BOOKMARK_ITEM && !this._containsValidURI("locationField")) return false; @@ -522,7 +522,7 @@ var BookmarkPropertiesPanel = { * * @returns true if the textbox contains a valid URI string, false otherwise */ - _containsValidURI: function BPP__containsValidURI(aTextboxID) { + _containsValidURI: function (aTextboxID) { try { var value = this._element(aTextboxID).value; if (value) { @@ -540,7 +540,7 @@ var BookmarkPropertiesPanel = { * The container-identifier and insertion-index are returned separately in * the form of [containerIdentifier, insertionIndex] */ - _getInsertionPointDetails: function BPP__getInsertionPointDetails() { + _getInsertionPointDetails: function () { var containerId = this._defaultInsertionPoint.itemId; var indexInContainer = this._defaultInsertionPoint.index; @@ -552,7 +552,7 @@ var BookmarkPropertiesPanel = { * various fields and opening arguments of the dialog. */ _getCreateNewBookmarkTransaction: - function BPP__getCreateNewBookmarkTransaction(aContainer, aIndex) { + function (aContainer, aIndex) { var annotations = []; var childTransactions = []; @@ -598,7 +598,7 @@ var BookmarkPropertiesPanel = { * Returns a childItems-transactions array representing the URIList with * which the dialog has been opened. */ - _getTransactionsForURIList: function BPP__getTransactionsForURIList() { + _getTransactionsForURIList: function () { var transactions = []; for (var i = 0; i < this._URIs.length; ++i) { var uri = this._URIs[i]; @@ -616,7 +616,7 @@ var BookmarkPropertiesPanel = { * various fields and opening arguments of the dialog. */ _getCreateNewFolderTransaction: - function BPP__getCreateNewFolderTransaction(aContainer, aIndex) { + function (aContainer, aIndex) { var annotations = []; var childItemsTransactions; if (this._URIs.length) @@ -635,7 +635,7 @@ var BookmarkPropertiesPanel = { * the various fields and opening arguments of the dialog. */ _getCreateNewLivemarkTransaction: - function BPP__getCreateNewLivemarkTransaction(aContainer, aIndex) { + function (aContainer, aIndex) { return new PlacesCreateLivemarkTransaction(this._feedURI, this._siteURI, this._title, aContainer, aIndex); @@ -644,7 +644,7 @@ var BookmarkPropertiesPanel = { /** * Dialog-accept code-path for creating a new item (any type) */ - _createNewItem: Task.async(function* BPP__getCreateItemTransaction() { + _createNewItem: Task.async(function* () { var [container, index] = this._getInsertionPointDetails(); var txn; diff --git a/application/palemoon/components/places/content/browserPlacesViews.js b/application/palemoon/components/places/content/browserPlacesViews.js index 8b90dd280..6e4926e77 100644 --- a/application/palemoon/components/places/content/browserPlacesViews.js +++ b/application/palemoon/components/places/content/browserPlacesViews.js @@ -92,7 +92,7 @@ PlacesViewBase.prototype = { * @throws if there is no DOM node set for aPlacesNode. */ _getDOMNodeForPlacesNode: - function PVB__getDOMNodeForPlacesNode(aPlacesNode) { + function (aPlacesNode) { let node = this._domNodes.get(aPlacesNode, null); if (!node) { throw new Error("No DOM node set for aPlacesNode.\nnode.type: " + @@ -182,17 +182,17 @@ PlacesViewBase.prototype = { index, orientation, isTag); }, - buildContextMenu: function PVB_buildContextMenu(aPopup) { + buildContextMenu: function (aPopup) { this._contextMenuShown = aPopup; window.updateCommands("places"); return this.controller.buildContextMenu(aPopup); }, - destroyContextMenu: function PVB_destroyContextMenu(aPopup) { + destroyContextMenu: function (aPopup) { this._contextMenuShown = null; }, - _cleanPopup: function PVB_cleanPopup(aPopup, aDelay) { + _cleanPopup: function (aPopup, aDelay) { // Remove Places nodes from the popup. let child = aPopup._startMarker; while (child.nextSibling != aPopup._endMarker) { @@ -215,7 +215,7 @@ PlacesViewBase.prototype = { } }, - _rebuildPopup: function PVB__rebuildPopup(aPopup) { + _rebuildPopup: function (aPopup) { let resultNode = aPopup._placesNode; if (!resultNode.containerOpen) return; @@ -244,7 +244,7 @@ PlacesViewBase.prototype = { aPopup._built = true; }, - _removeChild: function PVB__removeChild(aChild) { + _removeChild: function (aChild) { // If document.popupNode pointed to this child, null it out, // otherwise controller's command-updating may rely on the removed // item still being "selected". @@ -255,7 +255,7 @@ PlacesViewBase.prototype = { }, _setEmptyPopupStatus: - function PVB__setEmptyPopupStatus(aPopup, aEmpty) { + function (aPopup, aEmpty) { if (!aPopup._emptyMenuitem) { let label = PlacesUIUtils.getString("bookmarksMenuEmptyFolder"); aPopup._emptyMenuitem = document.createElement("menuitem"); @@ -279,7 +279,7 @@ PlacesViewBase.prototype = { }, _createMenuItemForPlacesNode: - function PVB__createMenuItemForPlacesNode(aPlacesNode) { + function (aPlacesNode) { this._domNodes.delete(aPlacesNode); let element; @@ -357,7 +357,7 @@ PlacesViewBase.prototype = { }, _insertNewItemToPopup: - function PVB__insertNewItemToPopup(aNewChild, aPopup, aBefore) { + function (aNewChild, aPopup, aBefore) { let element = this._createMenuItemForPlacesNode(aNewChild); let before = aBefore || aPopup._endMarker; aPopup.insertBefore(element, before); @@ -365,7 +365,7 @@ PlacesViewBase.prototype = { }, _setLivemarkSiteURIMenuItem: - function PVB__setLivemarkSiteURIMenuItem(aPopup) { + function (aPopup) { let livemarkInfo = this.controller.getCachedLivemarkInfo(aPopup._placesNode); let siteUrl = livemarkInfo && livemarkInfo.siteURI ? livemarkInfo.siteURI.spec : null; @@ -408,7 +408,7 @@ PlacesViewBase.prototype = { * The livemark status */ _setLivemarkStatusMenuItem: - function PVB_setLivemarkStatusMenuItem(aPopup, aStatus) { + function (aPopup, aStatus) { let statusMenuitem = aPopup._statusMenuitem; if (!statusMenuitem) { // Create the status menuitem and cache it in the popup object. @@ -434,7 +434,7 @@ PlacesViewBase.prototype = { } }, - toggleCutNode: function PVB_toggleCutNode(aPlacesNode, aValue) { + toggleCutNode: function (aPlacesNode, aValue) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // We may get the popup for menus, but we need the menu itself. @@ -446,7 +446,7 @@ PlacesViewBase.prototype = { elt.removeAttribute("cutting"); }, - nodeURIChanged: function PVB_nodeURIChanged(aPlacesNode, aURIString) { + nodeURIChanged: function (aPlacesNode, aURIString) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // Here we need the . @@ -456,7 +456,7 @@ PlacesViewBase.prototype = { elt.setAttribute("scheme", PlacesUIUtils.guessUrlSchemeForUI(aURIString)); }, - nodeIconChanged: function PVB_nodeIconChanged(aPlacesNode) { + nodeIconChanged: function (aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // There's no UI representation for the root node, thus there's nothing to @@ -477,7 +477,7 @@ PlacesViewBase.prototype = { }, nodeAnnotationChanged: - function PVB_nodeAnnotationChanged(aPlacesNode, aAnno) { + function (aPlacesNode, aAnno) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // All livemarks have a feedURI, so use it as our indicator of a livemark @@ -504,7 +504,7 @@ PlacesViewBase.prototype = { }, nodeTitleChanged: - function PVB_nodeTitleChanged(aPlacesNode, aNewTitle) { + function (aPlacesNode, aNewTitle) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // There's no UI representation for the root node, thus there's @@ -528,7 +528,7 @@ PlacesViewBase.prototype = { }, nodeRemoved: - function PVB_nodeRemoved(aParentPlacesNode, aPlacesNode, aIndex) { + function (aParentPlacesNode, aPlacesNode, aIndex) { let parentElt = this._getDOMNodeForPlacesNode(aParentPlacesNode); let elt = this._getDOMNodeForPlacesNode(aPlacesNode); @@ -548,7 +548,7 @@ PlacesViewBase.prototype = { }, nodeHistoryDetailsChanged: - function PVB_nodeHistoryDetailsChanged(aPlacesNode, aTime, aCount) { + function (aPlacesNode, aTime, aCount) { if (aPlacesNode.parent && this.controller.hasCachedLivemarkInfo(aPlacesNode.parent)) { // Find the node in the parent. @@ -575,7 +575,7 @@ PlacesViewBase.prototype = { batching: function() { }, nodeInserted: - function PVB_nodeInserted(aParentPlacesNode, aPlacesNode, aIndex) { + function (aParentPlacesNode, aPlacesNode, aIndex) { let parentElt = this._getDOMNodeForPlacesNode(aParentPlacesNode); if (!parentElt._built) return; @@ -588,7 +588,7 @@ PlacesViewBase.prototype = { }, nodeMoved: - function PBV_nodeMoved(aPlacesNode, + function (aPlacesNode, aOldParentPlacesNode, aOldIndex, aNewParentPlacesNode, aNewIndex) { // Note: the current implementation of moveItem does not actually @@ -617,7 +617,7 @@ PlacesViewBase.prototype = { }, containerStateChanged: - function PVB_containerStateChanged(aPlacesNode, aOldState, aNewState) { + function (aPlacesNode, aOldState, aNewState) { if (aNewState == Ci.nsINavHistoryContainerResultNode.STATE_OPENED || aNewState == Ci.nsINavHistoryContainerResultNode.STATE_CLOSED) { this.invalidateContainer(aPlacesNode); @@ -649,7 +649,7 @@ PlacesViewBase.prototype = { } }, - _populateLivemarkPopup: function PVB__populateLivemarkPopup(aPopup) + _populateLivemarkPopup: function (aPopup) { this._setLivemarkSiteURIMenuItem(aPopup); // Show the loading status only if there are no entries yet. @@ -679,7 +679,7 @@ PlacesViewBase.prototype = { }, Components.utils.reportError); }, - invalidateContainer: function PVB_invalidateContainer(aPlacesNode) { + invalidateContainer: function (aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); elt._built = false; @@ -688,7 +688,7 @@ PlacesViewBase.prototype = { this._rebuildPopup(elt); }, - uninit: function PVB_uninit() { + uninit: function () { if (this._result) { this._result.removeObserver(this); this._resultNode.containerOpen = false; @@ -729,7 +729,7 @@ PlacesViewBase.prototype = { * @param aPopup * a Places popup. */ - _mayAddCommandsItems: function PVB__mayAddCommandsItems(aPopup) { + _mayAddCommandsItems: function (aPopup) { // The command items are never added to the root popup. if (aPopup == this._rootElt) return; @@ -794,7 +794,7 @@ PlacesViewBase.prototype = { } }, - _ensureMarkers: function PVB__ensureMarkers(aPopup) { + _ensureMarkers: function (aPopup) { if (aPopup._startMarker) return; @@ -830,7 +830,7 @@ PlacesViewBase.prototype = { } }, - _onPopupShowing: function PVB__onPopupShowing(aEvent) { + _onPopupShowing: function (aEvent) { // Avoid handling popupshowing of inner views. let popup = aEvent.originalTarget; @@ -854,14 +854,14 @@ PlacesViewBase.prototype = { }, _addEventListeners: - function PVB__addEventListeners(aObject, aEventNames, aCapturing) { + function (aObject, aEventNames, aCapturing) { for (let i = 0; i < aEventNames.length; i++) { aObject.addEventListener(aEventNames[i], this, aCapturing); } }, _removeEventListeners: - function PVB__removeEventListeners(aObject, aEventNames, aCapturing) { + function (aObject, aEventNames, aCapturing) { for (let i = 0; i < aEventNames.length; i++) { aObject.removeEventListener(aEventNames[i], this, aCapturing); } @@ -914,7 +914,7 @@ PlacesToolbar.prototype = { _cbEvents: ["dragstart", "dragover", "dragexit", "dragend", "drop", "mousemove", "mouseover", "mouseout"], - QueryInterface: function PT_QueryInterface(aIID) { + QueryInterface: function (aIID) { if (aIID.equals(Ci.nsIDOMEventListener) || aIID.equals(Ci.nsITimerCallback)) return this; @@ -922,7 +922,7 @@ PlacesToolbar.prototype = { return PlacesViewBase.prototype.QueryInterface.apply(this, arguments); }, - uninit: function PT_uninit() { + uninit: function () { this._removeEventListeners(this._viewElt, this._cbEvents, false); this._removeEventListeners(this._rootElt, ["popupshowing", "popuphidden"], true); @@ -936,7 +936,7 @@ PlacesToolbar.prototype = { _openedMenuButton: null, _allowPopupShowing: true, - _rebuild: function PT__rebuild() { + _rebuild: function () { // Clear out references to existing nodes, since they will be removed // and re-added. if (this._overFolder.elt) @@ -961,7 +961,7 @@ PlacesToolbar.prototype = { }, _insertNewItem: - function PT__insertNewItem(aChild, aBefore) { + function (aChild, aBefore) { this._domNodes.delete(aChild); let type = aChild.type; @@ -1022,7 +1022,7 @@ PlacesToolbar.prototype = { }, _updateChevronPopupNodesVisibility: - function PT__updateChevronPopupNodesVisibility() { + function () { for (let i = 0, node = this._chevronPopup._startMarker.nextSibling; node != this._chevronPopup._endMarker; i++, node = node.nextSibling) { @@ -1031,7 +1031,7 @@ PlacesToolbar.prototype = { }, _onChevronPopupShowing: - function PT__onChevronPopupShowing(aEvent) { + function (aEvent) { // Handle popupshowing only for the chevron popup, not for nested ones. if (aEvent.target != this._chevronPopup) return; @@ -1042,7 +1042,7 @@ PlacesToolbar.prototype = { this._updateChevronPopupNodesVisibility(); }, - handleEvent: function PT_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "unload": this.uninit(); @@ -1120,7 +1120,7 @@ PlacesToolbar.prototype = { } }, - updateChevron: function PT_updateChevron() { + updateChevron: function () { // If the chevron is collapsed there's nothing to update. if (this._chevron.collapsed) return; @@ -1133,7 +1133,7 @@ PlacesToolbar.prototype = { this._updateChevronTimer = this._setTimer(100); }, - _updateChevronTimerCallback: function PT__updateChevronTimerCallback() { + _updateChevronTimerCallback: function () { let scrollRect = this._rootElt.getBoundingClientRect(); let childOverflowed = false; for (let i = 0; i < this._rootElt.childNodes.length; i++) { @@ -1155,7 +1155,7 @@ PlacesToolbar.prototype = { }, nodeInserted: - function PT_nodeInserted(aParentPlacesNode, aPlacesNode, aIndex) { + function (aParentPlacesNode, aPlacesNode, aIndex) { let parentElt = this._getDOMNodeForPlacesNode(aParentPlacesNode); if (parentElt == this._rootElt) { let children = this._rootElt.childNodes; @@ -1169,7 +1169,7 @@ PlacesToolbar.prototype = { }, nodeRemoved: - function PT_nodeRemoved(aParentPlacesNode, aPlacesNode, aIndex) { + function (aParentPlacesNode, aPlacesNode, aIndex) { let parentElt = this._getDOMNodeForPlacesNode(aParentPlacesNode); let elt = this._getDOMNodeForPlacesNode(aPlacesNode); @@ -1187,7 +1187,7 @@ PlacesToolbar.prototype = { }, nodeMoved: - function PT_nodeMoved(aPlacesNode, + function (aPlacesNode, aOldParentPlacesNode, aOldIndex, aNewParentPlacesNode, aNewIndex) { let parentElt = this._getDOMNodeForPlacesNode(aNewParentPlacesNode); @@ -1219,7 +1219,7 @@ PlacesToolbar.prototype = { }, nodeAnnotationChanged: - function PT_nodeAnnotationChanged(aPlacesNode, aAnno) { + function (aPlacesNode, aAnno) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); if (elt == this._rootElt) return; @@ -1248,7 +1248,7 @@ PlacesToolbar.prototype = { } }, - nodeTitleChanged: function PT_nodeTitleChanged(aPlacesNode, aNewTitle) { + nodeTitleChanged: function (aPlacesNode, aNewTitle) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); // There's no UI representation for the root node, thus there's @@ -1268,7 +1268,7 @@ PlacesToolbar.prototype = { } }, - invalidateContainer: function PT_invalidateContainer(aPlacesNode) { + invalidateContainer: function (aPlacesNode) { let elt = this._getDOMNodeForPlacesNode(aPlacesNode); if (elt == this._rootElt) { // Container is the toolbar itself. @@ -1284,7 +1284,7 @@ PlacesToolbar.prototype = { hoverTime: 350, closeTimer: null }, - _clearOverFolder: function PT__clearOverFolder() { + _clearOverFolder: function () { // The mouse is no longer dragging over the stored menubutton. // Close the menubutton, clear out drag styles, and clear all // timers for opening/closing it. @@ -1312,7 +1312,7 @@ PlacesToolbar.prototype = { * - beforeIndex: child index to drop before, for the drop indicator. * - folderElt: the folder to drop into, if applicable. */ - _getDropPoint: function PT__getDropPoint(aEvent) { + _getDropPoint: function (aEvent) { let result = this.result; if (!PlacesUtils.nodeIsFolder(this._resultNode)) return null; @@ -1395,13 +1395,13 @@ PlacesToolbar.prototype = { return dropPoint; }, - _setTimer: function PT_setTimer(aTime) { + _setTimer: function (aTime) { let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer); timer.initWithCallback(this, aTime, timer.TYPE_ONE_SHOT); return timer; }, - notify: function PT_notify(aTimer) { + notify: function (aTimer) { if (aTimer == this._updateChevronTimer) { this._updateChevronTimer = null; this._updateChevronTimerCallback(); @@ -1446,18 +1446,18 @@ PlacesToolbar.prototype = { } }, - _onMouseOver: function PT__onMouseOver(aEvent) { + _onMouseOver: function (aEvent) { let button = aEvent.target; if (button.parentNode == this._rootElt && button._placesNode && PlacesUtils.nodeIsURI(button._placesNode)) window.XULBrowserWindow.setOverLink(aEvent.target._placesNode.uri, null); }, - _onMouseOut: function PT__onMouseOut(aEvent) { + _onMouseOut: function (aEvent) { window.XULBrowserWindow.setOverLink("", null); }, - _cleanupDragDetails: function PT__cleanupDragDetails() { + _cleanupDragDetails: function () { // Called on dragend and drop. PlacesControllerDragHelper.currentDropTarget = null; this._draggedElt = null; @@ -1467,7 +1467,7 @@ PlacesToolbar.prototype = { this._dropIndicator.collapsed = true; }, - _onDragStart: function PT__onDragStart(aEvent) { + _onDragStart: function (aEvent) { // Sub menus have their own d&d handlers. let draggedElt = aEvent.target; if (draggedElt.parentNode != this._rootElt || !draggedElt._placesNode) @@ -1502,7 +1502,7 @@ PlacesToolbar.prototype = { aEvent.stopPropagation(); }, - _onDragOver: function PT__onDragOver(aEvent) { + _onDragOver: function (aEvent) { // Cache the dataTransfer PlacesControllerDragHelper.currentDropTarget = aEvent.target; let dt = aEvent.dataTransfer; @@ -1578,7 +1578,7 @@ PlacesToolbar.prototype = { aEvent.stopPropagation(); }, - _onDrop: function PT__onDrop(aEvent) { + _onDrop: function (aEvent) { PlacesControllerDragHelper.currentDropTarget = aEvent.target; let dropPoint = this._getDropPoint(aEvent); @@ -1591,7 +1591,7 @@ PlacesToolbar.prototype = { aEvent.stopPropagation(); }, - _onDragExit: function PT__onDragExit(aEvent) { + _onDragExit: function (aEvent) { PlacesControllerDragHelper.currentDropTarget = null; // Set timer to turn off indicator bar (if we turn it off @@ -1606,11 +1606,11 @@ PlacesToolbar.prototype = { this._overFolder.closeTimer = this._setTimer(this._overFolder.hoverTime); }, - _onDragEnd: function PT_onDragEnd(aEvent) { + _onDragEnd: function (aEvent) { this._cleanupDragDetails(); }, - _onPopupShowing: function PT__onPopupShowing(aEvent) { + _onPopupShowing: function (aEvent) { if (!this._allowPopupShowing) { this._allowPopupShowing = true; aEvent.preventDefault(); @@ -1624,7 +1624,7 @@ PlacesToolbar.prototype = { PlacesViewBase.prototype._onPopupShowing.apply(this, arguments); }, - _onPopupHidden: function PT__onPopupHidden(aEvent) { + _onPopupHidden: function (aEvent) { let popup = aEvent.target; let placesNode = popup._placesNode; // Avoid handling popuphidden of inner views @@ -1650,7 +1650,7 @@ PlacesToolbar.prototype = { } }, - _onMouseMove: function PT__onMouseMove(aEvent) { + _onMouseMove: function (aEvent) { // Used in dragStart to prevent dragging folders when dragging down. this._cachedMouseMoveEvent = aEvent; @@ -1696,18 +1696,18 @@ function PlacesMenu(aPopupShowingEvent, aPlace) { PlacesMenu.prototype = { __proto__: PlacesViewBase.prototype, - QueryInterface: function PM_QueryInterface(aIID) { + QueryInterface: function (aIID) { if (aIID.equals(Ci.nsIDOMEventListener)) return this; return PlacesViewBase.prototype.QueryInterface.apply(this, arguments); }, - _removeChild: function PM_removeChild(aChild) { + _removeChild: function (aChild) { PlacesViewBase.prototype._removeChild.apply(this, arguments); }, - uninit: function PM_uninit() { + uninit: function () { this._removeEventListeners(this._rootElt, ["popupshowing", "popuphidden"], true); this._removeEventListeners(window, ["unload"], false); @@ -1715,7 +1715,7 @@ PlacesMenu.prototype = { PlacesViewBase.prototype.uninit.apply(this, arguments); }, - handleEvent: function PM_handleEvent(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "unload": this.uninit(); @@ -1729,7 +1729,7 @@ PlacesMenu.prototype = { } }, - _onPopupHidden: function PM__onPopupHidden(aEvent) { + _onPopupHidden: function (aEvent) { // Avoid handling popuphidden of inner views. let popup = aEvent.originalTarget; let placesNode = popup._placesNode; diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js index f4e272e2f..663eddfc0 100644 --- a/application/palemoon/components/places/content/controller.js +++ b/application/palemoon/components/places/content/controller.js @@ -97,15 +97,15 @@ PlacesController.prototype = { ]), // nsIClipboardOwner - LosingOwnership: function PC_LosingOwnership (aXferable) { + LosingOwnership: function (aXferable) { this.cutNodes = []; }, - terminate: function PC_terminate() { + terminate: function () { this._releaseClipboardOwnership(); }, - supportsCommand: function PC_supportsCommand(aCommand) { + supportsCommand: function (aCommand) { // Non-Places specific commands that we also support switch (aCommand) { case "cmd_undo": @@ -124,7 +124,7 @@ PlacesController.prototype = { return (aCommand.substr(0, CMD_PREFIX.length) == CMD_PREFIX); }, - isCommandEnabled: function PC_isCommandEnabled(aCommand) { + isCommandEnabled: function (aCommand) { switch (aCommand) { case "cmd_undo": return PlacesUtils.transactionManager.numberOfUndoItems > 0; @@ -199,7 +199,7 @@ PlacesController.prototype = { } }, - doCommand: function PC_doCommand(aCommand) { + doCommand: function (aCommand) { switch (aCommand) { case "cmd_undo": PlacesUtils.transactionManager.undoTransaction(); @@ -291,7 +291,7 @@ PlacesController.prototype = { } }, - onEvent: function PC_onEvent(eventName) { }, + onEvent: function (eventName) { }, /** @@ -328,7 +328,7 @@ PlacesController.prototype = { /** * Determines whether or not nodes can be inserted relative to the selection. */ - _canInsert: function PC__canInsert(isPaste) { + _canInsert: function (isPaste) { var ip = this._view.insertionPoint; return ip != null && (isPaste || ip.isTag != true); }, @@ -341,7 +341,7 @@ PlacesController.prototype = { - clipboard data is of type TEXT_UNICODE and is a valid URI. */ - _isClipboardDataPasteable: function PC__isClipboardDataPasteable() { + _isClipboardDataPasteable: function () { // if the clipboard contains TYPE_X_MOZ_PLACE_* data, it is definitely // pasteable, with no need to unwrap all the nodes. @@ -401,7 +401,7 @@ PlacesController.prototype = { * Notes: * 1) This can be slow, so don't call it anywhere performance critical! */ - _buildSelectionMetadata: function PC__buildSelectionMetadata() { + _buildSelectionMetadata: function () { var metadata = []; var nodes = this._view.selectedNodes; @@ -484,7 +484,7 @@ PlacesController.prototype = { * @returns true if the conditions (see buildContextMenu) are satisfied * and the item can be displayed, false otherwise. */ - _shouldShowMenuItem: function PC__shouldShowMenuItem(aMenuItem, aMetaData) { + _shouldShowMenuItem: function (aMenuItem, aMetaData) { var selectiontype = aMenuItem.getAttribute("selectiontype"); if (!selectiontype) { selectiontype = "single|multiple"; @@ -577,7 +577,7 @@ PlacesController.prototype = { * The menupopup to build children into. * @return true if at least one item is visible, false otherwise. */ - buildContextMenu: function PC_buildContextMenu(aPopup) { + buildContextMenu: function (aPopup) { var metadata = this._buildSelectionMetadata(); var ip = this._view.insertionPoint; var noIp = !ip || ip.isTag; @@ -648,7 +648,7 @@ PlacesController.prototype = { /** * Select all links in the current view. */ - selectAll: function PC_selectAll() { + selectAll: function () { this._view.selectAll(); }, @@ -656,7 +656,7 @@ PlacesController.prototype = { * Opens the bookmark properties for the selected URI Node. */ showBookmarkPropertiesForSelection: - function PC_showBookmarkPropertiesForSelection() { + function () { var node = this._view.selectedNode; if (!node) return; @@ -684,7 +684,7 @@ PlacesController.prototype = { * This method can be run on a URI parameter to ensure that it didn't * receive a string instead of an nsIURI object. */ - _assertURINotString: function PC__assertURINotString(value) { + _assertURINotString: function (value) { NS_ASSERT((typeof(value) == "object") && !(value instanceof String), "This method should be passed a URI as a nsIURI object, not as a string."); }, @@ -692,7 +692,7 @@ PlacesController.prototype = { /** * Reloads the selected livemark if any. */ - reloadSelectedLivemark: function PC_reloadSelectedLivemark() { + reloadSelectedLivemark: function () { var selectedNode = this._view.selectedNode; if (selectedNode) { let itemId = selectedNode.itemId; @@ -706,7 +706,7 @@ PlacesController.prototype = { /** * Opens the links in the selected folder, or the selected links in new tabs. */ - openSelectionInTabs: function PC_openLinksInTabs(aEvent) { + openSelectionInTabs: function (aEvent) { var node = this._view.selectedNode; var nodes = this._view.selectedNodes; // In the case of no selection, open the root node: @@ -725,7 +725,7 @@ PlacesController.prototype = { * @param aType * the type of the new item (bookmark/livemark/folder) */ - newItem: function PC_newItem(aType) { + newItem: function (aType) { let ip = this._view.insertionPoint; if (!ip) throw Cr.NS_ERROR_NOT_AVAILABLE; @@ -747,7 +747,7 @@ PlacesController.prototype = { /** * Create a new Bookmark separator somewhere. */ - newSeparator: function PC_newSeparator() { + newSeparator: function () { var ip = this._view.insertionPoint; if (!ip) throw Cr.NS_ERROR_NOT_AVAILABLE; @@ -762,7 +762,7 @@ PlacesController.prototype = { /** * Opens a dialog for moving the selected nodes. */ - moveSelectedBookmarks: function PC_moveBookmarks() { + moveSelectedBookmarks: function () { window.openDialog("chrome://browser/content/places/moveBookmarks.xul", "", "chrome, modal", this._view.selectedNodes); @@ -771,7 +771,7 @@ PlacesController.prototype = { /** * Sort the selected folder by name. */ - sortFolderByName: function PC_sortFolderByName() { + sortFolderByName: function () { var itemId = PlacesUtils.getConcreteItemId(this._view.selectedNode); var txn = new PlacesSortFolderByNameTransaction(itemId); PlacesUtils.transactionManager.doTransaction(txn); @@ -780,7 +780,7 @@ PlacesController.prototype = { /** * Open the parent folder for the selected bookmarks search result. */ - openParentFolder: function PC_openParentFolder() { + openParentFolder: function () { var view; if (!document.popupNode) { view = document.commandDispatcher.focusedElement; @@ -796,7 +796,7 @@ PlacesController.prototype = { this.selectFolderByItemId(view, aFolderItemId, aItemId); }, - getParentFolderByItemId: function PC_getParentFolderByItemId(aItemId) { + getParentFolderByItemId: function (aItemId) { var bmsvc = Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"]. getService(Components.interfaces.nsINavBookmarksService); var parentFolderId = bmsvc.getFolderIdForItem(aItemId); @@ -804,7 +804,7 @@ PlacesController.prototype = { return parentFolderId; }, - selectItems2: function PC_selectItems2(view, aIDs) { + selectItems2: function (view, aIDs) { var ids = aIDs; // Don't manipulate the caller's array. // Array of nodes found by findNodes which are to be selected @@ -904,7 +904,7 @@ PlacesController.prototype = { selection.selectEventsSuppressed = false; }, - selectFolderByItemId: function PC_selectFolderByItemId(view, aFolderItemId, aItemId) { + selectFolderByItemId: function (view, aFolderItemId, aItemId) { // Library if (view.getAttribute("id") == "placeContent") { view = document.getElementById("placesList"); @@ -1062,7 +1062,7 @@ PlacesController.prototype = { * List of folders the calling function has already traversed * @returns true if the node should be skipped, false otherwise. */ - _shouldSkipNode: function PC_shouldSkipNode(node, pastFolders) { + _shouldSkipNode: function (node, pastFolders) { /** * Determines if a node is contained by another node within a resultset. * @param node @@ -1098,7 +1098,7 @@ PlacesController.prototype = { * @param [optional] removedFolders * An array of folder nodes that have already been removed. */ - _removeRange: function PC__removeRange(range, transactions, removedFolders) { + _removeRange: function (range, transactions, removedFolders) { NS_ASSERT(transactions instanceof Array, "Must pass a transactions array"); if (!removedFolders) removedFolders = []; @@ -1167,7 +1167,7 @@ PlacesController.prototype = { * @param txnName * See |remove|. */ - _removeRowsFromBookmarks: function PC__removeRowsFromBookmarks(txnName) { + _removeRowsFromBookmarks: function (txnName) { var ranges = this._view.removableSelectionRanges; var transactions = []; var removedFolders = []; @@ -1186,7 +1186,7 @@ PlacesController.prototype = { * * @note history deletes are not undoable. */ - _removeRowsFromHistory: function PC__removeRowsFromHistory() { + _removeRowsFromHistory: function () { let nodes = this._view.selectedNodes; let URIs = []; for (let i = 0; i < nodes.length; ++i) { @@ -1229,7 +1229,7 @@ PlacesController.prototype = { * * @note history deletes are not undoable. */ - _removeHistoryContainer: function PC__removeHistoryContainer(aContainerNode) { + _removeHistoryContainer: function (aContainerNode) { if (PlacesUtils.nodeIsHost(aContainerNode)) { // Site container. PlacesUtils.bhistory.removePagesFromHost(aContainerNode.title, true); @@ -1255,7 +1255,7 @@ PlacesController.prototype = { * A name for the transaction if this is being performed * as part of another operation. */ - remove: function PC_remove(aTxnName) { + remove: function (aTxnName) { if (!this._hasRemovableSelection()) return; @@ -1284,7 +1284,7 @@ PlacesController.prototype = { * @param aEvent * The dragstart event. */ - setDataTransfer: function PC_setDataTransfer(aEvent) { + setDataTransfer: function (aEvent) { let dt = aEvent.dataTransfer; let doCopy = ["copyLink", "copy", "link"].indexOf(dt.effectAllowed) != -1; @@ -1355,14 +1355,14 @@ PlacesController.prototype = { return action; }, - _releaseClipboardOwnership: function PC__releaseClipboardOwnership() { + _releaseClipboardOwnership: function () { if (this.cutNodes.length > 0) { // This clears the logical clipboard, doesn't remove data. this.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard); } }, - _clearClipboard: function PC__clearClipboard() { + _clearClipboard: function () { let xferable = Cc["@mozilla.org/widget/transferable;1"]. createInstance(Ci.nsITransferable); xferable.init(null); @@ -1373,7 +1373,7 @@ PlacesController.prototype = { this.clipboard.setData(xferable, null, Ci.nsIClipboard.kGlobalClipboard); }, - _populateClipboard: function PC__populateClipboard(aNodes, aAction) { + _populateClipboard: function (aNodes, aAction) { // This order is _important_! It controls how this and other applications // select data to be inserted based on type. let contents = [ @@ -1455,7 +1455,7 @@ PlacesController.prototype = { /** * Copy Bookmarks and Folders to the clipboard */ - copy: function PC_copy() { + copy: function () { let result = this._view.result; let didSuppressNotifications = result.suppressNotifications; if (!didSuppressNotifications) @@ -1472,7 +1472,7 @@ PlacesController.prototype = { /** * Cut Bookmarks and Folders to the clipboard */ - cut: function PC_cut() { + cut: function () { let result = this._view.result; let didSuppressNotifications = result.suppressNotifications; if (!didSuppressNotifications) @@ -1490,7 +1490,7 @@ PlacesController.prototype = { /** * Paste Bookmarks and Folders from the clipboard */ - paste: function PC_paste() { + paste: function () { // No reason to proceed if there isn't a valid insertion point. let ip = this._view.insertionPoint; if (!ip) @@ -1572,7 +1572,7 @@ PlacesController.prototype = { * @param aLivemarkInfo * a mozILivemarkInfo object. */ - cacheLivemarkInfo: function PC_cacheLivemarkInfo(aNode, aLivemarkInfo) { + cacheLivemarkInfo: function (aNode, aLivemarkInfo) { this._cachedLivemarkInfoObjects.set(aNode, aLivemarkInfo); }, @@ -1583,7 +1583,7 @@ PlacesController.prototype = { * @return true if there's a cached mozILivemarkInfo object for * aNode, false otherwise. */ - hasCachedLivemarkInfo: function PC_hasCachedLivemarkInfo(aNode) + hasCachedLivemarkInfo: function (aNode) this._cachedLivemarkInfoObjects.has(aNode), /** @@ -1593,7 +1593,7 @@ PlacesController.prototype = { * a places result node. * @return the mozILivemarkInfo object for aNode, if set, null otherwise. */ - getCachedLivemarkInfo: function PC_getCachedLivemarkInfo(aNode) + getCachedLivemarkInfo: function (aNode) this._cachedLivemarkInfoObjects.get(aNode, null) }; @@ -1618,7 +1618,7 @@ var PlacesControllerDragHelper = { * @returns true if the user is dragging over a node within the hierarchy of * the container, false otherwise. */ - draggingOverChildNode: function PCDH_draggingOverChildNode(node) { + draggingOverChildNode: function (node) { let currentNode = this.currentDropTarget; while (currentNode) { if (currentNode == node) @@ -1631,7 +1631,7 @@ var PlacesControllerDragHelper = { /** * @returns The current active drag session. Returns null if there is none. */ - getSession: function PCDH__getSession() { + getSession: function () { return this.dragService.getCurrentSession(); }, @@ -1640,7 +1640,7 @@ var PlacesControllerDragHelper = { * @param aFlavors * The flavors list of type nsIDOMDOMStringList. */ - getFirstValidFlavor: function PCDH_getFirstValidFlavor(aFlavors) { + getFirstValidFlavor: function (aFlavors) { for (let i = 0; i < aFlavors.length; i++) { if (this.GENERIC_VIEW_DROP_TYPES.indexOf(aFlavors[i]) != -1) return aFlavors[i]; @@ -1662,7 +1662,7 @@ var PlacesControllerDragHelper = { * @param ip * The insertion point where the items should be dropped. */ - canDrop: function PCDH_canDrop(ip, dt) { + canDrop: function (ip, dt) { let dropCount = dt.mozItemCount; // Check every dragged item. @@ -1724,7 +1724,7 @@ var PlacesControllerDragHelper = { * @returns True if the node can be moved, false otherwise. */ canMoveNode: - function PCDH_canMoveNode(aNode) { + function (aNode) { // Only bookmark items are movable. if (aNode.itemId == -1) return false; @@ -1743,7 +1743,7 @@ var PlacesControllerDragHelper = { * @param insertionPoint * The insertion point where the items should be dropped */ - onDrop: function PCDH_onDrop(insertionPoint, dt) { + onDrop: function (insertionPoint, dt) { let doCopy = ["copy", "link"].indexOf(dt.dropEffect) != -1; let transactions = []; diff --git a/application/palemoon/components/places/content/editBookmarkOverlay.js b/application/palemoon/components/places/content/editBookmarkOverlay.js index 69d7d32eb..abfb83883 100644 --- a/application/palemoon/components/places/content/editBookmarkOverlay.js +++ b/application/palemoon/components/places/content/editBookmarkOverlay.js @@ -42,7 +42,7 @@ var gEditItemOverlay = { /** * Determines the initial data for the item edited or added by this dialog */ - _determineInfo: function EIO__determineInfo(aInfo) { + _determineInfo: function (aInfo) { // hidden rows if (aInfo && aInfo.hiddenRows) this._hiddenRows = aInfo.hiddenRows; @@ -55,7 +55,7 @@ var gEditItemOverlay = { this._onPanelReady = aInfo && aInfo.onPanelReady; }, - _showHideRows: function EIO__showHideRows() { + _showHideRows: function () { var isBookmark = this._itemId != -1 && this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK; var isQuery = false; @@ -102,7 +102,7 @@ var gEditItemOverlay = { * * forceReadOnly - set this flag to initialize the panel to its * read-only (view) mode even if the given item is editable. */ - initPanel: function EIO_initPanel(aFor, aInfo) { + initPanel: function (aFor, aInfo) { // For sanity ensure that the implementer has uninited the panel before // trying to init it again, or we could end up leaking due to observers. if (this._initialized) @@ -266,7 +266,7 @@ var gEditItemOverlay = { * @return the new menu item. */ _appendFolderItemToMenupopup: - function EIO__appendFolderItemToMenuList(aMenupopup, aFolderId) { + function (aMenupopup, aFolderId) { // First make sure the folders-separator is visible this._element("foldersSeparator").hidden = false; @@ -279,7 +279,7 @@ var gEditItemOverlay = { return folderMenuItem; }, - _initFolderMenuList: function EIO__initFolderMenuList(aSelectedFolder) { + _initFolderMenuList: function (aSelectedFolder) { // clean up first var menupopup = this._folderMenuList.menupopup; while (menupopup.childNodes.length > 6) @@ -345,7 +345,7 @@ var gEditItemOverlay = { this._folderMenuList.disabled = this._readOnly; }, - QueryInterface: function EIO_QueryInterface(aIID) { + QueryInterface: function (aIID) { if (aIID.equals(Ci.nsIDOMEventListener) || aIID.equals(Ci.nsINavBookmarkObserver) || aIID.equals(Ci.nsISupports)) @@ -354,11 +354,11 @@ var gEditItemOverlay = { throw Cr.NS_ERROR_NO_INTERFACE; }, - _element: function EIO__element(aID) { + _element: function (aID) { return document.getElementById("editBMPanel_" + aID); }, - _editorTransactionManagerClear: function EIO__editorTransactionManagerClear(aItem) { + _editorTransactionManagerClear: function (aItem) { // Clear the editor's undo stack let transactionManager; try { @@ -378,7 +378,7 @@ var gEditItemOverlay = { } }, - _getItemStaticTitle: function EIO__getItemStaticTitle() { + _getItemStaticTitle: function () { if (this._titleOverride) return this._titleOverride; @@ -392,14 +392,14 @@ var gEditItemOverlay = { return title; }, - _initNamePicker: function EIO_initNamePicker() { + _initNamePicker: function () { var namePicker = this._element("namePicker"); namePicker.value = this._getItemStaticTitle(); namePicker.readOnly = this._readOnly; this._editorTransactionManagerClear(namePicker); }, - uninitPanel: function EIO_uninitPanel(aHideCollapsibleElements) { + uninitPanel: function (aHideCollapsibleElements) { if (aHideCollapsibleElements) { // hide the folder tree if it was previously visible var folderTreeRow = this._element("folderTreeRow"); @@ -438,18 +438,18 @@ var gEditItemOverlay = { this._readOnly = false; }, - onTagsFieldBlur: function EIO_onTagsFieldBlur() { + onTagsFieldBlur: function () { if (this._updateTags()) // if anything has changed this._mayUpdateFirstEditField("tagsField"); }, - _updateTags: function EIO__updateTags() { + _updateTags: function () { if (this._multiEdit) return this._updateMultipleTagsForItems(); return this._updateSingleTagForItem(); }, - _updateSingleTagForItem: function EIO__updateSingleTagForItem() { + _updateSingleTagForItem: function () { var currentTags = PlacesUtils.tagging.getTagsForURI(this._uri); var tags = this._getTagsArrayFromTagField(); if (tags.length > 0 || currentTags.length > 0) { @@ -494,7 +494,7 @@ var gEditItemOverlay = { * the id of the field that may be set (without the "editBMPanel_" * prefix) */ - _mayUpdateFirstEditField: function EIO__mayUpdateFirstEditField(aNewField) { + _mayUpdateFirstEditField: function (aNewField) { // * The first-edit-field behavior is not applied in the multi-edit case // * if this._firstEditedField is already set, this is not the first field, // so there's nothing to do @@ -509,7 +509,7 @@ var gEditItemOverlay = { prefs.setCharPref("browser.bookmarks.editDialog.firstEditField", aNewField); }, - _updateMultipleTagsForItems: function EIO__updateMultipleTagsForItems() { + _updateMultipleTagsForItems: function () { var tags = this._getTagsArrayFromTagField(); if (tags.length > 0 || this._allTags.length > 0) { var tagsToRemove = []; @@ -562,7 +562,7 @@ var gEditItemOverlay = { return false; }, - onNamePickerBlur: function EIO_onNamePickerBlur() { + onNamePickerBlur: function () { if (this._itemId == -1) return; @@ -582,7 +582,7 @@ var gEditItemOverlay = { } }, - onDescriptionFieldBlur: function EIO_onDescriptionFieldBlur() { + onDescriptionFieldBlur: function () { var description = this._element("descriptionField").value; if (description != PlacesUIUtils.getItemDescription(this._itemId)) { var annoObj = { name : PlacesUIUtils.DESCRIPTION_ANNO, @@ -595,7 +595,7 @@ var gEditItemOverlay = { } }, - onLocationFieldBlur: function EIO_onLocationFieldBlur() { + onLocationFieldBlur: function () { var uri; try { uri = PlacesUIUtils.createFixedURI(this._element("locationField").value); @@ -609,7 +609,7 @@ var gEditItemOverlay = { } }, - onKeywordFieldBlur: function EIO_onKeywordFieldBlur() { + onKeywordFieldBlur: function () { let oldKeyword = this._keyword; let keyword = this._keyword = this._element("keywordField").value; if (keyword != oldKeyword) { @@ -622,7 +622,7 @@ var gEditItemOverlay = { }, onLoadInSidebarCheckboxCommand: - function EIO_onLoadInSidebarCheckboxCommand() { + function () { let annoObj = { name : PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO }; if (this._element("loadInSidebarCheckbox").checked) annoObj.value = true; @@ -630,7 +630,7 @@ var gEditItemOverlay = { PlacesUtils.transactionManager.doTransaction(txn); }, - toggleFolderTreeVisibility: function EIO_toggleFolderTreeVisibility() { + toggleFolderTreeVisibility: function () { var expander = this._element("foldersExpander"); var folderTreeRow = this._element("folderTreeRow"); if (!folderTreeRow.collapsed) { @@ -664,7 +664,7 @@ var gEditItemOverlay = { }, _getFolderIdFromMenuList: - function EIO__getFolderIdFromMenuList() { + function () { var selectedItem = this._folderMenuList.selectedItem; NS_ASSERT("folderId" in selectedItem, "Invalid menuitem in the folders-menulist"); @@ -680,7 +680,7 @@ var gEditItemOverlay = { * The identifier of the bookmarks folder. */ _getFolderMenuItem: - function EIO__getFolderMenuItem(aFolderId) { + function (aFolderId) { var menupopup = this._folderMenuList.menupopup; for (let i = 0; i < menupopup.childNodes.length; i++) { @@ -696,7 +696,7 @@ var gEditItemOverlay = { return this._appendFolderItemToMenupopup(menupopup, aFolderId); }, - onFolderMenuListCommand: function EIO_onFolderMenuListCommand(aEvent) { + onFolderMenuListCommand: function (aEvent) { // Set a selectedIndex attribute to show special icons this._folderMenuList.setAttribute("selectedIndex", this._folderMenuList.selectedIndex); @@ -739,7 +739,7 @@ var gEditItemOverlay = { } }, - onFolderTreeSelect: function EIO_onFolderTreeSelect() { + onFolderTreeSelect: function () { var selectedNode = this._folderTree.selectedNode; // Disable the "New Folder" button if we cannot create a new folder @@ -759,7 +759,7 @@ var gEditItemOverlay = { }, _markFolderAsRecentlyUsed: - function EIO__markFolderAsRecentlyUsed(aFolderId) { + function (aFolderId) { var txns = []; // Expire old unused recent folders @@ -789,7 +789,7 @@ var gEditItemOverlay = { * with the transaction manager. */ _getLastUsedAnnotationObject: - function EIO__getLastUsedAnnotationObject(aLastUsed) { + function (aLastUsed) { var anno = { name: LAST_USED_ANNO, type: Ci.nsIAnnotationService.TYPE_INT32, flags: 0, @@ -799,7 +799,7 @@ var gEditItemOverlay = { return anno; }, - _rebuildTagsSelectorList: function EIO__rebuildTagsSelectorList() { + _rebuildTagsSelectorList: function () { var tagsSelector = this._element("tagsSelector"); var tagsSelectorRow = this._element("tagsSelectorRow"); if (tagsSelectorRow.collapsed) @@ -842,7 +842,7 @@ var gEditItemOverlay = { } }, - toggleTagsSelector: function EIO_toggleTagsSelector() { + toggleTagsSelector: function () { var tagsSelector = this._element("tagsSelector"); var tagsSelectorRow = this._element("tagsSelectorRow"); var expander = this._element("tagsSelectorExpander"); @@ -869,14 +869,14 @@ var gEditItemOverlay = { * * @return Array of tag strings found in the field value. */ - _getTagsArrayFromTagField: function EIO__getTagsArrayFromTagField() { + _getTagsArrayFromTagField: function () { let tags = this._element("tagsField").value; return tags.trim() .split(/\s*,\s*/) // Split on commas and remove spaces. .filter(function (tag) tag.length > 0); // Kill empty tags. }, - newFolder: function EIO_newFolder() { + newFolder: function () { var ip = this._folderTree.insertionPoint; // default to the bookmarks menu folder @@ -897,7 +897,7 @@ var gEditItemOverlay = { }, // nsIDOMEventListener - handleEvent: function EIO_nsIDOMEventListener(aEvent) { + handleEvent: function (aEvent) { switch (aEvent.type) { case "CheckboxStateChange": // Update the tags field when items are checked/unchecked in the listbox @@ -927,7 +927,7 @@ var gEditItemOverlay = { }, // nsINavBookmarkObserver - onItemChanged: function EIO_onItemChanged(aItemId, aProperty, + onItemChanged: function (aItemId, aProperty, aIsAnnotationProperty, aValue, aLastModified, aItemType) { if (aProperty == "tags") { @@ -1038,7 +1038,7 @@ var gEditItemOverlay = { } }, - onItemMoved: function EIO_onItemMoved(aItemId, aOldParent, aOldIndex, + onItemMoved: function (aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex, aItemType) { if (aItemId != this._itemId || aNewParent == this._getFolderIdFromMenuList()) @@ -1051,7 +1051,7 @@ var gEditItemOverlay = { this._folderMenuList.selectedItem = folderItem; }, - onItemAdded: function EIO_onItemAdded(aItemId, aParentId, aIndex, aItemType, + onItemAdded: function (aItemId, aParentId, aIndex, aItemType, aURI) { this._lastNewItem = aItemId; }, diff --git a/application/palemoon/components/places/content/moveBookmarks.js b/application/palemoon/components/places/content/moveBookmarks.js index 964604f6d..d019e06df 100644 --- a/application/palemoon/components/places/content/moveBookmarks.js +++ b/application/palemoon/components/places/content/moveBookmarks.js @@ -22,7 +22,7 @@ var gMoveBookmarksDialog = { PlacesUIUtils.allBookmarksFolderId; }, - onOK: function MBD_onOK(aEvent) { + onOK: function (aEvent) { var selectedNode = this.foldersTree.selectedNode; NS_ASSERT(selectedNode, "selectedNode must be set in a single-selection tree with initial selection set"); @@ -46,7 +46,7 @@ var gMoveBookmarksDialog = { } }, - newFolder: function MBD_newFolder() { + newFolder: function () { // The command is disabled when the tree is not focused this.foldersTree.focus(); goDoCommand("placesCmd_new:folder"); diff --git a/application/palemoon/components/places/content/places.js b/application/palemoon/components/places/content/places.js index 40dbcb9b8..0cdc753bc 100644 --- a/application/palemoon/components/places/content/places.js +++ b/application/palemoon/components/places/content/places.js @@ -30,7 +30,7 @@ var PlacesOrganizer = { this._places.place = "place:excludeItems=1&expandQueries=0&folder=" + leftPaneRoot; }, - selectLeftPaneQuery: function PO_selectLeftPaneQuery(aQueryName) { + selectLeftPaneQuery: function (aQueryName) { var itemId = PlacesUIUtils.leftPaneQueries[aQueryName]; this._places.selectItems([itemId]); // Forcefully expand all-bookmarks @@ -38,7 +38,7 @@ var PlacesOrganizer = { PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true; }, - init: function PO_init() { + init: function () { ContentArea.init(); this._places = document.getElementById("placesList"); @@ -91,7 +91,7 @@ var PlacesOrganizer = { ContentArea.focus(); }, - QueryInterface: function PO_QueryInterface(aIID) { + QueryInterface: function (aIID) { if (aIID.equals(Components.interfaces.nsIDOMEventListener) || aIID.equals(Components.interfaces.nsISupports)) return this; @@ -99,7 +99,7 @@ var PlacesOrganizer = { throw new Components.Exception("", Components.results.NS_NOINTERFACE); }, - handleEvent: function PO_handleEvent(aEvent) { + handleEvent: function (aEvent) { if (aEvent.type != "AppCommand") return; @@ -119,7 +119,7 @@ var PlacesOrganizer = { } }, - destroy: function PO_destroy() { + destroy: function () { }, _location: null, @@ -161,13 +161,13 @@ var PlacesOrganizer = { _backHistory: [], _forwardHistory: [], - back: function PO_back() { + back: function () { this._forwardHistory.unshift(this.location); var historyEntry = this._backHistory.shift(); this._location = null; this.location = historyEntry; }, - forward: function PO_forward() { + forward: function () { this._backHistory.unshift(this.location); var historyEntry = this._forwardHistory.shift(); this._location = null; @@ -185,7 +185,7 @@ var PlacesOrganizer = { * deleting its text, this will be false. */ _cachedLeftPaneSelectedURI: null, - onPlaceSelected: function PO_onPlaceSelected(resetSearchBox) { + onPlaceSelected: function (resetSearchBox) { // Don't change the right-hand pane contents when there's no selection. if (!this._places.hasSelection) return; @@ -243,7 +243,7 @@ var PlacesOrganizer = { * @param aNode * the node to set up scope from */ - _setSearchScopeForNode: function PO__setScopeForNode(aNode) { + _setSearchScopeForNode: function (aNode) { let itemId = aNode.itemId; // Set default buttons status. @@ -279,7 +279,7 @@ var PlacesOrganizer = { * @param aEvent * The mouse event. */ - onPlacesListClick: function PO_onPlacesListClick(aEvent) { + onPlacesListClick: function (aEvent) { // Only handle clicks on tree children. if (aEvent.target.localName != "treechildren") return; @@ -299,7 +299,7 @@ var PlacesOrganizer = { /** * Handle focus changes on the places list and the current content view. */ - updateDetailsPane: function PO_updateDetailsPane() { + updateDetailsPane: function () { if (!ContentArea.currentViewOptions.showDetailsPane) return; let view = PlacesUIUtils.getViewForNode(document.activeElement); @@ -310,7 +310,7 @@ var PlacesOrganizer = { } }, - openFlatContainer: function PO_openFlatContainerFlatContainer(aContainer) { + openFlatContainer: function (aContainer) { if (aContainer.itemId != -1) this._places.selectItems([aContainer.itemId]); else if (PlacesUtils.nodeIsQuery(aContainer)) @@ -321,7 +321,7 @@ var PlacesOrganizer = { * Returns the options associated with the query currently loaded in the * main places pane. */ - getCurrentOptions: function PO_getCurrentOptions() { + getCurrentOptions: function () { return PlacesUtils.asQuery(ContentArea.currentView.result.root).queryOptions; }, @@ -329,14 +329,14 @@ var PlacesOrganizer = { * Returns the queries associated with the query currently loaded in the * main places pane. */ - getCurrentQueries: function PO_getCurrentQueries() { + getCurrentQueries: function () { return PlacesUtils.asQuery(ContentArea.currentView.result.root).getQueries(); }, /** * Open a file-picker and import the selected file into the bookmarks store */ - importFromFile: function PO_importFromFile() { + importFromFile: function () { let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); let fpCallback = function fpCallback_done(aResult) { if (aResult != Ci.nsIFilePicker.returnCancel && fp.fileURL) { @@ -355,7 +355,7 @@ var PlacesOrganizer = { /** * Allows simple exporting of bookmarks. */ - exportBookmarks: function PO_exportBookmarks() { + exportBookmarks: function () { let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); let fpCallback = function fpCallback_done(aResult) { if (aResult != Ci.nsIFilePicker.returnCancel) { @@ -375,7 +375,7 @@ var PlacesOrganizer = { /** * Populates the restore menu with the dates of the backups available. */ - populateRestoreMenu: function PO_populateRestoreMenu() { + populateRestoreMenu: function () { let restorePopup = document.getElementById("fileRestorePopup"); let dateSvc = Cc["@mozilla.org/intl/scriptabledateformat;1"]. @@ -432,7 +432,7 @@ var PlacesOrganizer = { /** * Called when a menuitem is selected from the restore menu. */ - onRestoreMenuItemClick: function PO_onRestoreMenuItemClick(aMenuItem) { + onRestoreMenuItemClick: function (aMenuItem) { Task.spawn(function() { let backupName = aMenuItem.getAttribute("value"); let backupFilePaths = yield PlacesBackups.getBackupFiles(); @@ -449,7 +449,7 @@ var PlacesOrganizer = { * Called when 'Choose File...' is selected from the restore menu. * Prompts for a file and restores bookmarks to those in the file. */ - onRestoreBookmarksFromFile: function PO_onRestoreBookmarksFromFile() { + onRestoreBookmarksFromFile: function () { let dirSvc = Cc["@mozilla.org/file/directory_service;1"]. getService(Ci.nsIProperties); let backupsDir = dirSvc.get("Desk", Ci.nsILocalFile); @@ -472,7 +472,7 @@ var PlacesOrganizer = { /** * Restores bookmarks from a JSON file. */ - restoreBookmarksFromFile: function PO_restoreBookmarksFromFile(aFile) { + restoreBookmarksFromFile: function (aFile) { // check file extension let filePath = aFile.path; if (!filePath.toLowerCase().endsWith("json") && @@ -498,7 +498,7 @@ var PlacesOrganizer = { }); }, - _showErrorAlert: function PO__showErrorAlert(aMsg) { + _showErrorAlert: function (aMsg) { var brandShortName = document.getElementById("brandStrings"). getString("brandShortName"); @@ -512,7 +512,7 @@ var PlacesOrganizer = { * The file is a JSON serialization of bookmarks, tags and any annotations * of those items. */ - backupBookmarks: function PO_backupBookmarks() { + backupBookmarks: function () { let dirSvc = Cc["@mozilla.org/file/directory_service;1"]. getService(Ci.nsIProperties); let backupsDir = dirSvc.get("Desk", Ci.nsILocalFile); @@ -534,7 +534,7 @@ var PlacesOrganizer = { _paneDisabled: false, _setDetailsFieldsDisabledState: - function PO__setDetailsFieldsDisabledState(aDisabled) { + function (aDisabled) { if (aDisabled) { document.getElementById("paneElementsBroadcaster") .setAttribute("disabled", "true"); @@ -546,7 +546,7 @@ var PlacesOrganizer = { }, _detectAndSetDetailsPaneMinimalState: - function PO__detectAndSetDetailsPaneMinimalState(aNode) { + function (aNode) { /** * The details of simple folder-items (as opposed to livemarks) or the * of livemark-children are not likely to fill the infoBox anyway, @@ -583,7 +583,7 @@ var PlacesOrganizer = { }, // NOT YET USED - updateThumbnailProportions: function PO_updateThumbnailProportions() { + updateThumbnailProportions: function () { var previewBox = document.getElementById("previewBox"); var canvas = document.getElementById("itemThumbnail"); var height = previewBox.boxObject.height; @@ -592,7 +592,7 @@ var PlacesOrganizer = { canvas.height = height; }, - _fillDetailsPane: function PO__fillDetailsPane(aNodeList) { + _fillDetailsPane: function (aNodeList) { var infoBox = document.getElementById("infoBox"); var detailsDeck = document.getElementById("detailsDeck"); @@ -716,7 +716,7 @@ var PlacesOrganizer = { }, // NOT YET USED - _updateThumbnail: function PO__updateThumbnail() { + _updateThumbnail: function () { var bo = document.getElementById("previewBox").boxObject; var width = bo.width; var height = bo.height; @@ -737,7 +737,7 @@ var PlacesOrganizer = { ctx.restore(); }, - toggleAdditionalInfoFields: function PO_toggleAdditionalInfoFields() { + toggleAdditionalInfoFields: function () { var infoBox = document.getElementById("infoBox"); var infoBoxExpander = document.getElementById("infoBoxExpander"); var infoBoxExpanderLabel = document.getElementById("infoBoxExpanderLabel"); @@ -762,7 +762,7 @@ var PlacesOrganizer = { /** * Save the current search (or advanced query) to the bookmarks root. */ - saveSearch: function PO_saveSearch() { + saveSearch: function () { // Get the place: uri for the query. // If the advanced query builder is showing, use that. var options = this.getCurrentOptions(); @@ -840,7 +840,7 @@ var PlacesSearchBox = { * @param filterString * The text to search for. */ - search: function PSB_search(filterString) { + search: function (filterString) { var PO = PlacesOrganizer; // If the user empties the search box manually, reset it and load all // contents of the current scope. @@ -909,7 +909,7 @@ var PlacesSearchBox = { /** * Finds across all history, downloads or all bookmarks. */ - findAll: function PSB_findAll() { + findAll: function () { switch (this.filterCollection) { case "history": PlacesQueryBuilder.setScope("history"); @@ -929,7 +929,7 @@ var PlacesSearchBox = { * @param aTitle * The title of the current collection. */ - updateCollectionTitle: function PSB_updateCollectionTitle(aTitle) { + updateCollectionTitle: function (aTitle) { let title = ""; // This is needed when a user performs a folder-specific search // using the scope bar, removes the search-string, and unfocuses @@ -978,14 +978,14 @@ var PlacesSearchBox = { /** * Focus the search box */ - focus: function PSB_focus() { + focus: function () { this.searchFilter.focus(); }, /** * Set up the gray text in the search bar as the Places View loads. */ - init: function PSB_init() { + init: function () { this.updateCollectionTitle(); }, @@ -999,13 +999,13 @@ var PlacesSearchBox = { return this.searchFilter.value = value; }, - showSearchUI: function PSB_showSearchUI() { + showSearchUI: function () { // Hide the advanced search controls when the user hasn't searched var searchModifiers = document.getElementById("searchModifiers"); searchModifiers.hidden = false; }, - hideSearchUI: function PSB_hideSearchUI() { + hideSearchUI: function () { var searchModifiers = document.getElementById("searchModifiers"); searchModifiers.hidden = true; } @@ -1024,7 +1024,7 @@ var PlacesQueryBuilder = { * @param aButton * the scope button that was selected */ - onScopeSelected: function PQB_onScopeSelected(aButton) { + onScopeSelected: function (aButton) { switch (aButton.id) { case "scopeBarHistory": this.setScope("history"); @@ -1054,7 +1054,7 @@ var PlacesQueryBuilder = { * The search scope: "bookmarks", "collection", "downloads" or * "history". */ - setScope: function PQB_setScope(aScope) { + setScope: function (aScope) { // Determine filterCollection, folders, and scopeButtonId based on aScope. var filterCollection; var folders = []; @@ -1130,7 +1130,7 @@ var ViewMenu = { * @returns The element for the caller to insert new items before, * null if the caller should just append to the popup. */ - _clean: function VM__clean(popup, startID, endID) { + _clean: function (popup, startID, endID) { if (endID) NS_ASSERT(startID, "meaningless to have valid endID and null startID"); if (startID) { @@ -1179,7 +1179,7 @@ var ViewMenu = { * If propertyPrefix is null, the column label is used as label and * no accesskey is assigned. */ - fillWithColumns: function VM_fillWithColumns(event, startID, endID, type, propertyPrefix) { + fillWithColumns: function (event, startID, endID, type, propertyPrefix) { var popup = event.target; var pivot = this._clean(popup, startID, endID); @@ -1242,7 +1242,7 @@ var ViewMenu = { /** * Set up the content of the view menu. */ - populateSortMenu: function VM_populateSortMenu(event) { + populateSortMenu: function (event) { this.fillWithColumns(event, "viewUnsorted", "directionSeparator", "radio", "view.sortBy."); var sortColumn = this._getSortColumn(); @@ -1273,7 +1273,7 @@ var ViewMenu = { * @param element * The menuitem element for the column */ - showHideColumn: function VM_showHideColumn(element) { + showHideColumn: function (element) { var column = element.column; var splitter = column.nextSibling; @@ -1296,7 +1296,7 @@ var ViewMenu = { * Gets the last column that was sorted. * @returns the currently sorted column, null if there is no sorted column. */ - _getSortColumn: function VM__getSortColumn() { + _getSortColumn: function () { var content = document.getElementById("placeContent"); var cols = content.columns; for (var i = 0; i < cols.count; ++i) { @@ -1319,7 +1319,7 @@ var ViewMenu = { * * If both aColumnID and aDirection are null, the view will be unsorted. */ - setSortColumn: function VM_setSortColumn(aColumn, aDirection) { + setSortColumn: function (aColumn, aDirection) { var result = document.getElementById("placeContent").result; if (!aColumn && !aDirection) { result.sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; @@ -1380,7 +1380,7 @@ var ViewMenu = { var ContentArea = { _specialViews: new Map(), - init: function CA_init() { + init: function () { this._deck = document.getElementById("placesViewsDeck"); this._toolbar = document.getElementById("placesToolbar"); ContentTree.init(); @@ -1397,7 +1397,7 @@ var ContentArea = { * @return the view to be used for loading aQueryString. */ getContentViewForQueryString: - function CA_getContentViewForQueryString(aQueryString) { + function (aQueryString) { try { if (this._specialViews.has(aQueryString)) { let { view, options } = this._specialViews.get(aQueryString); @@ -1427,7 +1427,7 @@ var ContentArea = { * @see ContentTree.viewOptions for supported options and default values. */ setContentViewForQueryString: - function CA_setContentViewForQueryString(aQueryString, aView, aOptions) { + function (aQueryString, aView, aOptions) { if (!aQueryString || typeof aView != "object" && typeof aView != "function") throw new Components.Exception("Invalid arguments", @@ -1468,7 +1468,7 @@ var ContentArea = { /** * Applies view options. */ - _setupView: function CA__setupView() { + _setupView: function () { let options = this.currentViewOptions; // showDetailsPane. @@ -1512,7 +1512,7 @@ var ContentArea = { }; var ContentTree = { - init: function CT_init() { + init: function () { this._view = document.getElementById("placeContent"); }, @@ -1523,12 +1523,12 @@ var ContentTree = { toolbarSet: "back-button, forward-button, organizeButton, viewMenu, maintenanceButton, libraryToolbarSpacer, searchFilter" }), - openSelectedNode: function CT_openSelectedNode(aEvent) { + openSelectedNode: function (aEvent) { let view = this.view; PlacesUIUtils.openNodeWithEvent(view.selectedNode, aEvent, view); }, - onClick: function CT_onClick(aEvent) { + onClick: function (aEvent) { let node = this.view.selectedNode; if (node) { let doubleClick = aEvent.button == 0 && aEvent.detail == 2; @@ -1546,7 +1546,7 @@ var ContentTree = { } }, - onKeyPress: function CT_onKeyPress(aEvent) { + onKeyPress: function (aEvent) { if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN) this.openSelectedNode(aEvent); } diff --git a/application/palemoon/components/places/content/sidebarUtils.js b/application/palemoon/components/places/content/sidebarUtils.js index 06ed53753..bf6c46566 100644 --- a/application/palemoon/components/places/content/sidebarUtils.js +++ b/application/palemoon/components/places/content/sidebarUtils.js @@ -4,7 +4,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. var SidebarUtils = { - handleTreeClick: function SU_handleTreeClick(aTree, aEvent, aGutterSelect) { + handleTreeClick: function (aTree, aEvent, aGutterSelect) { // right-clicks are not handled here if (aEvent.button == 2) return; @@ -61,7 +61,7 @@ var SidebarUtils = { } }, - handleTreeKeyPress: function SU_handleTreeKeyPress(aEvent) { + handleTreeKeyPress: function (aEvent) { // XXX Bug 627901: Post Fx4, this method should take a tree parameter. let tree = aEvent.target; let node = tree.selectedNode; @@ -75,7 +75,7 @@ var SidebarUtils = { * The following function displays the URL of a node that is being * hovered over. */ - handleTreeMouseMove: function SU_handleTreeMouseMove(aEvent) { + handleTreeMouseMove: function (aEvent) { if (aEvent.target.localName != "treechildren") return; @@ -97,7 +97,7 @@ var SidebarUtils = { this.setMouseoverURL(""); }, - setMouseoverURL: function SU_setMouseoverURL(aURL) { + setMouseoverURL: function (aURL) { // When the browser window is closed with an open sidebar, the sidebar // unload event happens after the browser's one. In this case // top.XULBrowserWindow has been nullified already. diff --git a/application/palemoon/components/places/content/treeView.js b/application/palemoon/components/places/content/treeView.js index aba731470..0d28e4295 100644 --- a/application/palemoon/components/places/content/treeView.js +++ b/application/palemoon/components/places/content/treeView.js @@ -47,7 +47,7 @@ PlacesTreeView.prototype = { /** * This is called once both the result and the tree are set. */ - _finishInit: function PTV__finishInit() { + _finishInit: function () { let selection = this.selection; if (selection) selection.selectEventsSuppressed = true; @@ -88,7 +88,7 @@ PlacesTreeView.prototype = { * * @return true if aContainer is a plain container, false otherwise. */ - _isPlainContainer: function PTV__isPlainContainer(aContainer) { + _isPlainContainer: function (aContainer) { // Livemarks are always plain containers. if (this._controller.hasCachedLivemarkInfo(aContainer)) return true; @@ -137,7 +137,7 @@ PlacesTreeView.prototype = { * otherwise. */ _getRowForNode: - function PTV__getRowForNode(aNode, aForceBuild, aParentRow, aNodeIndex) { + function (aNode, aForceBuild, aParentRow, aNodeIndex) { if (aNode == this._rootNode) throw new Error("The root node is never visible"); @@ -206,7 +206,7 @@ PlacesTreeView.prototype = { * Row number. * @return [parentNode, parentRow] */ - _getParentByChildRow: function PTV__getParentByChildRow(aChildRow) { + _getParentByChildRow: function (aChildRow) { let node = this._getNodeForRow(aChildRow); let parent = (node === null) ? this._rootNode : node.parent; @@ -221,7 +221,7 @@ PlacesTreeView.prototype = { /** * Gets the node at a given row. */ - _getNodeForRow: function PTV__getNodeForRow(aRow) { + _getNodeForRow: function (aRow) { if (aRow < 0) { return null; } @@ -267,7 +267,7 @@ PlacesTreeView.prototype = { * @return the number of rows which were inserted. */ _buildVisibleSection: - function PTV__buildVisibleSection(aContainer, aFirstChildRow, aToOpen) + function (aContainer, aFirstChildRow, aToOpen) { // There's nothing to do if the container is closed. if (!aContainer.containerOpen) @@ -333,7 +333,7 @@ PlacesTreeView.prototype = { * will count the node itself plus any child node following it. */ _countVisibleRowsForNodeAtRow: - function PTV__countVisibleRowsForNodeAtRow(aNodeRow) { + function (aNodeRow) { let node = this._rows[aNodeRow]; // If it's not listed yet, we know that it's a leaf node (instanceof also @@ -353,7 +353,7 @@ PlacesTreeView.prototype = { }, _getSelectedNodesInRange: - function PTV__getSelectedNodesInRange(aFirstRow, aLastRow) { + function (aFirstRow, aLastRow) { let selection = this.selection; let rc = selection.getRangeCount(); if (rc == 0) @@ -404,7 +404,7 @@ PlacesTreeView.prototype = { * found, -1 otherwise. */ _getNewRowForRemovedNode: - function PTV__getNewRowForRemovedNode(aUpdatedContainer, aOldNode) { + function (aUpdatedContainer, aOldNode) { if (aOldNode == undefined) { return -1; } @@ -449,7 +449,7 @@ PlacesTreeView.prototype = { * The container which was updated. */ _restoreSelection: - function PTV__restoreSelection(aNodesInfo, aUpdatedContainer) { + function (aNodesInfo, aUpdatedContainer) { if (aNodesInfo.length == 0) return; @@ -485,7 +485,7 @@ PlacesTreeView.prototype = { this._tree.ensureRowIsVisible(scrollToRow); }, - _convertPRTimeToString: function PTV__convertPRTimeToString(aTime) { + _convertPRTimeToString: function (aTime) { const MS_PER_MINUTE = 60000; const MS_PER_DAY = 86400000; let timeMs = aTime / 1000; // PRTime is in microseconds @@ -524,7 +524,7 @@ PlacesTreeView.prototype = { COLUMN_TYPE_PARENTFOLDER: 10, COLUMN_TYPE_PARENTFOLDERPATH: 11, - _getColumnType: function PTV__getColumnType(aColumn) { + _getColumnType: function (aColumn) { let columnType = aColumn.element.getAttribute("anonid") || aColumn.id; switch (columnType) { @@ -554,7 +554,7 @@ PlacesTreeView.prototype = { return this.COLUMN_TYPE_UNKNOWN; }, - _sortTypeToColumnType: function PTV__sortTypeToColumnType(aSortType) { + _sortTypeToColumnType: function (aSortType) { switch (aSortType) { case Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING: return [this.COLUMN_TYPE_TITLE, false]; @@ -600,7 +600,7 @@ PlacesTreeView.prototype = { }, // nsINavHistoryResultObserver - nodeInserted: function PTV_nodeInserted(aParentNode, aNode, aNewIndex) { + nodeInserted: function (aParentNode, aNode, aNewIndex) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) return; @@ -674,7 +674,7 @@ PlacesTreeView.prototype = { * However, we won't do this when sorted by date because dates will never * change for visits, and date sorting is the only time things are collapsed. */ - nodeRemoved: function PTV_nodeRemoved(aParentNode, aNode, aOldIndex) { + nodeRemoved: function (aParentNode, aNode, aOldIndex) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) return; @@ -727,7 +727,7 @@ PlacesTreeView.prototype = { }, nodeMoved: - function PTV_nodeMoved(aNode, aOldParent, aOldIndex, aNewParent, aNewIndex) { + function (aNode, aOldParent, aOldIndex, aNewParent, aNewIndex) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) return; @@ -773,7 +773,7 @@ PlacesTreeView.prototype = { } }, - _invalidateCellValue: function PTV__invalidateCellValue(aNode, + _invalidateCellValue: function (aNode, aColumnType) { NS_ASSERT(this._result, "Got a notification but have no result!"); if (!this._tree || !this._result) @@ -800,7 +800,7 @@ PlacesTreeView.prototype = { } }, - _populateLivemarkContainer: function PTV__populateLivemarkContainer(aNode) { + _populateLivemarkContainer: function (aNode) { PlacesUtils.livemarks.getLivemark({ id: aNode.itemId }) .then(aLivemark => { let placesNode = aNode; @@ -816,20 +816,20 @@ PlacesTreeView.prototype = { }, Components.utils.reportError); }, - nodeTitleChanged: function PTV_nodeTitleChanged(aNode, aNewTitle) { + nodeTitleChanged: function (aNode, aNewTitle) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE); }, - nodeURIChanged: function PTV_nodeURIChanged(aNode, aNewURI) { + nodeURIChanged: function (aNode, aNewURI) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_URI); }, - nodeIconChanged: function PTV_nodeIconChanged(aNode) { + nodeIconChanged: function (aNode) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE); }, nodeHistoryDetailsChanged: - function PTV_nodeHistoryDetailsChanged(aNode, aUpdatedVisitDate, + function (aNode, aUpdatedVisitDate, aUpdatedVisitCount) { if (aNode.parent && this._controller.hasCachedLivemarkInfo(aNode.parent)) { // Find the node in the parent. @@ -849,15 +849,15 @@ PlacesTreeView.prototype = { this._invalidateCellValue(aNode, this.COLUMN_TYPE_VISITCOUNT); }, - nodeTagsChanged: function PTV_nodeTagsChanged(aNode) { + nodeTagsChanged: function (aNode) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_TAGS); }, - nodeKeywordChanged: function PTV_nodeKeywordChanged(aNode, aNewKeyword) { + nodeKeywordChanged: function (aNode, aNewKeyword) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_KEYWORD); }, - nodeAnnotationChanged: function PTV_nodeAnnotationChanged(aNode, aAnno) { + nodeAnnotationChanged: function (aNode, aAnno) { if (aAnno == PlacesUIUtils.DESCRIPTION_ANNO) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_DESCRIPTION); } @@ -873,17 +873,17 @@ PlacesTreeView.prototype = { } }, - nodeDateAddedChanged: function PTV_nodeDateAddedChanged(aNode, aNewValue) { + nodeDateAddedChanged: function (aNode, aNewValue) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_DATEADDED); }, nodeLastModifiedChanged: - function PTV_nodeLastModifiedChanged(aNode, aNewValue) { + function (aNode, aNewValue) { this._invalidateCellValue(aNode, this.COLUMN_TYPE_LASTMODIFIED); }, containerStateChanged: - function PTV_containerStateChanged(aNode, aOldState, aNewState) { + function (aNode, aOldState, aNewState) { this.invalidateContainer(aNode); if (PlacesUtils.nodeIsFolder(aNode) || @@ -914,7 +914,7 @@ PlacesTreeView.prototype = { } }, - invalidateContainer: function PTV_invalidateContainer(aContainer) { + invalidateContainer: function (aContainer) { NS_ASSERT(this._result, "Need to have a result to update"); if (!this._tree) return; @@ -1020,7 +1020,7 @@ PlacesTreeView.prototype = { }, _columns: [], - _findColumnByType: function PTV__findColumnByType(aColumnType) { + _findColumnByType: function (aColumnType) { if (this._columns[aColumnType]) return this._columns[aColumnType]; @@ -1039,7 +1039,7 @@ PlacesTreeView.prototype = { return null; }, - sortingChanged: function PTV__sortingChanged(aSortingMode) { + sortingChanged: function (aSortingMode) { if (!this._tree || !this._result) return; @@ -1068,7 +1068,7 @@ PlacesTreeView.prototype = { }, _inBatchMode: false, - batching: function PTV__batching(aToggleMode) { + batching: function (aToggleMode) { if (this._inBatchMode != aToggleMode) { this._inBatchMode = this.selection.selectEventsSuppressed = aToggleMode; if (this._inBatchMode) { @@ -1107,14 +1107,14 @@ PlacesTreeView.prototype = { return val; }, - nodeForTreeIndex: function PTV_nodeForTreeIndex(aIndex) { + nodeForTreeIndex: function (aIndex) { if (aIndex > this._rows.length) throw Cr.NS_ERROR_INVALID_ARG; return this._getNodeForRow(aIndex); }, - treeIndexForNode: function PTV_treeNodeForIndex(aNode) { + treeIndexForNode: function (aNode) { // The API allows passing invisible nodes. try { return this._getRowForNode(aNode, true); @@ -1124,7 +1124,7 @@ PlacesTreeView.prototype = { return Ci.nsINavHistoryResultTreeViewer.INDEX_INVISIBLE; }, - _getResourceForNode: function PTV_getResourceForNode(aNode) + _getResourceForNode: function (aNode) { let uri = aNode.uri; NS_ASSERT(uri, "if there is no uri, we can't persist the open state"); @@ -1139,7 +1139,7 @@ PlacesTreeView.prototype = { getRowProperties: function() { return ""; }, getCellProperties: - function PTV_getCellProperties(aRow, aColumn) { + function (aRow, aColumn) { // for anonid-trees, we need to add the column-type manually var props = ""; let columnType = aColumn.element.getAttribute("anonid"); @@ -1220,7 +1220,7 @@ PlacesTreeView.prototype = { getColumnProperties: function(aColumn) { return ""; }, - isContainer: function PTV_isContainer(aRow) { + isContainer: function (aRow) { // Only leaf nodes aren't listed in the rows array. let node = this._rows[aRow]; if (node === undefined) @@ -1245,7 +1245,7 @@ PlacesTreeView.prototype = { return false; }, - isContainerOpen: function PTV_isContainerOpen(aRow) { + isContainerOpen: function (aRow) { if (this._flatList) return false; @@ -1253,7 +1253,7 @@ PlacesTreeView.prototype = { return this._rows[aRow].containerOpen; }, - isContainerEmpty: function PTV_isContainerEmpty(aRow) { + isContainerEmpty: function (aRow) { if (this._flatList) return true; @@ -1267,18 +1267,18 @@ PlacesTreeView.prototype = { return !node.hasChildren; }, - isSeparator: function PTV_isSeparator(aRow) { + isSeparator: function (aRow) { // All separators are listed in the rows array. let node = this._rows[aRow]; return node && PlacesUtils.nodeIsSeparator(node); }, - isSorted: function PTV_isSorted() { + isSorted: function () { return this._result.sortingMode != Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; }, - canDrop: function PTV_canDrop(aRow, aOrientation, aDataTransfer) { + canDrop: function (aRow, aOrientation, aDataTransfer) { if (!this._result) throw Cr.NS_ERROR_UNEXPECTED; @@ -1290,7 +1290,7 @@ PlacesTreeView.prototype = { return ip && PlacesControllerDragHelper.canDrop(ip, aDataTransfer); }, - _getInsertionPoint: function PTV__getInsertionPoint(index, orientation) { + _getInsertionPoint: function (index, orientation) { let container = this._result.root; let dropNearItemId = -1; // When there's no selection, assume the container is the container @@ -1361,7 +1361,7 @@ PlacesTreeView.prototype = { dropNearItemId); }, - drop: function PTV_drop(aRow, aOrientation, aDataTransfer) { + drop: function (aRow, aOrientation, aDataTransfer) { // We are responsible for translating the |index| and |orientation| // parameters into a container id and index within the container, // since this information is specific to the tree view. @@ -1372,12 +1372,12 @@ PlacesTreeView.prototype = { PlacesControllerDragHelper.currentDropTarget = null; }, - getParentIndex: function PTV_getParentIndex(aRow) { + getParentIndex: function (aRow) { let [parentNode, parentRow] = this._getParentByChildRow(aRow); return parentRow; }, - hasNextSibling: function PTV_hasNextSibling(aRow, aAfterIndex) { + hasNextSibling: function (aRow, aAfterIndex) { if (aRow == this._rows.length - 1) { // The last row has no sibling. return false; @@ -1407,7 +1407,7 @@ PlacesTreeView.prototype = { getLevel: function(aRow) this._getNodeForRow(aRow).indentLevel, - getImageSrc: function PTV_getImageSrc(aRow, aColumn) { + getImageSrc: function (aRow, aColumn) { // Only the title column has an image. if (this._getColumnType(aColumn) != this.COLUMN_TYPE_TITLE) return ""; @@ -1418,7 +1418,7 @@ PlacesTreeView.prototype = { getProgressMode: function(aRow, aColumn) { }, getCellValue: function(aRow, aColumn) { }, - getCellText: function PTV_getCellText(aRow, aColumn) { + getCellText: function (aRow, aColumn) { let node = this._getNodeForRow(aRow); switch (this._getColumnType(aColumn)) { case this.COLUMN_TYPE_TITLE: @@ -1515,7 +1515,7 @@ PlacesTreeView.prototype = { return ""; }, - setTree: function PTV_setTree(aTree) { + setTree: function (aTree) { // If we are replacing the tree during a batch, there is a concrete risk // that the treeView goes out of sync, thus it's safer to end the batch now. // This is a no-op if we are not batching. @@ -1538,7 +1538,7 @@ PlacesTreeView.prototype = { } }, - toggleOpenState: function PTV_toggleOpenState(aRow) { + toggleOpenState: function (aRow) { if (!this._result) throw Cr.NS_ERROR_UNEXPECTED; @@ -1565,7 +1565,7 @@ PlacesTreeView.prototype = { node.containerOpen = !node.containerOpen; }, - cycleHeader: function PTV_cycleHeader(aColumn) { + cycleHeader: function (aColumn) { if (!this._result) throw Cr.NS_ERROR_UNEXPECTED; @@ -1697,7 +1697,7 @@ PlacesTreeView.prototype = { this._result.sortingMode = newSort; }, - isEditable: function PTV_isEditable(aRow, aColumn) { + isEditable: function (aRow, aColumn) { // At this point we only support editing the title field. if (aColumn.index != 0) return false; @@ -1740,7 +1740,7 @@ PlacesTreeView.prototype = { return true; }, - setCellText: function PTV_setCellText(aRow, aColumn, aText) { + setCellText: function (aRow, aColumn, aText) { // We may only get here if the cell is editable. let node = this._rows[aRow]; if (node.title != aText) { @@ -1749,7 +1749,7 @@ PlacesTreeView.prototype = { } }, - toggleCutNode: function PTV_toggleCutNode(aNode, aValue) { + toggleCutNode: function (aNode, aValue) { let currentVal = this._cuttingNodes.has(aNode); if (currentVal != aValue) { if (aValue) diff --git a/application/palemoon/components/preferences/advanced.js b/application/palemoon/components/preferences/advanced.js index fc5cdc3d9..9f00952da 100644 --- a/application/palemoon/components/preferences/advanced.js +++ b/application/palemoon/components/preferences/advanced.js @@ -236,7 +236,7 @@ var gAdvancedPane = { Visitor.prototype = { expected: 0, sum: 0, - QueryInterface: function listener_qi(iid) { + QueryInterface: function (iid) { if (iid.equals(Components.interfaces.nsISupports) || iid.equals(Components.interfaces.nsICacheStorageVisitor)) { return this; diff --git a/application/palemoon/components/preferences/applicationManager.js b/application/palemoon/components/preferences/applicationManager.js index 5213183b4..6d36c693d 100644 --- a/application/palemoon/components/preferences/applicationManager.js +++ b/application/palemoon/components/preferences/applicationManager.js @@ -10,7 +10,7 @@ var Ci = Components.interfaces; var gAppManagerDialog = { _removed: [], - init: function appManager_init() { + init: function () { this.handlerInfo = window.arguments[0]; var bundle = document.getElementById("appManagerBundle"); @@ -44,7 +44,7 @@ var gAppManagerDialog = { list.selectedIndex = 0; }, - onOK: function appManager_onOK() { + onOK: function () { if (!this._removed.length) { // return early to avoid calling the |store| method. return; @@ -56,11 +56,11 @@ var gAppManagerDialog = { this.handlerInfo.store(); }, - onCancel: function appManager_onCancel() { + onCancel: function () { // do nothing }, - remove: function appManager_remove() { + remove: function () { var list = document.getElementById("appList"); this._removed.push(list.selectedItem.app); var index = list.selectedIndex; @@ -78,7 +78,7 @@ var gAppManagerDialog = { } }, - onSelect: function appManager_onSelect() { + onSelect: function () { var list = document.getElementById("appList"); if (!list.selectedItem) { document.getElementById("remove").disabled = true; diff --git a/application/palemoon/components/preferences/cookies.js b/application/palemoon/components/preferences/cookies.js index 4fa47ee4e..d50b8c943 100644 --- a/application/palemoon/components/preferences/cookies.js +++ b/application/palemoon/components/preferences/cookies.js @@ -575,7 +575,7 @@ var gCookiesWindow = { removeSelectedCookies.disabled = !hasRows || !hasSelection; }, - performDeletion: function gCookiesWindow_performDeletion(deleteItems) { + performDeletion: function (deleteItems) { var psvc = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); var blockFutureCookies = false; @@ -883,7 +883,7 @@ var gCookiesWindow = { } }, - _updateRemoveAllButton: function gCookiesWindow__updateRemoveAllButton() { + _updateRemoveAllButton: function () { let removeAllCookies = document.getElementById("removeAllCookies"); removeAllCookies.disabled = this._view._rowCount == 0; diff --git a/application/palemoon/components/preferences/privacy.js b/application/palemoon/components/preferences/privacy.js index e2a871acc..c1256a533 100644 --- a/application/palemoon/components/preferences/privacy.js +++ b/application/palemoon/components/preferences/privacy.js @@ -112,7 +112,7 @@ var gPrivacyPane = { /** * Initialize the history mode menulist based on the privacy preferences */ - initializeHistoryMode: function PPP_initializeHistoryMode() + initializeHistoryMode: function () { let mode; let getVal = function (aPref) @@ -133,7 +133,7 @@ var gPrivacyPane = { /** * Update the selected pane based on the history mode menulist */ - updateHistoryModePane: function PPP_updateHistoryModePane() + updateHistoryModePane: function () { let selectedIndex = -1; switch (document.getElementById("historyMode").value) { @@ -154,7 +154,7 @@ var gPrivacyPane = { * Update the private browsing auto-start pref and the history mode * micro-management prefs based on the history mode menulist */ - updateHistoryModePrefs: function PPP_updateHistoryModePrefs() + updateHistoryModePrefs: function () { let pref = document.getElementById("browser.privatebrowsing.autostart"); switch (document.getElementById("historyMode").value) { @@ -187,7 +187,7 @@ var gPrivacyPane = { * Update the privacy micro-management controls based on the * value of the private browsing auto-start checkbox. */ - updatePrivacyMicroControls: function PPP_updatePrivacyMicroControls() + updatePrivacyMicroControls: function () { if (document.getElementById("historyMode").value == "custom") { let disabled = this._autoStartPrivateBrowsing = @@ -229,7 +229,7 @@ var gPrivacyPane = { /** * Initialize the starting state for the auto-start private browsing mode pref reverter. */ - initAutoStartPrivateBrowsingReverter: function PPP_initAutoStartPrivateBrowsingReverter() + initAutoStartPrivateBrowsingReverter: function () { let mode = document.getElementById("historyMode"); let autoStart = document.getElementById("privateBrowsingAutoStart"); @@ -239,7 +239,7 @@ var gPrivacyPane = { _lastMode: null, _lasCheckState: null, - updateAutostart: function PPP_updateAutostart() { + updateAutostart: function () { let mode = document.getElementById("historyMode"); let autoStart = document.getElementById("privateBrowsingAutoStart"); let pref = document.getElementById("browser.privatebrowsing.autostart"); diff --git a/application/palemoon/components/preferences/selectBookmark.js b/application/palemoon/components/preferences/selectBookmark.js index c7ce022c0..f2f1e50d3 100644 --- a/application/palemoon/components/preferences/selectBookmark.js +++ b/application/palemoon/components/preferences/selectBookmark.js @@ -15,7 +15,7 @@ * closes. */ var SelectBookmarkDialog = { - init: function SBD_init() { + init: function () { document.getElementById("bookmarks").place = "place:queryType=1&folder=" + PlacesUIUtils.allBookmarksFolderId; @@ -27,7 +27,7 @@ var SelectBookmarkDialog = { * Update the disabled state of the OK button as the user changes the * selection within the view. */ - selectionChanged: function SBD_selectionChanged() { + selectionChanged: function () { var accept = document.documentElement.getButton("accept"); var bookmarks = document.getElementById("bookmarks"); var disableAcceptButton = true; @@ -38,7 +38,7 @@ var SelectBookmarkDialog = { accept.disabled = disableAcceptButton; }, - onItemDblClick: function SBD_onItemDblClick() { + onItemDblClick: function () { var bookmarks = document.getElementById("bookmarks"); var selectedNode = bookmarks.selectedNode; if (selectedNode && PlacesUtils.nodeIsURI(selectedNode)) { @@ -54,7 +54,7 @@ var SelectBookmarkDialog = { * User accepts their selection. Set all the selected URLs or the contents * of the selected folder as the list of homepages. */ - accept: function SBD_accept() { + accept: function () { var bookmarks = document.getElementById("bookmarks"); NS_ASSERT(bookmarks.hasSelection, "Should not be able to accept dialog if there is no selected URL!"); diff --git a/application/palemoon/components/search/content/engineManager.js b/application/palemoon/components/search/content/engineManager.js index 109dc08d1..2194e32dd 100644 --- a/application/palemoon/components/search/content/engineManager.js +++ b/application/palemoon/components/search/content/engineManager.js @@ -19,7 +19,7 @@ const BROWSER_SUGGEST_PREF = "browser.search.suggest.enabled"; var gEngineView = null; var gEngineManagerDialog = { - init: function engineManager_init() { + init: function () { gEngineView = new EngineView(new EngineStore()); var suggestEnabled = Services.prefs.getBoolPref(BROWSER_SUGGEST_PREF); @@ -31,12 +31,12 @@ var gEngineManagerDialog = { Services.obs.addObserver(this, "browser-search-engine-modified", false); }, - destroy: function engineManager_destroy() { + destroy: function () { // Remove the observer Services.obs.removeObserver(this, "browser-search-engine-modified"); }, - observe: function engineManager_observe(aEngine, aTopic, aVerb) { + observe: function (aEngine, aTopic, aVerb) { if (aTopic == "browser-search-engine-modified") { aEngine.QueryInterface(Ci.nsISearchEngine); switch (aVerb) { @@ -71,7 +71,7 @@ var gEngineManagerDialog = { } }, - onOK: function engineManager_onOK() { + onOK: function () { // Set the preference var newSuggestEnabled = document.getElementById("enableSuggest").checked; Services.prefs.setBoolPref(BROWSER_SUGGEST_PREF, newSuggestEnabled); @@ -111,23 +111,23 @@ var gEngineManagerDialog = { } }, - onRestoreDefaults: function engineManager_onRestoreDefaults() { + onRestoreDefaults: function () { var num = gEngineView._engineStore.restoreDefaultEngines(); gEngineView.rowCountChanged(0, num); gEngineView.invalidate(); }, - showRestoreDefaults: function engineManager_showRestoreDefaults(val) { + showRestoreDefaults: function (val) { document.documentElement.getButton("extra2").disabled = !val; }, - loadAddEngines: function engineManager_loadAddEngines() { + loadAddEngines: function () { this.onOK(); window.opener.BrowserSearch.loadAddEngines(); window.close(); }, - remove: function engineManager_remove() { + remove: function () { gEngineView._engineStore.removeEngine(gEngineView.selectedEngine); var index = gEngineView.selectedIndex; gEngineView.rowCountChanged(index, -1); @@ -142,7 +142,7 @@ var gEngineManagerDialog = { * @param aDir * -1 to move the selected engine down, +1 to move it up. */ - bump: function engineManager_move(aDir) { + bump: function (aDir) { var selectedEngine = gEngineView.selectedEngine; var newIndex = gEngineView.selectedIndex - aDir; @@ -282,7 +282,7 @@ var gEngineManagerDialog = { } }), - onSelect: function engineManager_onSelect() { + onSelect: function () { // Buttons only work if an engine is selected and it's not the last engine, // the latter is true when the selected is first and last at the same time. var lastSelected = (gEngineView.selectedIndex == gEngineView.lastIndex); @@ -326,7 +326,7 @@ function EngineMoveOp(aEngineClone, aNewIndex) { EngineMoveOp.prototype = { _engine: null, _newIndex: null, - commit: function EMO_commit() { + commit: function () { Services.search.moveEngine(this._engine, this._newIndex); } } @@ -338,7 +338,7 @@ function EngineRemoveOp(aEngineClone) { } EngineRemoveOp.prototype = { _engine: null, - commit: function ERO_commit() { + commit: function () { Services.search.removeEngine(this._engine); } } @@ -352,7 +352,7 @@ function EngineUnhideOp(aEngineClone, aNewIndex) { EngineUnhideOp.prototype = { _engine: null, _newIndex: null, - commit: function EUO_commit() { + commit: function () { this._engine.hidden = false; Services.search.moveEngine(this._engine, this._newIndex); } @@ -370,7 +370,7 @@ EngineChangeOp.prototype = { _engine: null, _prop: null, _newValue: null, - commit: function ECO_commit() { + commit: function () { this._engine[this._prop] = this._newValue; } } @@ -398,11 +398,11 @@ EngineStore.prototype = { return val; }, - _getIndexForEngine: function ES_getIndexForEngine(aEngine) { + _getIndexForEngine: function (aEngine) { return this._engines.indexOf(aEngine); }, - _getEngineByName: function ES_getEngineByName(aName) { + _getEngineByName: function (aName) { for each (var engine in this._engines) if (engine.name == aName) return engine; @@ -410,7 +410,7 @@ EngineStore.prototype = { return null; }, - _cloneEngine: function ES_cloneEngine(aEngine) { + _cloneEngine: function (aEngine) { var clonedObj={}; for (var i in aEngine) clonedObj[i] = aEngine[i]; @@ -419,11 +419,11 @@ EngineStore.prototype = { }, // Callback for Array's some(). A thisObj must be passed to some() - _isSameEngine: function ES_isSameEngine(aEngineClone) { + _isSameEngine: function (aEngineClone) { return aEngineClone.originalEngine == this.originalEngine; }, - commit: function ES_commit() { + commit: function () { var currentEngine = this._cloneEngine(Services.search.currentEngine); for (var i = 0; i < this._ops.length; i++) this._ops[i].commit(); @@ -435,11 +435,11 @@ EngineStore.prototype = { Services.search.currentEngine = currentEngine.originalEngine; }, - addEngine: function ES_addEngine(aEngine) { + addEngine: function (aEngine) { this._engines.push(this._cloneEngine(aEngine)); }, - moveEngine: function ES_moveEngine(aEngine, aNewIndex) { + moveEngine: function (aEngine, aNewIndex) { if (aNewIndex < 0 || aNewIndex > this._engines.length - 1) throw new Error("ES_moveEngine: invalid aNewIndex!"); var index = this._getIndexForEngine(aEngine); @@ -456,7 +456,7 @@ EngineStore.prototype = { this._ops.push(new EngineMoveOp(aEngine, aNewIndex)); }, - removeEngine: function ES_removeEngine(aEngine) { + removeEngine: function (aEngine) { var index = this._getIndexForEngine(aEngine); if (index == -1) throw new Error("invalid engine?"); @@ -467,7 +467,7 @@ EngineStore.prototype = { gEngineManagerDialog.showRestoreDefaults(true); }, - restoreDefaultEngines: function ES_restoreDefaultEngines() { + restoreDefaultEngines: function () { var added = 0; for (var i = 0; i < this._defaultEngines.length; ++i) { @@ -487,7 +487,7 @@ EngineStore.prototype = { return added; }, - changeEngine: function ES_changeEngine(aEngine, aProp, aNewValue) { + changeEngine: function (aEngine, aProp, aNewValue) { var index = this._getIndexForEngine(aEngine); if (index == -1) throw new Error("invalid engine?"); @@ -496,7 +496,7 @@ EngineStore.prototype = { this._ops.push(new EngineChangeOp(aEngine, aProp, aNewValue)); }, - reloadIcons: function ES_reloadIcons() { + reloadIcons: function () { this._engines.forEach(function (e) { e.uri = e.originalEngine.uri; }); diff --git a/application/palemoon/components/sessionstore/DocumentUtils.jsm b/application/palemoon/components/sessionstore/DocumentUtils.jsm index 6b3f729b5..867a6744b 100644 --- a/application/palemoon/components/sessionstore/DocumentUtils.jsm +++ b/application/palemoon/components/sessionstore/DocumentUtils.jsm @@ -25,7 +25,7 @@ this.DocumentUtils = { * @return object * Form data encoded in an object. */ - getFormData: function DocumentUtils_getFormData(aDocument) { + getFormData: function (aDocument) { let formNodes = aDocument.evaluate( XPathGenerator.restorableFormNodes, aDocument, @@ -117,7 +117,7 @@ this.DocumentUtils = { * @param aData * Object defining form data. */ - mergeFormData: function DocumentUtils_mergeFormData(aDocument, aData) { + mergeFormData: function (aDocument, aData) { if ("xpath" in aData) { for each (let [xpath, value] in Iterator(aData.xpath)) { let node = XPathGenerator.resolve(aDocument, xpath); @@ -155,7 +155,7 @@ this.DocumentUtils = { * DOMDocument node belongs to. If not defined, node.ownerDocument * is used. */ - restoreFormValue: function DocumentUtils_restoreFormValue(aNode, aValue, aDocument) { + restoreFormValue: function (aNode, aValue, aDocument) { aDocument = aDocument || aNode.ownerDocument; let eventType; diff --git a/application/palemoon/components/sessionstore/SessionStorage.jsm b/application/palemoon/components/sessionstore/SessionStorage.jsm index 64aef35a5..f1320df7e 100644 --- a/application/palemoon/components/sessionstore/SessionStorage.jsm +++ b/application/palemoon/components/sessionstore/SessionStorage.jsm @@ -20,7 +20,7 @@ this.SessionStorage = { * @param aFullData * always return privacy sensitive data (use with care) */ - serialize: function ssto_serialize(aDocShell, aFullData) { + serialize: function (aDocShell, aFullData) { return DomStorage.read(aDocShell, aFullData); }, @@ -31,7 +31,7 @@ this.SessionStorage = { * @param aStorageData * Storage data to be restored */ - deserialize: function ssto_deserialize(aDocShell, aStorageData) { + deserialize: function (aDocShell, aStorageData) { DomStorage.write(aDocShell, aStorageData); } }; @@ -46,7 +46,7 @@ var DomStorage = { * @param aFullData * Always return privacy sensitive data (use with care) */ - read: function DomStorage_read(aDocShell, aFullData) { + read: function (aDocShell, aFullData) { let data = {}; let isPinned = aDocShell.isAppTab; let shistory = aDocShell.sessionHistory; @@ -81,7 +81,7 @@ var DomStorage = { * @param aStorageData * Storage data to be restored */ - write: function DomStorage_write(aDocShell, aStorageData) { + write: function (aDocShell, aStorageData) { for (let [host, data] in Iterator(aStorageData)) { let uri = Services.io.newURI(host, null, null); let principal = Services.scriptSecurityManager.getDocShellCodebasePrincipal(uri, aDocShell); @@ -116,7 +116,7 @@ var DomStorage = { * @param aDocShell * A tab's docshell (containing the sessionStorage) */ - _readEntry: function DomStorage_readEntry(aPrincipal, aDocShell) { + _readEntry: function (aPrincipal, aDocShell) { let hostData = {}; let storage; @@ -152,7 +152,7 @@ var History = { * @param aDocShell * That tab's docshell */ - getPrincipalForEntry: function History_getPrincipalForEntry(aHistory, + getPrincipalForEntry: function (aHistory, aIndex, aDocShell) { try { diff --git a/application/palemoon/components/sessionstore/SessionStore.jsm b/application/palemoon/components/sessionstore/SessionStore.jsm index e19a578f4..d7cd9ea6d 100644 --- a/application/palemoon/components/sessionstore/SessionStore.jsm +++ b/application/palemoon/components/sessionstore/SessionStore.jsm @@ -109,7 +109,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm"); Object.defineProperty(this, "HUDService", { - get: function HUDService_getter() { + get: function () { let devtools = Cu.import("resource://devtools/shared/Loader.jsm", {}).devtools; return devtools.require("devtools/client/webconsole/hudservice").HUDService; }, @@ -143,103 +143,103 @@ this.SessionStore = { SessionStoreInternal.canRestoreLastSession = val; }, - init: function ss_init(aWindow) { + init: function (aWindow) { return SessionStoreInternal.init(aWindow); }, - getBrowserState: function ss_getBrowserState() { + getBrowserState: function () { return SessionStoreInternal.getBrowserState(); }, - setBrowserState: function ss_setBrowserState(aState) { + setBrowserState: function (aState) { SessionStoreInternal.setBrowserState(aState); }, - getWindowState: function ss_getWindowState(aWindow) { + getWindowState: function (aWindow) { return SessionStoreInternal.getWindowState(aWindow); }, - setWindowState: function ss_setWindowState(aWindow, aState, aOverwrite) { + setWindowState: function (aWindow, aState, aOverwrite) { SessionStoreInternal.setWindowState(aWindow, aState, aOverwrite); }, - getTabState: function ss_getTabState(aTab) { + getTabState: function (aTab) { return SessionStoreInternal.getTabState(aTab); }, - setTabState: function ss_setTabState(aTab, aState) { + setTabState: function (aTab, aState) { SessionStoreInternal.setTabState(aTab, aState); }, - duplicateTab: function ss_duplicateTab(aWindow, aTab, aDelta) { + duplicateTab: function (aWindow, aTab, aDelta) { return SessionStoreInternal.duplicateTab(aWindow, aTab, aDelta); }, - getClosedTabCount: function ss_getClosedTabCount(aWindow) { + getClosedTabCount: function (aWindow) { return SessionStoreInternal.getClosedTabCount(aWindow); }, - getClosedTabData: function ss_getClosedTabDataAt(aWindow) { + getClosedTabData: function (aWindow) { return SessionStoreInternal.getClosedTabData(aWindow); }, - undoCloseTab: function ss_undoCloseTab(aWindow, aIndex) { + undoCloseTab: function (aWindow, aIndex) { return SessionStoreInternal.undoCloseTab(aWindow, aIndex); }, - forgetClosedTab: function ss_forgetClosedTab(aWindow, aIndex) { + forgetClosedTab: function (aWindow, aIndex) { return SessionStoreInternal.forgetClosedTab(aWindow, aIndex); }, - getClosedWindowCount: function ss_getClosedWindowCount() { + getClosedWindowCount: function () { return SessionStoreInternal.getClosedWindowCount(); }, - getClosedWindowData: function ss_getClosedWindowData() { + getClosedWindowData: function () { return SessionStoreInternal.getClosedWindowData(); }, - undoCloseWindow: function ss_undoCloseWindow(aIndex) { + undoCloseWindow: function (aIndex) { return SessionStoreInternal.undoCloseWindow(aIndex); }, - forgetClosedWindow: function ss_forgetClosedWindow(aIndex) { + forgetClosedWindow: function (aIndex) { return SessionStoreInternal.forgetClosedWindow(aIndex); }, - getWindowValue: function ss_getWindowValue(aWindow, aKey) { + getWindowValue: function (aWindow, aKey) { return SessionStoreInternal.getWindowValue(aWindow, aKey); }, - setWindowValue: function ss_setWindowValue(aWindow, aKey, aStringValue) { + setWindowValue: function (aWindow, aKey, aStringValue) { SessionStoreInternal.setWindowValue(aWindow, aKey, aStringValue); }, - deleteWindowValue: function ss_deleteWindowValue(aWindow, aKey) { + deleteWindowValue: function (aWindow, aKey) { SessionStoreInternal.deleteWindowValue(aWindow, aKey); }, - getTabValue: function ss_getTabValue(aTab, aKey) { + getTabValue: function (aTab, aKey) { return SessionStoreInternal.getTabValue(aTab, aKey); }, - setTabValue: function ss_setTabValue(aTab, aKey, aStringValue) { + setTabValue: function (aTab, aKey, aStringValue) { SessionStoreInternal.setTabValue(aTab, aKey, aStringValue); }, - deleteTabValue: function ss_deleteTabValue(aTab, aKey) { + deleteTabValue: function (aTab, aKey) { SessionStoreInternal.deleteTabValue(aTab, aKey); }, - persistTabAttribute: function ss_persistTabAttribute(aName) { + persistTabAttribute: function (aName) { SessionStoreInternal.persistTabAttribute(aName); }, - restoreLastSession: function ss_restoreLastSession() { + restoreLastSession: function () { SessionStoreInternal.restoreLastSession(); }, - checkPrivacyLevel: function ss_checkPrivacyLevel(aIsHTTPS, aUseDefaultPref) { + checkPrivacyLevel: function (aIsHTTPS, aUseDefaultPref) { return SessionStoreInternal.checkPrivacyLevel(aIsHTTPS, aUseDefaultPref); } }; @@ -354,7 +354,7 @@ var SessionStoreInternal = { /** * Initialize the component */ - initService: function ssi_initService() { + initService: function () { if (this._sessionInitialized) { return; } @@ -375,7 +375,7 @@ var SessionStoreInternal = { ); }, - initSession: function ssi_initSession() { + initSession: function () { let ss = gSessionStartup; try { if (ss.doRestore() || @@ -464,7 +464,7 @@ var SessionStoreInternal = { this._promiseInitialization.resolve(); }, - _initEncoding : function ssi_initEncoding() { + _initEncoding : function () { // The (UTF-8) encoder used to write to files. XPCOMUtils.defineLazyGetter(this, "_writeFileEncoder", function () { return new TextEncoder(); @@ -508,7 +508,7 @@ var SessionStoreInternal = { }, - _initWindow: function ssi_initWindow(aWindow) { + _initWindow: function (aWindow) { if (aWindow) { this.onLoad(aWindow); } else if (this._loadState == STATE_STOPPED) { @@ -527,7 +527,7 @@ var SessionStoreInternal = { * This function also initializes the component if it is not * initialized yet. */ - init: function ssi_init(aWindow) { + init: function (aWindow) { let self = this; this.initService(); return this._promiseInitialization.promise.then( @@ -541,7 +541,7 @@ var SessionStoreInternal = { * Called on application shutdown, after notifications: * quit-application-granted, quit-application */ - _uninit: function ssi_uninit() { + _uninit: function () { // save all data for session resuming if (this._sessionInitialized) this.saveState(true); @@ -559,7 +559,7 @@ var SessionStoreInternal = { /** * Handle notifications */ - observe: function ssi_observe(aSubject, aTopic, aData) { + observe: function (aSubject, aTopic, aData) { if (this._disabledForMultiProcess) return; @@ -601,7 +601,7 @@ var SessionStoreInternal = { * This method handles incoming messages sent by the session store content * script and thus enables communication with OOP tabs. */ - receiveMessage: function ssi_receiveMessage(aMessage) { + receiveMessage: function (aMessage) { var browser = aMessage.target; var win = browser.ownerDocument.defaultView; @@ -625,7 +625,7 @@ var SessionStoreInternal = { /** * Implement nsIDOMEventListener for handling various window and tab events */ - handleEvent: function ssi_handleEvent(aEvent) { + handleEvent: function (aEvent) { if (this._disabledForMultiProcess) return; @@ -676,7 +676,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onLoad: function ssi_onLoad(aWindow) { + onLoad: function (aWindow) { // return if window has already been initialized if (aWindow && aWindow.__SSi && this._windows[aWindow.__SSi]) return; @@ -845,7 +845,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onOpen: function ssi_onOpen(aWindow) { + onOpen: function (aWindow) { var _this = this; aWindow.addEventListener("load", function(aEvent) { aEvent.currentTarget.removeEventListener("load", arguments.callee, false); @@ -861,7 +861,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onClose: function ssi_onClose(aWindow) { + onClose: function (aWindow) { // this window was about to be restored - conserve its original data, if any let isFullyLoaded = this._isWindowLoaded(aWindow); if (!isFullyLoaded) { @@ -949,7 +949,7 @@ var SessionStoreInternal = { /** * On quit application requested */ - onQuitApplicationRequested: function ssi_onQuitApplicationRequested() { + onQuitApplicationRequested: function () { // get a current snapshot of all windows this._forEachBrowserWindow(function(aWindow) { this._collectWindowData(aWindow); @@ -965,7 +965,7 @@ var SessionStoreInternal = { /** * On quit application granted */ - onQuitApplicationGranted: function ssi_onQuitApplicationGranted() { + onQuitApplicationGranted: function () { // freeze the data at what we've got (ignoring closing windows) this._loadState = STATE_QUITTING; }, @@ -973,7 +973,7 @@ var SessionStoreInternal = { /** * On last browser window close */ - onLastWindowCloseGranted: function ssi_onLastWindowCloseGranted() { + onLastWindowCloseGranted: function () { // last browser window is quitting. // remember to restore the last window when another browser window is opened // do not account for pref(resume_session_once) at this point, as it might be @@ -986,7 +986,7 @@ var SessionStoreInternal = { * @param aData * String type of quitting */ - onQuitApplication: function ssi_onQuitApplication(aData) { + onQuitApplication: function (aData) { if (aData == "restart") { this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); // The browser:purge-session-history notification fires after the @@ -1019,7 +1019,7 @@ var SessionStoreInternal = { /** * On purge of session history */ - onPurgeSessionHistory: function ssi_onPurgeSessionHistory() { + onPurgeSessionHistory: function () { var _this = this; _SessionFile.wipe(); // If the browser is shutting down, simply return after clearing the @@ -1070,7 +1070,7 @@ var SessionStoreInternal = { * @param aData * String domain data */ - onPurgeDomainData: function ssi_onPurgeDomainData(aData) { + onPurgeDomainData: function (aData) { // does a session history entry contain a url for the given domain? function containsDomain(aEntry) { try { @@ -1128,7 +1128,7 @@ var SessionStoreInternal = { * @param aData * String preference changed */ - onPrefChange: function ssi_onPrefChange(aData) { + onPrefChange: function (aData) { switch (aData) { // if the user decreases the max number of closed tabs they want // preserved update our internal states to match that max @@ -1171,7 +1171,7 @@ var SessionStoreInternal = { /** * On timer callback */ - onTimerCallback: function ssi_onTimerCallback() { + onTimerCallback: function () { this._saveTimer = null; this.saveState(); }, @@ -1185,7 +1185,7 @@ var SessionStoreInternal = { * @param aNoNotification * bool Do not save state if we're updating an existing tab */ - onTabAdd: function ssi_onTabAdd(aWindow, aTab, aNoNotification) { + onTabAdd: function (aWindow, aTab, aNoNotification) { let browser = aTab.linkedBrowser; browser.addEventListener("load", this, true); @@ -1206,7 +1206,7 @@ var SessionStoreInternal = { * @param aNoNotification * bool Do not save state if we're updating an existing tab */ - onTabRemove: function ssi_onTabRemove(aWindow, aTab, aNoNotification) { + onTabRemove: function (aWindow, aTab, aNoNotification) { let browser = aTab.linkedBrowser; browser.removeEventListener("load", this, true); @@ -1240,7 +1240,7 @@ var SessionStoreInternal = { * @param aTab * Tab reference */ - onTabClose: function ssi_onTabClose(aWindow, aTab) { + onTabClose: function (aWindow, aTab) { // notify the tabbrowser that the tab state will be retrieved for the last time // (so that extension authors can easily set data on soon-to-be-closed tabs) var event = aWindow.document.createEvent("Events"); @@ -1281,7 +1281,7 @@ var SessionStoreInternal = { * @param aBrowser * Browser reference */ - onTabLoad: function ssi_onTabLoad(aWindow, aBrowser) { + onTabLoad: function (aWindow, aBrowser) { // react on "load" and solitary "pageshow" events (the first "pageshow" // following "load" is too late for deleting the data caches) // It's possible to get a load event after calling stop on a browser (when @@ -1305,7 +1305,7 @@ var SessionStoreInternal = { * @param aBrowser * Browser reference */ - onTabInput: function ssi_onTabInput(aWindow, aBrowser) { + onTabInput: function (aWindow, aBrowser) { // deleting __SS_formDataSaved will cause us to recollect form data delete aBrowser.__SS_formDataSaved; @@ -1317,7 +1317,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - onTabSelect: function ssi_onTabSelect(aWindow) { + onTabSelect: function (aWindow) { if (this._loadState == STATE_RUNNING) { this._windows[aWindow.__SSi].selected = aWindow.gBrowser.tabContainer.selectedIndex; @@ -1332,7 +1332,7 @@ var SessionStoreInternal = { } }, - onTabShow: function ssi_onTabShow(aWindow, aTab) { + onTabShow: function (aWindow, aTab) { // If the tab hasn't been restored yet, move it into the right bucket if (aTab.linkedBrowser.__SS_restoreState && aTab.linkedBrowser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE) { @@ -1348,7 +1348,7 @@ var SessionStoreInternal = { this.saveStateDelayed(aWindow); }, - onTabHide: function ssi_onTabHide(aWindow, aTab) { + onTabHide: function (aWindow, aTab) { // If the tab hasn't been restored yet, move it into the right bucket if (aTab.linkedBrowser.__SS_restoreState && aTab.linkedBrowser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE) { @@ -1362,11 +1362,11 @@ var SessionStoreInternal = { /* ........ nsISessionStore API .............. */ - getBrowserState: function ssi_getBrowserState() { + getBrowserState: function () { return this._toJSONString(this._getCurrentState()); }, - setBrowserState: function ssi_setBrowserState(aState) { + setBrowserState: function (aState) { this._handleClosedWindows(); try { @@ -1406,7 +1406,7 @@ var SessionStoreInternal = { this.restoreWindow(window, state, true); }, - getWindowState: function ssi_getWindowState(aWindow) { + getWindowState: function (aWindow) { if ("__SSi" in aWindow) { return this._toJSONString(this._getWindowState(aWindow)); } @@ -1419,14 +1419,14 @@ var SessionStoreInternal = { throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); }, - setWindowState: function ssi_setWindowState(aWindow, aState, aOverwrite) { + setWindowState: function (aWindow, aState, aOverwrite) { if (!aWindow.__SSi) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); this.restoreWindow(aWindow, aState, aOverwrite); }, - getTabState: function ssi_getTabState(aTab) { + getTabState: function (aTab) { if (!aTab.ownerDocument || !aTab.ownerDocument.defaultView.__SSi) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); @@ -1438,7 +1438,7 @@ var SessionStoreInternal = { return this._toJSONString(tabState); }, - setTabState: function ssi_setTabState(aTab, aState) { + setTabState: function (aTab, aState) { var tabState = JSON.parse(aState); if (!tabState.entries || !aTab.ownerDocument || !aTab.ownerDocument.defaultView.__SSi) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); @@ -1448,7 +1448,7 @@ var SessionStoreInternal = { this.restoreHistoryPrecursor(window, [aTab], [tabState], 0, 0, 0); }, - duplicateTab: function ssi_duplicateTab(aWindow, aTab, aDelta) { + duplicateTab: function (aWindow, aTab, aDelta) { if (!aTab.ownerDocument || !aTab.ownerDocument.defaultView.__SSi || !aWindow.getBrowser) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); @@ -1471,7 +1471,7 @@ var SessionStoreInternal = { return newTab; }, - getClosedTabCount: function ssi_getClosedTabCount(aWindow) { + getClosedTabCount: function (aWindow) { if ("__SSi" in aWindow) { return this._windows[aWindow.__SSi]._closedTabs.length; } @@ -1483,7 +1483,7 @@ var SessionStoreInternal = { throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); }, - getClosedTabData: function ssi_getClosedTabDataAt(aWindow) { + getClosedTabData: function (aWindow) { if ("__SSi" in aWindow) { return this._toJSONString(this._windows[aWindow.__SSi]._closedTabs); } @@ -1496,7 +1496,7 @@ var SessionStoreInternal = { throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); }, - undoCloseTab: function ssi_undoCloseTab(aWindow, aIndex) { + undoCloseTab: function (aWindow, aIndex) { if (!aWindow.__SSi) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); @@ -1528,7 +1528,7 @@ var SessionStoreInternal = { return tab; }, - forgetClosedTab: function ssi_forgetClosedTab(aWindow, aIndex) { + forgetClosedTab: function (aWindow, aIndex) { if (!aWindow.__SSi) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); @@ -1543,15 +1543,15 @@ var SessionStoreInternal = { closedTabs.splice(aIndex, 1); }, - getClosedWindowCount: function ssi_getClosedWindowCount() { + getClosedWindowCount: function () { return this._closedWindows.length; }, - getClosedWindowData: function ssi_getClosedWindowData() { + getClosedWindowData: function () { return this._toJSONString(this._closedWindows); }, - undoCloseWindow: function ssi_undoCloseWindow(aIndex) { + undoCloseWindow: function (aIndex) { if (!(aIndex in this._closedWindows)) throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); @@ -1562,7 +1562,7 @@ var SessionStoreInternal = { return window; }, - forgetClosedWindow: function ssi_forgetClosedWindow(aIndex) { + forgetClosedWindow: function (aIndex) { // default to the most-recently closed window aIndex = aIndex || 0; if (!(aIndex in this._closedWindows)) @@ -1572,7 +1572,7 @@ var SessionStoreInternal = { this._closedWindows.splice(aIndex, 1); }, - getWindowValue: function ssi_getWindowValue(aWindow, aKey) { + getWindowValue: function (aWindow, aKey) { if ("__SSi" in aWindow) { var data = this._windows[aWindow.__SSi].extData || {}; return data[aKey] || ""; @@ -1586,7 +1586,7 @@ var SessionStoreInternal = { throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG); }, - setWindowValue: function ssi_setWindowValue(aWindow, aKey, aStringValue) { + setWindowValue: function (aWindow, aKey, aStringValue) { if (aWindow.__SSi) { if (!this._windows[aWindow.__SSi].extData) { this._windows[aWindow.__SSi].extData = {}; @@ -1599,13 +1599,13 @@ var SessionStoreInternal = { } }, - deleteWindowValue: function ssi_deleteWindowValue(aWindow, aKey) { + deleteWindowValue: function (aWindow, aKey) { if (aWindow.__SSi && this._windows[aWindow.__SSi].extData && this._windows[aWindow.__SSi].extData[aKey]) delete this._windows[aWindow.__SSi].extData[aKey]; }, - getTabValue: function ssi_getTabValue(aTab, aKey) { + getTabValue: function (aTab, aKey) { let data = {}; if (aTab.__SS_extdata) { data = aTab.__SS_extdata; @@ -1617,7 +1617,7 @@ var SessionStoreInternal = { return data[aKey] || ""; }, - setTabValue: function ssi_setTabValue(aTab, aKey, aStringValue) { + setTabValue: function (aTab, aKey, aStringValue) { // If the tab hasn't been restored, then set the data there, otherwise we // could lose newly added data. let saveTo; @@ -1635,7 +1635,7 @@ var SessionStoreInternal = { this.saveStateDelayed(aTab.ownerDocument.defaultView); }, - deleteTabValue: function ssi_deleteTabValue(aTab, aKey) { + deleteTabValue: function (aTab, aKey) { // We want to make sure that if data is accessed early, we attempt to delete // that data from __SS_data as well. Otherwise we'll throw in cases where // data can be set or read. @@ -1651,7 +1651,7 @@ var SessionStoreInternal = { delete deleteFrom[aKey]; }, - persistTabAttribute: function ssi_persistTabAttribute(aName) { + persistTabAttribute: function (aName) { if (TabAttributes.persist(aName)) { this.saveStateDelayed(); } @@ -1664,7 +1664,7 @@ var SessionStoreInternal = { * that window will be opened into that winddow. Otherwise new windows will * be opened. */ - restoreLastSession: function ssi_restoreLastSession() { + restoreLastSession: function () { // Use the public getter since it also checks PB mode if (!this.canRestoreLastSession) throw (Components.returnCode = Cr.NS_ERROR_FAILURE); @@ -1776,7 +1776,7 @@ var SessionStoreInternal = { * canOverwriteTabs: all of the current tabs are home pages and we * can overwrite them */ - _prepWindowToRestoreInto: function ssi_prepWindowToRestoreInto(aWindow) { + _prepWindowToRestoreInto: function (aWindow) { if (!aWindow) return [false, false]; @@ -1830,7 +1830,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - _saveWindowHistory: function ssi_saveWindowHistory(aWindow) { + _saveWindowHistory: function (aWindow) { var tabbrowser = aWindow.gBrowser; var tabs = tabbrowser.tabs; var tabsData = this._windows[aWindow.__SSi].tabs = []; @@ -1849,7 +1849,7 @@ var SessionStoreInternal = { * always return privacy sensitive data (use with care) * @returns object */ - _collectTabData: function ssi_collectTabData(aTab, aFullData) { + _collectTabData: function (aTab, aFullData) { var tabData = { entries: [], lastAccessed: aTab.lastAccessed }; var browser = aTab.linkedBrowser; @@ -2013,7 +2013,7 @@ var SessionStoreInternal = { * @returns object */ _serializeHistoryEntry: - function ssi_serializeHistoryEntry(aEntry, aFullData, aIsPinned, aHostSchemeData) { + function (aEntry, aFullData, aIsPinned, aHostSchemeData) { var entry = { url: aEntry.URI.spec }; try { @@ -2152,7 +2152,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - _updateTextAndScrollData: function ssi_updateTextAndScrollData(aWindow) { + _updateTextAndScrollData: function (aWindow) { var browsers = aWindow.gBrowser.browsers; this._windows[aWindow.__SSi].tabs.forEach(function (tabData, i) { try { @@ -2175,7 +2175,7 @@ var SessionStoreInternal = { * always return privacy sensitive data (use with care) */ _updateTextAndScrollDataForTab: - function ssi_updateTextAndScrollDataForTab(aWindow, aBrowser, aTabData, aFullData) { + function (aWindow, aBrowser, aTabData, aFullData) { // we shouldn't update data for incompletely initialized tabs if (aBrowser.__SS_data && aBrowser.__SS_tabStillLoading) return; @@ -2223,7 +2223,7 @@ var SessionStoreInternal = { * the tab is pinned and should be treated differently for privacy */ _updateTextAndScrollDataForFrame: - function ssi_updateTextAndScrollDataForFrame(aWindow, aContent, aData, + function (aWindow, aContent, aData, aUpdateFormData, aFullData, aIsPinned) { for (var i = 0; i < aContent.frames.length; i++) { if (aData.children && aData.children[i]) @@ -2273,7 +2273,7 @@ var SessionStoreInternal = { * @param aContent is a frame reference * @returns the title style sheet determined to be enabled (empty string if none) */ - _getSelectedPageStyle: function ssi_getSelectedPageStyle(aContent) { + _getSelectedPageStyle: function (aContent) { const forScreen = /(?:^|,)\s*(?:all|screen)\s*(?:,|$)/i; for (let i = 0; i < aContent.document.styleSheets.length; i++) { let ss = aContent.document.styleSheets[i]; @@ -2302,7 +2302,7 @@ var SessionStoreInternal = { * aCheckPrivacy */ _extractHostsForCookiesFromEntry: - function ssi_extractHostsForCookiesFromEntry(aEntry, aHosts, aCheckPrivacy, aIsPinned) { + function (aEntry, aHosts, aCheckPrivacy, aIsPinned) { let host = aEntry._host, scheme = aEntry._scheme; @@ -2343,7 +2343,7 @@ var SessionStoreInternal = { * aCheckPrivacy */ _extractHostsForCookiesFromHostScheme: - function ssi_extractHostsForCookiesFromHostScheme(aHost, aScheme, aHosts, aCheckPrivacy, aIsPinned) { + function (aHost, aScheme, aHosts, aCheckPrivacy, aIsPinned) { // host and scheme may not be set (for about: urls for example), in which // case testing scheme will be sufficient. if (/https?/.test(aScheme) && !aHosts[aHost] && @@ -2363,7 +2363,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - _updateCookieHosts: function ssi_updateCookieHosts(aWindow) { + _updateCookieHosts: function (aWindow) { var hosts = this._internalWindows[aWindow.__SSi].hosts = {}; // Since _updateCookiesHosts is only ever called for open windows during a @@ -2386,7 +2386,7 @@ var SessionStoreInternal = { * JS object containing window data references * { id: winData, etc. } */ - _updateCookies: function ssi_updateCookies(aWindows) { + _updateCookies: function (aWindows) { function addCookieToHash(aHash, aHost, aPath, aName, aCookie) { // lazily build up a 3-dimensional hash, with // aHost, aPath, and aName as keys @@ -2452,7 +2452,7 @@ var SessionStoreInternal = { * @param aWindow * Window reference */ - _updateWindowFeatures: function ssi_updateWindowFeatures(aWindow) { + _updateWindowFeatures: function (aWindow) { var winData = this._windows[aWindow.__SSi]; WINDOW_ATTRIBUTES.forEach(function(aAttr) { @@ -2482,7 +2482,7 @@ var SessionStoreInternal = { * Bool collect pinned tabs only * @returns object */ - _getCurrentState: function ssi_getCurrentState(aUpdateAll, aPinnedOnly) { + _getCurrentState: function (aUpdateAll, aPinnedOnly) { this._handleClosedWindows(); var activeWindow = this._getMostRecentBrowserWindow(); @@ -2610,7 +2610,7 @@ var SessionStoreInternal = { * Window reference * @returns string */ - _getWindowState: function ssi_getWindowState(aWindow) { + _getWindowState: function (aWindow) { if (!this._isWindowLoaded(aWindow)) return this._statesToRestore[aWindow.__SS_restoreID]; @@ -2626,7 +2626,7 @@ var SessionStoreInternal = { return { windows: [winData] }; }, - _collectWindowData: function ssi_collectWindowData(aWindow) { + _collectWindowData: function (aWindow) { if (!this._isWindowLoaded(aWindow)) return; @@ -2658,7 +2658,7 @@ var SessionStoreInternal = { * @param aFollowUp * bool this isn't the restoration of the first window */ - restoreWindow: function ssi_restoreWindow(aWindow, aState, aOverwriteTabs, aFollowUp) { + restoreWindow: function (aWindow, aState, aOverwriteTabs, aFollowUp) { if (!aFollowUp) { this.windowToFocus = aWindow; } @@ -2853,7 +2853,7 @@ var SessionStoreInternal = { * @param aSelectedTab * Index of selected tab (1 is first tab, 0 no selected tab) */ - _setTabsRestoringOrder : function ssi__setTabsRestoringOrder( + _setTabsRestoringOrder : function ( aTabBrowser, aTabs, aTabData, aSelectedTab) { // Store the selected tab. Need to substract one to get the index in aTabs. @@ -2939,7 +2939,7 @@ var SessionStoreInternal = { * restored/loaded immediately even if restore_on_demand = true */ restoreHistoryPrecursor: - function ssi_restoreHistoryPrecursor(aWindow, aTabs, aTabData, aSelectTab, + function (aWindow, aTabs, aTabData, aSelectTab, aIx, aCount, aRestoreImmediately = false) { var tabbrowser = aWindow.gBrowser; @@ -3079,7 +3079,7 @@ var SessionStoreInternal = { * restored/loaded immediately even if restore_on_demand = true */ restoreHistory: - function ssi_restoreHistory(aWindow, aTabs, aTabData, aIdMap, aDocIdentMap, + function (aWindow, aTabs, aTabData, aIdMap, aDocIdentMap, aRestoreImmediately) { var _this = this; // if the tab got removed before being completely restored, then skip it @@ -3188,7 +3188,7 @@ var SessionStoreInternal = { * * @returns true/false indicating whether or not a load actually happened */ - restoreTab: function ssi_restoreTab(aTab) { + restoreTab: function (aTab) { let window = aTab.ownerDocument.defaultView; let browser = aTab.linkedBrowser; let tabData = browser.__SS_data; @@ -3295,7 +3295,7 @@ var SessionStoreInternal = { * if there are no tabs to restore * if we have already reached the limit for number of tabs to restore */ - restoreNextTab: function ssi_restoreNextTab() { + restoreNextTab: function () { // If we call in here while quitting, we don't actually want to do anything if (this._loadState == STATE_QUITTING) return; @@ -3323,7 +3323,7 @@ var SessionStoreInternal = { * @returns nsISHEntry */ _deserializeHistoryEntry: - function ssi_deserializeHistoryEntry(aEntry, aIdMap, aDocIdentMap) { + function (aEntry, aIdMap, aDocIdentMap) { var shEntry = Cc["@mozilla.org/browser/session-history-entry;1"]. createInstance(Ci.nsISHEntry); @@ -3455,7 +3455,7 @@ var SessionStoreInternal = { /** * Restore properties to a loaded document */ - restoreDocument: function ssi_restoreDocument(aWindow, aBrowser, aEvent) { + restoreDocument: function (aWindow, aBrowser, aEvent) { // wait for the top frame to be loaded completely if (!aEvent || !aEvent.originalTarget || !aEvent.originalTarget.defaultView || aEvent.originalTarget.defaultView != aEvent.originalTarget.defaultView.top) { @@ -3548,7 +3548,7 @@ var SessionStoreInternal = { * @param aWinData * Object containing session data for the window */ - restoreWindowFeatures: function ssi_restoreWindowFeatures(aWindow, aWinData) { + restoreWindowFeatures: function (aWindow, aWinData) { var hidden = (aWinData.hidden)?aWinData.hidden.split(","):[]; WINDOW_HIDEABLE_FEATURES.forEach(function(aItem) { aWindow[aItem].visible = hidden.indexOf(aItem) == -1; @@ -3595,7 +3595,7 @@ var SessionStoreInternal = { * @param aSidebar * Sidebar command */ - restoreDimensions: function ssi_restoreDimensions(aWindow, aWidth, aHeight, aLeft, aTop, aSizeMode, aSidebar) { + restoreDimensions: function (aWindow, aWidth, aHeight, aLeft, aTop, aSizeMode, aSidebar) { var win = aWindow; var _this = this; function win_(aName) { return _this._getWindowDimension(win, aName); } @@ -3695,7 +3695,7 @@ var SessionStoreInternal = { * @param aCookies * Array of cookie objects */ - restoreCookies: function ssi_restoreCookies(aCookies) { + restoreCookies: function (aCookies) { // MAX_EXPIRY should be 2^63-1, but JavaScript can't handle that precision var MAX_EXPIRY = Math.pow(2, 62); for (let i = 0; i < aCookies.length; i++) { @@ -3719,7 +3719,7 @@ var SessionStoreInternal = { * @param aDelay * Milliseconds to delay */ - saveStateDelayed: function ssi_saveStateDelayed(aWindow, aDelay) { + saveStateDelayed: function (aWindow, aDelay) { if (aWindow) { this._dirtyWindows[aWindow.__SSi] = true; } @@ -3745,7 +3745,7 @@ var SessionStoreInternal = { * @param aUpdateAll * Bool update all windows */ - saveState: function ssi_saveState(aUpdateAll) { + saveState: function (aUpdateAll) { // If crash recovery is disabled, we only want to resume with pinned tabs // if we crash. let pinnedOnly = this._loadState == STATE_RUNNING && !this._resume_from_crash; @@ -3817,7 +3817,7 @@ var SessionStoreInternal = { /** * write a state object to disk */ - _saveStateObject: function ssi_saveStateObject(aStateObj) { + _saveStateObject: function (aStateObj) { let data = this._toJSONString(aStateObj); let stateString = this._createSupportsString(data); @@ -3861,7 +3861,7 @@ var SessionStoreInternal = { /* ........ Auxiliary Functions .............. */ // Wrap a string as a nsISupports - _createSupportsString: function ssi_createSupportsString(aData) { + _createSupportsString: function (aData) { let string = Cc["@mozilla.org/supports-string;1"] .createInstance(Ci.nsISupportsString); string.data = aData; @@ -3874,7 +3874,7 @@ var SessionStoreInternal = { * @param aFunc * Callback each window is passed to */ - _forEachBrowserWindow: function ssi_forEachBrowserWindow(aFunc) { + _forEachBrowserWindow: function (aFunc) { var windowsEnum = Services.wm.getEnumerator("navigator:browser"); while (windowsEnum.hasMoreElements()) { @@ -3889,7 +3889,7 @@ var SessionStoreInternal = { * Returns most recent window * @returns Window reference */ - _getMostRecentBrowserWindow: function ssi_getMostRecentBrowserWindow() { + _getMostRecentBrowserWindow: function () { var win = Services.wm.getMostRecentWindow("navigator:browser"); if (!win) return null; @@ -3923,7 +3923,7 @@ var SessionStoreInternal = { * destroyed yet, which would otherwise cause getBrowserState and * setBrowserState to treat them as open windows. */ - _handleClosedWindows: function ssi_handleClosedWindows() { + _handleClosedWindows: function () { var windowsEnum = Services.wm.getEnumerator("navigator:browser"); while (windowsEnum.hasMoreElements()) { @@ -3940,7 +3940,7 @@ var SessionStoreInternal = { * @param aState * Object containing session data */ - _openWindowWithState: function ssi_openWindowWithState(aState) { + _openWindowWithState: function (aState) { var argString = Cc["@mozilla.org/supports-string;1"]. createInstance(Ci.nsISupportsString); argString.data = ""; @@ -3974,7 +3974,7 @@ var SessionStoreInternal = { * Whether or not to resume session, if not recovering from a crash. * @returns bool */ - _doResumeSession: function ssi_doResumeSession() { + _doResumeSession: function () { return this._prefBranch.getIntPref("startup.page") == 3 || this._prefBranch.getBoolPref("sessionstore.resume_session_once"); }, @@ -3985,7 +3985,7 @@ var SessionStoreInternal = { * C.f.: nsBrowserContentHandler's defaultArgs implementation. * @returns bool */ - _isCmdLineEmpty: function ssi_isCmdLineEmpty(aWindow, aState) { + _isCmdLineEmpty: function (aWindow, aState) { var pinnedOnly = aState.windows && aState.windows.every(function (win) win.tabs.every(function (tab) tab.pinned)); @@ -4012,7 +4012,7 @@ var SessionStoreInternal = { * don't do normal check for deferred * @returns bool */ - checkPrivacyLevel: function ssi_checkPrivacyLevel(aIsHTTPS, aUseDefaultPref) { + checkPrivacyLevel: function (aIsHTTPS, aUseDefaultPref) { let pref = "sessionstore.privacy_level"; // If we're in the process of quitting and we're not autoresuming the session // then we should treat it as a deferred session. We have a different privacy @@ -4033,7 +4033,7 @@ var SessionStoreInternal = { * String sizemode | width | height | other window attribute * @returns string */ - _getWindowDimension: function ssi_getWindowDimension(aWindow, aAttribute) { + _getWindowDimension: function (aWindow, aAttribute) { if (aAttribute == "sizemode") { switch (aWindow.windowState) { case aWindow.STATE_FULLSCREEN: @@ -4070,7 +4070,7 @@ var SessionStoreInternal = { * @param string * @returns nsIURI */ - _getURIFromString: function ssi_getURIFromString(aString) { + _getURIFromString: function (aString) { return Services.io.newURI(aString, null, null); }, @@ -4079,7 +4079,7 @@ var SessionStoreInternal = { * @param aRecentCrashes is the number of consecutive crashes * @returns whether a restore page will be needed for the session state */ - _needsRestorePage: function ssi_needsRestorePage(aState, aRecentCrashes) { + _needsRestorePage: function (aState, aRecentCrashes) { const SIX_HOURS_IN_MS = 6 * 60 * 60 * 1000; // don't display the page when there's nothing to restore @@ -4116,7 +4116,7 @@ var SessionStoreInternal = { * The current tab state * @returns boolean */ - _shouldSaveTabState: function ssi_shouldSaveTabState(aTabState) { + _shouldSaveTabState: function (aTabState) { // If the tab has only a transient about: history entry, no other // session history, and no userTypedValue, then we don't actually want to // store this tab's data. @@ -4136,7 +4136,7 @@ var SessionStoreInternal = { * @param aTab * @returns boolean */ - _canRestoreTabHistory: function ssi_canRestoreTabHistory(aTab) { + _canRestoreTabHistory: function (aTab) { return aTab.parentNode && aTab.linkedBrowser && aTab.linkedBrowser.__SS_tabStillLoading; }, @@ -4158,7 +4158,7 @@ var SessionStoreInternal = { * The state, presumably from nsISessionStartup.state * @returns [defaultState, state] */ - _prepDataForDeferredRestore: function ssi_prepDataForDeferredRestore(state) { + _prepDataForDeferredRestore: function (state) { // Make sure that we don't modify the global state as provided by // nsSessionStartup.state. Converting the object to a JSON string and // parsing it again is the easiest way to do that, although not the most @@ -4249,7 +4249,7 @@ var SessionStoreInternal = { * This alters the state of aWinState and aTargetWinState. */ _splitCookiesFromWindow: - function ssi_splitCookiesFromWindow(aWinState, aTargetWinState) { + function (aWinState, aTargetWinState) { if (!aWinState.cookies || !aWinState.cookies.length) return; @@ -4287,11 +4287,11 @@ var SessionStoreInternal = { * @param aJSObject is the object to be converted * @returns the object's JSON representation */ - _toJSONString: function ssi_toJSONString(aJSObject) { + _toJSONString: function (aJSObject) { return JSON.stringify(aJSObject); }, - _sendRestoreCompletedNotifications: function ssi_sendRestoreCompletedNotifications() { + _sendRestoreCompletedNotifications: function () { // not all windows restored, yet if (this._restoreCount > 1) { this._restoreCount--; @@ -4317,7 +4317,7 @@ var SessionStoreInternal = { * @param aValue the window's busy state */ _setWindowStateBusyValue: - function ssi_changeWindowStateBusyValue(aWindow, aValue) { + function (aWindow, aValue) { this._windows[aWindow.__SSi].busy = aValue; @@ -4333,7 +4333,7 @@ var SessionStoreInternal = { * Set the given window's state to 'not busy'. * @param aWindow the window */ - _setWindowStateReady: function ssi_setWindowStateReady(aWindow) { + _setWindowStateReady: function (aWindow) { this._setWindowStateBusyValue(aWindow, false); this._sendWindowStateEvent(aWindow, "Ready"); }, @@ -4342,7 +4342,7 @@ var SessionStoreInternal = { * Set the given window's state to 'busy'. * @param aWindow the window */ - _setWindowStateBusy: function ssi_setWindowStateBusy(aWindow) { + _setWindowStateBusy: function (aWindow) { this._setWindowStateBusyValue(aWindow, true); this._sendWindowStateEvent(aWindow, "Busy"); }, @@ -4352,7 +4352,7 @@ var SessionStoreInternal = { * @param aWindow the window * @param aType the type of event, SSWindowState will be prepended to this string */ - _sendWindowStateEvent: function ssi_sendWindowStateEvent(aWindow, aType) { + _sendWindowStateEvent: function (aWindow, aType) { let event = aWindow.document.createEvent("Events"); event.initEvent("SSWindowState" + aType, true, false); aWindow.dispatchEvent(event); @@ -4362,7 +4362,7 @@ var SessionStoreInternal = { * Dispatch the SSTabRestored event for the given tab. * @param aTab the which has been restored */ - _sendTabRestoredNotification: function ssi_sendTabRestoredNotification(aTab) { + _sendTabRestoredNotification: function (aTab) { let event = aTab.ownerDocument.createEvent("Events"); event.initEvent("SSTabRestored", true, false); aTab.dispatchEvent(event); @@ -4374,7 +4374,7 @@ var SessionStoreInternal = { * @returns whether this window's data is still cached in _statesToRestore * because it's not fully loaded yet */ - _isWindowLoaded: function ssi_isWindowLoaded(aWindow) { + _isWindowLoaded: function (aWindow) { return !aWindow.__SS_restoreID; }, @@ -4386,7 +4386,7 @@ var SessionStoreInternal = { * * @returns aString that has been updated with the new title */ - _replaceLoadingTitle : function ssi_replaceLoadingTitle(aString, aTabbrowser, aTab) { + _replaceLoadingTitle : function (aString, aTabbrowser, aTab) { if (aString == aTabbrowser.mStringBundle.getString("tabs.connecting")) { aTabbrowser.setTabTitle(aTab); [aString, aTab.label] = [aTab.label, aString]; @@ -4399,7 +4399,7 @@ var SessionStoreInternal = { * where we don't have any non-popup windows on Windows and Linux. Then we must * resize such that we have at least one non-popup window. */ - _capClosedWindows : function ssi_capClosedWindows() { + _capClosedWindows : function () { if (this._closedWindows.length <= this._max_windows_undo) return; let spliceTo = this._max_windows_undo; @@ -4415,7 +4415,7 @@ var SessionStoreInternal = { this._closedWindows.splice(spliceTo, this._closedWindows.length); }, - _clearRestoringWindows: function ssi_clearRestoringWindows() { + _clearRestoringWindows: function () { for (let i = 0; i < this._closedWindows.length; i++) { delete this._closedWindows[i]._shouldRestore; } @@ -4424,7 +4424,7 @@ var SessionStoreInternal = { /** * Reset state to prepare for a new session state to be restored. */ - _resetRestoringState: function ssi_initRestoringState() { + _resetRestoringState: function () { TabRestoreQueue.reset(); this._tabsRestoringCount = 0; }, @@ -4436,7 +4436,7 @@ var SessionStoreInternal = { * @param aTab * The tab that will be "reset" */ - _resetTabRestoringState: function ssi_resetTabRestoringState(aTab) { + _resetTabRestoringState: function (aTab) { let window = aTab.ownerDocument.defaultView; let browser = aTab.linkedBrowser; @@ -4478,7 +4478,7 @@ var SessionStoreInternal = { * @param aWindow * The window to add our progress listener to */ - _ensureTabsProgressListener: function ssi_ensureTabsProgressListener(aWindow) { + _ensureTabsProgressListener: function (aWindow) { let tabbrowser = aWindow.gBrowser; if (tabbrowser.mTabsProgressListeners.indexOf(gRestoreTabsProgressListener) == -1) tabbrowser.addTabsProgressListener(gRestoreTabsProgressListener); @@ -4490,7 +4490,7 @@ var SessionStoreInternal = { * @param aWindow * The window from which to remove our progress listener from */ - _removeTabsProgressListener: function ssi_removeTabsProgressListener(aWindow) { + _removeTabsProgressListener: function (aWindow) { // If there are no tabs left to restore (or restoring) in this window, then // we can safely remove the progress listener from this window. if (!aWindow.__SS_tabsToRestore) @@ -4503,7 +4503,7 @@ var SessionStoreInternal = { * @param aTab * The tab who's browser to remove the listener */ - _removeSHistoryListener: function ssi_removeSHistoryListener(aTab) { + _removeSHistoryListener: function (aTab) { let browser = aTab.linkedBrowser; if (browser.__SS_shistoryListener) { browser.webNavigation.sessionHistory. diff --git a/application/palemoon/components/sessionstore/XPathGenerator.jsm b/application/palemoon/components/sessionstore/XPathGenerator.jsm index 83ff2b80a..2189ece25 100644 --- a/application/palemoon/components/sessionstore/XPathGenerator.jsm +++ b/application/palemoon/components/sessionstore/XPathGenerator.jsm @@ -12,7 +12,7 @@ this.XPathGenerator = { /** * Generates an approximate XPath query to an (X)HTML node */ - generate: function sss_xph_generate(aNode) { + generate: function (aNode) { // have we reached the document node already? if (!aNode.parentNode) return ""; @@ -46,7 +46,7 @@ this.XPathGenerator = { /** * Resolves an XPath query generated by XPathGenerator.generate */ - resolve: function sss_xph_resolve(aDocument, aQuery) { + resolve: function (aDocument, aQuery) { let xptype = Components.interfaces.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE; return aDocument.evaluate(aQuery, aDocument, this.resolveNS, xptype, null).singleNodeValue; }, @@ -54,14 +54,14 @@ this.XPathGenerator = { /** * Namespace resolver for the above XPath resolver */ - resolveNS: function sss_xph_resolveNS(aPrefix) { + resolveNS: function (aPrefix) { return XPathGenerator.namespaceURIs[aPrefix] || null; }, /** * @returns valid XPath for the given node (usually just the local name itself) */ - escapeName: function sss_xph_escapeName(aName) { + escapeName: function (aName) { // we can't just use the node's local name, if it contains // special characters (cf. bug 485482) return /^\w+$/.test(aName) ? aName : @@ -71,7 +71,7 @@ this.XPathGenerator = { /** * @returns a properly quoted string to insert into an XPath query */ - quoteArgument: function sss_xph_quoteArgument(aArg) { + quoteArgument: function (aArg) { return !/'/.test(aArg) ? "'" + aArg + "'" : !/"/.test(aArg) ? '"' + aArg + '"' : "concat('" + aArg.replace(/'+/g, "',\"$&\",'") + "')"; diff --git a/application/palemoon/components/sessionstore/_SessionFile.jsm b/application/palemoon/components/sessionstore/_SessionFile.jsm index 62b4d1687..52c0b526e 100644 --- a/application/palemoon/components/sessionstore/_SessionFile.jsm +++ b/application/palemoon/components/sessionstore/_SessionFile.jsm @@ -57,37 +57,37 @@ this._SessionFile = { * A promise fulfilled once initialization (either synchronous or * asynchronous) is complete. */ - promiseInitialized: function SessionFile_initialized() { + promiseInitialized: function () { return SessionFileInternal.promiseInitialized; }, /** * Read the contents of the session file, asynchronously. */ - read: function SessionFile_read() { + read: function () { return SessionFileInternal.read(); }, /** * Read the contents of the session file, synchronously. */ - syncRead: function SessionFile_syncRead() { + syncRead: function () { return SessionFileInternal.syncRead(); }, /** * Write the contents of the session file, asynchronously. */ - write: function SessionFile_write(aData) { + write: function (aData) { return SessionFileInternal.write(aData); }, /** * Create a backup copy, asynchronously. */ - createBackupCopy: function SessionFile_createBackupCopy() { + createBackupCopy: function () { return SessionFileInternal.createBackupCopy(); }, /** * Wipe the contents of the session file, asynchronously. */ - wipe: function SessionFile_wipe() { + wipe: function () { return SessionFileInternal.wipe(); } }; @@ -105,7 +105,7 @@ const TaskUtils = { * @return {Promise} A promise behaving as |promise|, but with additional * logging in case of uncaught error. */ - captureErrors: function captureErrors(promise) { + captureErrors: function (promise) { return promise.then( null, function onError(reason) { @@ -152,7 +152,7 @@ var SessionFileInternal = { * A path to read the file from. * @returns string if successful, undefined otherwise. */ - readAuxSync: function ssfi_readAuxSync(aPath) { + readAuxSync: function (aPath) { let text; try { let file = new FileUtils.File(aPath); @@ -184,7 +184,7 @@ var SessionFileInternal = { * happened between backup and write), attempt to read the sessionstore.bak * instead. */ - syncRead: function ssfi_syncRead() { + syncRead: function () { // First read the sessionstore.js. let text = this.readAuxSync(this.path); if (typeof text === "undefined") { @@ -204,7 +204,7 @@ var SessionFileInternal = { * incrementally updated by the worker process. * @returns string if successful, undefined otherwise. */ - readAux: function ssfi_readAux(aPath, aReadOptions) { + readAux: function (aPath, aReadOptions) { let self = this; return TaskUtils.spawn(function () { let text; @@ -228,7 +228,7 @@ var SessionFileInternal = { * happened between backup and write), attempt to read the sessionstore.bak * instead. */ - read: function ssfi_read() { + read: function () { let self = this; return TaskUtils.spawn(function task() { // Specify |outExecutionDuration| option to hold the combined duration of @@ -253,7 +253,7 @@ var SessionFileInternal = { }); }, - write: function ssfi_write(aData) { + write: function (aData) { let refObj = {}; let self = this; return TaskUtils.spawn(function task() { @@ -268,7 +268,7 @@ var SessionFileInternal = { }); }, - createBackupCopy: function ssfi_createBackupCopy() { + createBackupCopy: function () { let backupCopyOptions = { outExecutionDuration: null }; @@ -285,7 +285,7 @@ var SessionFileInternal = { }); }, - wipe: function ssfi_wipe() { + wipe: function () { let self = this; return TaskUtils.spawn(function task() { try { @@ -308,7 +308,7 @@ var SessionFileInternal = { }); }, - _isNoSuchFile: function ssfi_isNoSuchFile(aReason) { + _isNoSuchFile: function (aReason) { return aReason instanceof OS.File.Error && aReason.becauseNoSuchFile; } }; diff --git a/application/palemoon/components/sessionstore/nsSessionStartup.js b/application/palemoon/components/sessionstore/nsSessionStartup.js index 04037c10e..0c9051e00 100644 --- a/application/palemoon/components/sessionstore/nsSessionStartup.js +++ b/application/palemoon/components/sessionstore/nsSessionStartup.js @@ -69,7 +69,7 @@ SessionStartup.prototype = { /** * Initialize the component */ - init: function sss_init() { + init: function () { // do not need to initialize anything in auto-started private browsing sessions if (PrivateBrowsingUtils.permanentPrivateBrowsing) { this._initialized = true; @@ -88,14 +88,14 @@ SessionStartup.prototype = { }, // Wrap a string as a nsISupports - _createSupportsString: function ssfi_createSupportsString(aData) { + _createSupportsString: function (aData) { let string = Cc["@mozilla.org/supports-string;1"] .createInstance(Ci.nsISupportsString); string.data = aData; return string; }, - _onSessionFileRead: function sss_onSessionFileRead(aStateString) { + _onSessionFileRead: function (aStateString) { if (this._initialized) { // Initialization is complete, nothing else to do return; @@ -174,7 +174,7 @@ SessionStartup.prototype = { /** * Handle notifications */ - observe: function sss_observe(aSubject, aTopic, aData) { + observe: function (aSubject, aTopic, aData) { switch (aTopic) { case "app-startup": Services.obs.addObserver(this, "final-ui-startup", true); @@ -225,7 +225,7 @@ SessionStartup.prototype = { * session file synchronously. * @returns bool */ - doRestore: function sss_doRestore() { + doRestore: function () { this._ensureInitialized(); return this._willRestore(); }, @@ -272,7 +272,7 @@ SessionStartup.prototype = { // Ensure that initialization is complete. // If initialization is not complete yet, fall back to a synchronous // initialization and kill ongoing asynchronous initialization - _ensureInitialized: function sss__ensureInitialized() { + _ensureInitialized: function () { try { if (this._initialized) { // Initialization is complete, nothing else to do diff --git a/application/palemoon/components/shell/nsSetDefaultBrowser.js b/application/palemoon/components/shell/nsSetDefaultBrowser.js index c7a78c538..4c6e1a003 100644 --- a/application/palemoon/components/shell/nsSetDefaultBrowser.js +++ b/application/palemoon/components/shell/nsSetDefaultBrowser.js @@ -15,7 +15,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); function nsSetDefaultBrowser() {} nsSetDefaultBrowser.prototype = { - handle: function nsSetDefault_handle(aCmdline) { + handle: function (aCmdline) { if (aCmdline.handleFlag("setDefaultBrowser", false)) { ShellService.setDefaultBrowser(true, true); } diff --git a/application/palemoon/components/sync/addDevice.js b/application/palemoon/components/sync/addDevice.js index 0390d4397..edc36c7b9 100644 --- a/application/palemoon/components/sync/addDevice.js +++ b/application/palemoon/components/sync/addDevice.js @@ -17,7 +17,7 @@ const DEVICE_CONNECTED_PAGE = 2; var gSyncAddDevice = { - init: function init() { + init: function () { this.pin1.setAttribute("maxlength", PIN_PART_LENGTH); this.pin2.setAttribute("maxlength", PIN_PART_LENGTH); this.pin3.setAttribute("maxlength", PIN_PART_LENGTH); @@ -34,7 +34,7 @@ var gSyncAddDevice = { Weave.Service.scheduler.scheduleNextSync(0); }, - onPageShow: function onPageShow() { + onPageShow: function () { this.wizard.getButton("back").hidden = true; switch (this.wizard.pageIndex) { @@ -60,7 +60,7 @@ var gSyncAddDevice = { } }, - onWizardAdvance: function onWizardAdvance() { + onWizardAdvance: function () { switch (this.wizard.pageIndex) { case ADD_DEVICE_PAGE: this.startTransfer(); @@ -72,21 +72,21 @@ var gSyncAddDevice = { return true; }, - startTransfer: function startTransfer() { + startTransfer: function () { this.errorRow.hidden = true; // When onAbort is called, Weave may already be gone. const JPAKE_ERROR_USERABORT = Weave.JPAKE_ERROR_USERABORT; let self = this; let jpakeclient = this._jpakeclient = new Weave.JPAKEClient({ - onPaired: function onPaired() { + onPaired: function () { let credentials = {account: Weave.Service.identity.account, password: Weave.Service.identity.basicPassword, synckey: Weave.Service.identity.syncKey, serverURL: Weave.Service.serverURL}; jpakeclient.sendAndComplete(credentials); }, - onComplete: function onComplete() { + onComplete: function () { delete self._jpakeclient; self.wizard.pageIndex = DEVICE_CONNECTED_PAGE; @@ -94,7 +94,7 @@ var gSyncAddDevice = { // device with which we just paired. Weave.Service.scheduler.scheduleNextSync(Weave.Service.scheduler.activeInterval); }, - onAbort: function onAbort(error) { + onAbort: function (error) { delete self._jpakeclient; // Aborted by user, ignore. @@ -118,7 +118,7 @@ var gSyncAddDevice = { jpakeclient.pairWithPIN(pin, expectDelay); }, - onWizardBack: function onWizardBack() { + onWizardBack: function () { if (this.wizard.pageIndex != SYNC_KEY_PAGE) return true; @@ -126,7 +126,7 @@ var gSyncAddDevice = { return false; }, - onWizardCancel: function onWizardCancel() { + onWizardCancel: function () { if (this._jpakeclient) { this._jpakeclient.abort(); delete this._jpakeclient; @@ -134,7 +134,7 @@ var gSyncAddDevice = { return true; }, - onTextBoxInput: function onTextBoxInput(textbox) { + onTextBoxInput: function (textbox) { if (textbox && textbox.value.length == PIN_PART_LENGTH) this.nextFocusEl[textbox.id].focus(); @@ -143,7 +143,7 @@ var gSyncAddDevice = { && this.pin3.value.length == PIN_PART_LENGTH); }, - goToSyncKeyPage: function goToSyncKeyPage() { + goToSyncKeyPage: function () { this.wizard.pageIndex = SYNC_KEY_PAGE; } diff --git a/application/palemoon/components/sync/genericChange.js b/application/palemoon/components/sync/genericChange.js index df6639178..776fbf5d6 100644 --- a/application/palemoon/components/sync/genericChange.js +++ b/application/palemoon/components/sync/genericChange.js @@ -29,7 +29,7 @@ var Change = { return this._dialogType == "UpdatePassphrase"; }, - onLoad: function Change_onLoad() { + onLoad: function () { /* Load labels */ let introText = document.getElementById("introText"); let introText2 = document.getElementById("introText2"); @@ -112,16 +112,16 @@ var Change = { .setAttribute("label", document.title); }, - _clearStatus: function _clearStatus() { + _clearStatus: function () { this._status.value = ""; this._statusIcon.removeAttribute("status"); }, - _updateStatus: function Change__updateStatus(str, state) { + _updateStatus: function (str, state) { this._updateStatusWithString(this._str(str), state); }, - _updateStatusWithString: function Change__updateStatusWithString(string, state) { + _updateStatusWithString: function (string, state) { this._statusRow.hidden = false; this._status.value = string; this._statusIcon.setAttribute("status", state); @@ -154,7 +154,7 @@ var Change = { this._dialog.getButton("finish").disabled = false; }, - doChangePassphrase: function Change_doChangePassphrase() { + doChangePassphrase: function () { let pp = Weave.Utils.normalizePassphrase(this._passphraseBox.value); if (this._updatingPassphrase) { Weave.Service.identity.syncKey = pp; @@ -179,7 +179,7 @@ var Change = { return false; }, - doChangePassword: function Change_doChangePassword() { + doChangePassword: function () { if (this._currentPasswordInvalid) { Weave.Service.identity.basicPassword = this._firstBox.value; if (Weave.Service.login()) { @@ -228,7 +228,7 @@ var Change = { this._dialog.getButton("finish").disabled = !valid; }, - _str: function Change__string(str) { + _str: function (str) { return this._stringBundle.GetStringFromName(str); } }; diff --git a/application/palemoon/components/sync/quota.js b/application/palemoon/components/sync/quota.js index b416a44cc..4733f9fb4 100644 --- a/application/palemoon/components/sync/quota.js +++ b/application/palemoon/components/sync/quota.js @@ -12,7 +12,7 @@ Cu.import("resource://gre/modules/DownloadUtils.jsm"); var gSyncQuota = { - init: function init() { + init: function () { this.bundle = document.getElementById("quotaStrings"); let caption = document.getElementById("treeCaption"); caption.firstChild.nodeValue = this.bundle.getString("quota.treeCaption.label"); @@ -24,7 +24,7 @@ var gSyncQuota = { this.loadData(); }, - loadData: function loadData() { + loadData: function () { this._usage_req = Weave.Service.getStorageInfo(Weave.INFO_COLLECTION_USAGE, function (error, usage) { delete gSyncQuota._usage_req; @@ -57,7 +57,7 @@ var gSyncQuota = { }); }, - onCancel: function onCancel() { + onCancel: function () { if (this._usage_req) { this._usage_req.abort(); } @@ -67,7 +67,7 @@ var gSyncQuota = { return true; }, - onAccept: function onAccept() { + onAccept: function () { let engines = gUsageTreeView.getEnginesToDisable(); for each (let engine in engines) { Weave.Service.engineManager.get(engine).enabled = false; @@ -80,7 +80,7 @@ var gSyncQuota = { return this.onCancel(); }, - convertKB: function convertKB(value) { + convertKB: function (value) { return DownloadUtils.convertByteUnits(value * 1024); } @@ -98,7 +98,7 @@ var gUsageTreeView = { _collections: [], _byname: {}, - init: function init() { + init: function () { let retrievingLabel = gSyncQuota.bundle.getString("quota.retrieving.label"); for each (let engine in Weave.Service.engineManager.getEnabled()) { if (this._ignored[engine.name]) @@ -122,7 +122,7 @@ var gUsageTreeView = { } }, - _collectionTitle: function _collectionTitle(engine) { + _collectionTitle: function (engine) { try { return gSyncQuota.bundle.getString( "collection." + engine.prefName + ".label"); @@ -134,7 +134,7 @@ var gUsageTreeView = { /* * Process the quota information as returned by info/collection_usage. */ - displayUsageData: function displayUsageData(data) { + displayUsageData: function (data) { for each (let coll in this._collections) { coll.size = 0; // If we couldn't retrieve any data, just blank out the label. @@ -157,7 +157,7 @@ var gUsageTreeView = { /* * Handle click events on the tree. */ - onTreeClick: function onTreeClick(event) { + onTreeClick: function (event) { if (event.button == 2) return; @@ -169,7 +169,7 @@ var gUsageTreeView = { /* * Toggle enabled state of an engine. */ - toggle: function toggle(row) { + toggle: function (row) { // Update the tree let collection = this._collections[row]; collection.enabled = !collection.enabled; @@ -180,7 +180,7 @@ var gUsageTreeView = { * Return a list of engines (or rather their pref names) that should be * disabled. */ - getEnginesToDisable: function getEnginesToDisable() { + getEnginesToDisable: function () { // Tycho: return [coll.name for each (coll in this._collections) if (!coll.enabled)]; let engines = []; for each (let coll in this._collections) { @@ -216,7 +216,7 @@ var gUsageTreeView = { return this._collections[row].enabled; }, - getCellText: function getCellText(row, col) { + getCellText: function (row, col) { let collection = this._collections[row]; switch (col.id) { case "collection": @@ -228,7 +228,7 @@ var gUsageTreeView = { } }, - setTree: function setTree(tree) { + setTree: function (tree) { this.treeBox = tree; }, diff --git a/application/palemoon/components/sync/setup.js b/application/palemoon/components/sync/setup.js index e8d67a5f6..8bf0ecc34 100644 --- a/application/palemoon/components/sync/setup.js +++ b/application/palemoon/components/sync/setup.js @@ -138,7 +138,7 @@ var gSyncSetup = { } }, - resetPassphrase: function resetPassphrase() { + resetPassphrase: function () { // Apply the existing form fields so that // Weave.Service.changePassphrase() has the necessary credentials. Weave.Service.identity.account = document.getElementById("existingAccountName").value; @@ -595,7 +595,7 @@ var gSyncSetup = { return false; }, - startPairing: function startPairing() { + startPairing: function () { this.pairDeviceErrorRow.hidden = true; // When onAbort is called, Weave may already be gone. const JPAKE_ERROR_USERABORT = Weave.JPAKE_ERROR_USERABORT; @@ -605,11 +605,11 @@ var gSyncSetup = { onPaired: function onPaired() { self.wizard.pageIndex = INTRO_PAGE; }, - onComplete: function onComplete() { + onComplete: function () { // This method will never be called since SendCredentialsController // will take over after the wizard completes. }, - onAbort: function onAbort(error) { + onAbort: function (error) { delete self._jpakeclient; // Aborted by user, ignore. The window is almost certainly going to close @@ -636,7 +636,7 @@ var gSyncSetup = { jpakeclient.pairWithPIN(pin, expectDelay); }, - completePairing: function completePairing() { + completePairing: function () { if (!this._jpakeclient) { // The channel was aborted while we were setting up the account // locally. XXX TODO should we do anything here, e.g. tell @@ -660,15 +660,15 @@ var gSyncSetup = { let self = this; this._jpakeclient = new Weave.JPAKEClient({ - displayPIN: function displayPIN(pin) { + displayPIN: function (pin) { document.getElementById("easySetupPIN1").value = pin.slice(0, 4); document.getElementById("easySetupPIN2").value = pin.slice(4, 8); document.getElementById("easySetupPIN3").value = pin.slice(8); }, - onPairingStart: function onPairingStart() {}, + onPairingStart: function () {}, - onComplete: function onComplete(credentials) { + onComplete: function (credentials) { Weave.Service.identity.account = credentials.account; Weave.Service.identity.basicPassword = credentials.password; Weave.Service.identity.syncKey = credentials.synckey; @@ -676,7 +676,7 @@ var gSyncSetup = { gSyncSetup.wizardFinish(); }, - onAbort: function onAbort(error) { + onAbort: function (error) { delete self._jpakeclient; // Ignore if wizard is aborted. @@ -1017,7 +1017,7 @@ var gSyncSetup = { this._setFeedback(element, success, str); }, - loadCaptcha: function loadCaptcha() { + loadCaptcha: function () { let captchaURI = Weave.Service.miscAPI + "captcha_html"; // First check for NoScript and whitelist the right sites. this._handleNoScript(true); diff --git a/application/palemoon/components/sync/utils.js b/application/palemoon/components/sync/utils.js index d41ecf18a..f2735f42b 100644 --- a/application/palemoon/components/sync/utils.js +++ b/application/palemoon/components/sync/utils.js @@ -30,13 +30,13 @@ var gSyncUtils = { openUILinkIn(url, "tab"); }, - changeName: function changeName(input) { + changeName: function (input) { // Make sure to update to a modified name, e.g., empty-string -> default Weave.Service.clientsEngine.localName = input.value; input.value = Weave.Service.clientsEngine.localName; }, - openChange: function openChange(type, duringSetup) { + openChange: function (type, duringSetup) { // Just re-show the dialog if it's already open let openedDialog = Services.wm.getMostRecentWindow("Sync:" + type); if (openedDialog != null) { diff --git a/application/palemoon/modules/BrowserNewTabPreloader.jsm b/application/palemoon/modules/BrowserNewTabPreloader.jsm index 778698fba..30bc846ae 100644 --- a/application/palemoon/modules/BrowserNewTabPreloader.jsm +++ b/application/palemoon/modules/BrowserNewTabPreloader.jsm @@ -49,18 +49,18 @@ function clearTimer(timer) { } this.BrowserNewTabPreloader = { - init: function Preloader_init() { + init: function () { Initializer.start(); }, - uninit: function Preloader_uninit() { + uninit: function () { Initializer.stop(); HostFrame.destroy(); Preferences.uninit(); HiddenBrowsers.uninit(); }, - newTab: function Preloader_newTab(aTab) { + newTab: function (aTab) { let win = aTab.ownerDocument.defaultView; if (win.gBrowser) { let utils = win.QueryInterface(Ci.nsIInterfaceRequestor) @@ -83,12 +83,12 @@ var Initializer = { _timer: null, _observing: false, - start: function Initializer_start() { + start: function () { Services.obs.addObserver(this, TOPIC_DELAYED_STARTUP, false); this._observing = true; }, - stop: function Initializer_stop() { + stop: function () { this._timer = clearTimer(this._timer); if (this._observing) { @@ -97,7 +97,7 @@ var Initializer = { } }, - observe: function Initializer_observe(aSubject, aTopic, aData) { + observe: function (aSubject, aTopic, aData) { if (aTopic == TOPIC_DELAYED_STARTUP) { Services.obs.removeObserver(this, TOPIC_DELAYED_STARTUP); this._observing = false; @@ -108,11 +108,11 @@ var Initializer = { } }, - _startTimer: function Initializer_startTimer() { + _startTimer: function () { this._timer = createTimer(this, PRELOADER_INIT_DELAY_MS); }, - _startPreloader: function Initializer_startPreloader() { + _startPreloader: function () { Preferences.init(); if (Preferences.enabled) { HiddenBrowsers.init(); @@ -133,19 +133,19 @@ var Preferences = { return this._enabled; }, - init: function Preferences_init() { + init: function () { this._branch = Services.prefs.getBranch(PREF_BRANCH); this._branch.addObserver("", this, false); }, - uninit: function Preferences_uninit() { + uninit: function () { if (this._branch) { this._branch.removeObserver("", this); this._branch = null; } }, - observe: function Preferences_observe() { + observe: function () { let prevEnabled = this._enabled; this._enabled = null; diff --git a/application/palemoon/modules/NetworkPrioritizer.jsm b/application/palemoon/modules/NetworkPrioritizer.jsm index 23d688a30..698775ef0 100644 --- a/application/palemoon/modules/NetworkPrioritizer.jsm +++ b/application/palemoon/modules/NetworkPrioritizer.jsm @@ -65,13 +65,13 @@ function _handleEvent(aEvent) { // Methods that impact a browser. Put into single object for organization. var BrowserHelper = { - onOpen: function NP_BH_onOpen(aBrowser) { + onOpen: function (aBrowser) { // If the tab is in the focused window, leave priority as it is if (aBrowser.ownerDocument.defaultView != _lastFocusedWindow) this.decreasePriority(aBrowser); }, - onSelect: function NP_BH_onSelect(aBrowser) { + onSelect: function (aBrowser) { let windowEntry = WindowHelper.getEntry(aBrowser.ownerDocument.defaultView); if (windowEntry.lastSelectedBrowser) this.decreasePriority(windowEntry.lastSelectedBrowser); @@ -80,11 +80,11 @@ var BrowserHelper = { windowEntry.lastSelectedBrowser = aBrowser; }, - increasePriority: function NP_BH_increasePriority(aBrowser) { + increasePriority: function (aBrowser) { aBrowser.adjustPriority(PRIORITY_DELTA); }, - decreasePriority: function NP_BH_decreasePriority(aBrowser) { + decreasePriority: function (aBrowser) { aBrowser.adjustPriority(PRIORITY_DELTA * -1); } }; @@ -92,7 +92,7 @@ var BrowserHelper = { // Methods that impact a window. Put into single object for organization. var WindowHelper = { - addWindow: function NP_WH_addWindow(aWindow) { + addWindow: function (aWindow) { // Build internal data object _windows.push({ window: aWindow, lastSelectedBrowser: null }); @@ -115,7 +115,7 @@ var WindowHelper = { BrowserHelper.onSelect(aWindow.gBrowser.selectedBrowser); }, - removeWindow: function NP_WH_removeWindow(aWindow) { + removeWindow: function (aWindow) { if (aWindow == _lastFocusedWindow) _lastFocusedWindow = null; @@ -131,7 +131,7 @@ var WindowHelper = { }); }, - onActivate: function NP_WH_onActivate(aWindow, aHasFocus) { + onActivate: function (aWindow, aHasFocus) { // If this window was the last focused window, we don't need to do anything if (aWindow == _lastFocusedWindow) return; @@ -143,7 +143,7 @@ var WindowHelper = { this.increasePriority(aWindow); }, - handleFocusedWindow: function NP_WH_handleFocusedWindow(aWindow) { + handleFocusedWindow: function (aWindow) { // If we have a last focused window, we need to deprioritize it first if (_lastFocusedWindow) this.decreasePriority(_lastFocusedWindow); @@ -153,23 +153,23 @@ var WindowHelper = { }, // Auxiliary methods - increasePriority: function NP_WH_increasePriority(aWindow) { + increasePriority: function (aWindow) { aWindow.gBrowser.browsers.forEach(function(aBrowser) { BrowserHelper.increasePriority(aBrowser); }); }, - decreasePriority: function NP_WH_decreasePriority(aWindow) { + decreasePriority: function (aWindow) { aWindow.gBrowser.browsers.forEach(function(aBrowser) { BrowserHelper.decreasePriority(aBrowser); }); }, - getEntry: function NP_WH_getEntry(aWindow) { + getEntry: function (aWindow) { return _windows[this.getEntryIndex(aWindow)]; }, - getEntryIndex: function NP_WH_getEntryAtIndex(aWindow) { + getEntryIndex: function (aWindow) { // Assumes that every object has a unique window & it's in the array for (let i = 0; i < _windows.length; i++) if (_windows[i].window == aWindow) diff --git a/application/palemoon/modules/PopupNotifications.jsm b/application/palemoon/modules/PopupNotifications.jsm index 0cb970230..953df8cb2 100644 --- a/application/palemoon/modules/PopupNotifications.jsm +++ b/application/palemoon/modules/PopupNotifications.jsm @@ -78,7 +78,7 @@ Notification.prototype = { /** * Removes the notification and updates the popup accordingly if needed. */ - remove: function Notification_remove() { + remove: function () { this.owner.remove(this); }, @@ -178,7 +178,7 @@ PopupNotifications.prototype = { * @returns the corresponding Notification object, or null if no such * notification exists. */ - getNotification: function PopupNotifications_getNotification(id, browser) { + getNotification: function (id, browser) { let n = null; let notifications = this._getNotificationsForBrowser(browser || this.tabbrowser.selectedBrowser); notifications.some(function(x) x.id == id && (n = x)); @@ -292,7 +292,7 @@ PopupNotifications.prototype = { * opens the URL in a new tab. * @returns the Notification object corresponding to the added notification. */ - show: function PopupNotifications_show(browser, id, message, anchorID, + show: function (browser, id, message, anchorID, mainAction, secondaryActions, options) { function isInvalidAction(a) { return !a || !(typeof(a.callback) == "function") || !a.label || !a.accessKey; @@ -362,7 +362,7 @@ PopupNotifications.prototype = { * Called by the consumer to indicate that a browser's location has changed, * so that we can update the active notifications accordingly. */ - locationChange: function PopupNotifications_locationChange(aBrowser) { + locationChange: function (aBrowser) { if (!aBrowser) throw "PopupNotifications_locationChange: invalid browser"; @@ -415,7 +415,7 @@ PopupNotifications.prototype = { * @param notification * The Notification object to remove. */ - remove: function PopupNotifications_remove(notification) { + remove: function (notification) { this._remove(notification); if (notification.browser.docShell.isActive) { @@ -459,7 +459,7 @@ PopupNotifications.prototype = { return this.tabbrowser.selectedBrowser ? this._getNotificationsForBrowser(this.tabbrowser.selectedBrowser) : []; }, - _remove: function PopupNotifications_removeHelper(notification) { + _remove: function (notification) { // This notification may already be removed, in which case let's just fail // silently. let notifications = this._getNotificationsForBrowser(notification.browser); @@ -481,7 +481,7 @@ PopupNotifications.prototype = { /** * Dismisses the notification without removing it. */ - _dismiss: function PopupNotifications_dismiss() { + _dismiss: function () { let browser = this.panel.firstChild && this.panel.firstChild.notification.browser; if (typeof this.panel.hidePopup === "function") { @@ -494,7 +494,7 @@ PopupNotifications.prototype = { /** * Hides the notification popup. */ - _hidePanel: function PopupNotifications_hide() { + _hidePanel: function () { this._ignoreDismissal = true; if (typeof this.panel.hidePopup === "function") { this.panel.hidePopup(); @@ -536,7 +536,7 @@ PopupNotifications.prototype = { } }, - _refreshPanel: function PopupNotifications_refreshPanel(notificationsToShow) { + _refreshPanel: function (notificationsToShow) { this._clearPanel(); const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; @@ -653,7 +653,7 @@ PopupNotifications.prototype = { } }, - _showPanel: function PopupNotifications_showPanel(notificationsToShow, anchorElement) { + _showPanel: function (notificationsToShow, anchorElement) { this.panel.hidden = false; notificationsToShow.forEach(function (n) { @@ -709,7 +709,7 @@ PopupNotifications.prototype = { * if there are no notifications to show. Otherwise, * currently displayed notifications will be left alone. */ - _update: function PopupNotifications_update(notifications, anchor, dismissShowing = false) { + _update: function (notifications, anchor, dismissShowing = false) { let useIconBox = this.iconBox && (!anchor || anchor.parentNode == this.iconBox); if (useIconBox) { // hide icons of the previous tab. @@ -777,7 +777,7 @@ PopupNotifications.prototype = { } }, - _showIcons: function PopupNotifications_showIcons(aCurrentNotifications) { + _showIcons: function (aCurrentNotifications) { for (let notification of aCurrentNotifications) { let anchorElm = notification.anchorElement; if (anchorElm) { @@ -786,7 +786,7 @@ PopupNotifications.prototype = { } }, - _hideIcons: function PopupNotifications_hideIcons() { + _hideIcons: function () { let icons = this.iconBox.querySelectorAll(ICON_SELECTOR); for (let icon of icons) { icon.removeAttribute(ICON_ATTRIBUTE_SHOWING); @@ -796,7 +796,7 @@ PopupNotifications.prototype = { /** * Gets and sets notifications for the browser. */ - _getNotificationsForBrowser: function PopupNotifications_getNotifications(browser) { + _getNotificationsForBrowser: function (browser) { let notifications = popupNotificationsMap.get(browser); if (!notifications) { // Initialize the WeakMap for the browser so callers can reference/manipulate the array. @@ -805,12 +805,12 @@ PopupNotifications.prototype = { } return notifications; }, - _setNotificationsForBrowser: function PopupNotifications_setNotifications(browser, notifications) { + _setNotificationsForBrowser: function (browser, notifications) { popupNotificationsMap.set(browser, notifications); return notifications; }, - _onIconBoxCommand: function PopupNotifications_onIconBoxCommand(event) { + _onIconBoxCommand: function (event) { // Left click, space or enter only let type = event.type; if (type == "click" && event.button != 0) @@ -832,7 +832,7 @@ PopupNotifications.prototype = { this._reshowNotifications(anchor); }, - _reshowNotifications: function PopupNotifications_reshowNotifications(anchor, browser) { + _reshowNotifications: function (anchor, browser) { // Mark notifications anchored to this anchor as un-dismissed let notifications = this._getNotificationsForBrowser(browser || this.tabbrowser.selectedBrowser); notifications.forEach(function (n) { @@ -844,7 +844,7 @@ PopupNotifications.prototype = { this._update(notifications, anchor); }, - _swapBrowserNotifications: function PopupNotifications_swapBrowserNoficications(ourBrowser, otherBrowser) { + _swapBrowserNotifications: function (ourBrowser, otherBrowser) { // When swaping browser docshells (e.g. dragging tab to new window) we need // to update our notification map. @@ -890,7 +890,7 @@ PopupNotifications.prototype = { other._update(ourNotifications, ourNotifications[0].anchorElement); }, - _fireCallback: function PopupNotifications_fireCallback(n, event, ...args) { + _fireCallback: function (n, event, ...args) { try { if (n.options.eventCallback) return n.options.eventCallback.call(n, event, ...args); @@ -900,7 +900,7 @@ PopupNotifications.prototype = { return undefined; }, - _onPopupHidden: function PopupNotifications_onPopupHidden(event) { + _onPopupHidden: function (event) { if (event.target != this.panel || this._ignoreDismissal) return; @@ -932,7 +932,7 @@ PopupNotifications.prototype = { this._update(); }, - _onButtonCommand: function PopupNotifications_onButtonCommand(event) { + _onButtonCommand: function (event) { let notificationEl = getNotificationFromElement(event.originalTarget); if (!notificationEl) @@ -968,7 +968,7 @@ PopupNotifications.prototype = { this._update(); }, - _onMenuCommand: function PopupNotifications_onMenuCommand(event) { + _onMenuCommand: function (event) { let target = event.originalTarget; if (!target.action || !target.notification) throw "menucommand target has no associated action/notification"; @@ -988,7 +988,7 @@ PopupNotifications.prototype = { this._update(); }, - _notify: function PopupNotifications_notify(topic) { + _notify: function (topic) { Services.obs.notifyObservers(null, "PopupNotifications-" + topic, ""); }, }; diff --git a/application/palemoon/modules/RecentWindow.jsm b/application/palemoon/modules/RecentWindow.jsm index 0018b502c..242e9f924 100644 --- a/application/palemoon/modules/RecentWindow.jsm +++ b/application/palemoon/modules/RecentWindow.jsm @@ -25,7 +25,7 @@ this.RecentWindow = { * Omit the property to search in both groups. * * allowPopups: true if popup windows are permissable. */ - getMostRecentBrowserWindow: function RW_getMostRecentBrowserWindow(aOptions) { + getMostRecentBrowserWindow: function (aOptions) { let checkPrivacy = typeof aOptions == "object" && "private" in aOptions; diff --git a/application/palemoon/modules/WindowsJumpLists.jsm b/application/palemoon/modules/WindowsJumpLists.jsm index e7f785519..6827e269a 100644 --- a/application/palemoon/modules/WindowsJumpLists.jsm +++ b/application/palemoon/modules/WindowsJumpLists.jsm @@ -148,7 +148,7 @@ this.WinTaskbarJumpList = * Startup, shutdown, and update */ - startup: function WTBJL_startup() { + startup: function () { // exit if this isn't win7 or higher. if (!this._initTaskbar()) return; @@ -175,7 +175,7 @@ this.WinTaskbarJumpList = this._updateTimer(); }, - update: function WTBJL_update() { + update: function () { // are we disabled via prefs? don't do anything! if (!this._enabled) return; @@ -184,7 +184,7 @@ this.WinTaskbarJumpList = this._buildList(); }, - _shutdown: function WTBJL__shutdown() { + _shutdown: function () { this._shuttingDown = true; // Correctly handle a clear history on shutdown. If there are no @@ -197,7 +197,7 @@ this.WinTaskbarJumpList = this._free(); }, - _shortcutMaintenance: function WTBJL__maintenace() { + _shortcutMaintenance: function () { _winShellService.shortcutMaintenance(); }, @@ -212,11 +212,11 @@ this.WinTaskbarJumpList = */ _pendingStatements: {}, - _hasPendingStatements: function WTBJL__hasPendingStatements() { + _hasPendingStatements: function () { return Object.keys(this._pendingStatements).length > 0; }, - _buildList: function WTBJL__buildList() { + _buildList: function () { if (this._hasPendingStatements()) { // We were requested to update the list while another update was in // progress, this could happen at shutdown, idle or privatebrowsing. @@ -255,7 +255,7 @@ this.WinTaskbarJumpList = * Taskbar api wrappers */ - _startBuild: function WTBJL__startBuild() { + _startBuild: function () { var removedItems = Cc["@mozilla.org/array;1"]. createInstance(Ci.nsIMutableArray); this._builder.abortListBuild(); @@ -267,13 +267,13 @@ this.WinTaskbarJumpList = return false; }, - _commitBuild: function WTBJL__commitBuild() { + _commitBuild: function () { if (!this._hasPendingStatements() && !this._builder.commitListBuild()) { this._builder.abortListBuild(); } }, - _buildTasks: function WTBJL__buildTasks() { + _buildTasks: function () { var items = Cc["@mozilla.org/array;1"]. createInstance(Ci.nsIMutableArray); this._tasks.forEach(function (task) { @@ -288,12 +288,12 @@ this.WinTaskbarJumpList = this._builder.addListToBuild(this._builder.JUMPLIST_CATEGORY_TASKS, items); }, - _buildCustom: function WTBJL__buildCustom(title, items) { + _buildCustom: function (title, items) { if (items.length > 0) this._builder.addListToBuild(this._builder.JUMPLIST_CATEGORY_CUSTOMLIST, items, title); }, - _buildFrequent: function WTBJL__buildFrequent() { + _buildFrequent: function () { // If history is empty, just bail out. if (!PlacesUtils.history.hasHistoryEntries) { return; @@ -333,7 +333,7 @@ this.WinTaskbarJumpList = ); }, - _buildRecent: function WTBJL__buildRecent() { + _buildRecent: function () { // If history is empty, just bail out. if (!PlacesUtils.history.hasHistoryEntries) { return; @@ -378,7 +378,7 @@ this.WinTaskbarJumpList = ); }, - _deleteActiveJumpList: function WTBJL__deleteAJL() { + _deleteActiveJumpList: function () { this._builder.deleteActiveList(); }, @@ -386,7 +386,7 @@ this.WinTaskbarJumpList = * Jump list item creation helpers */ - _getHandlerAppItem: function WTBJL__getHandlerAppItem(name, description, + _getHandlerAppItem: function (name, description, args, iconIndex, faviconPageUri) { var file = Services.dirsvc.get("XREExeF", Ci.nsILocalFile); @@ -408,7 +408,7 @@ this.WinTaskbarJumpList = return item; }, - _getSeparatorItem: function WTBJL__getSeparatorItem() { + _getSeparatorItem: function () { var item = Cc["@mozilla.org/windows-jumplistseparator;1"]. createInstance(Ci.nsIJumpListSeparator); return item; @@ -419,7 +419,7 @@ this.WinTaskbarJumpList = */ _getHistoryResults: - function WTBLJL__getHistoryResults(aSortingMode, aLimit, aCallback, aScope) { + function (aSortingMode, aLimit, aCallback, aScope) { var options = PlacesUtils.history.getNewQueryOptions(); options.maxResults = aLimit; options.sortingMode = aSortingMode; @@ -448,7 +448,7 @@ this.WinTaskbarJumpList = }); }, - _clearHistory: function WTBJL__clearHistory(items) { + _clearHistory: function (items) { if (!items) return; var URIsToRemove = []; @@ -471,7 +471,7 @@ this.WinTaskbarJumpList = * Prefs utilities */ - _refreshPrefs: function WTBJL__refreshPrefs() { + _refreshPrefs: function () { this._enabled = _prefs.getBoolPref(PREF_TASKBAR_ENABLED); this._showFrequent = _prefs.getBoolPref(PREF_TASKBAR_FREQUENT); this._showRecent = _prefs.getBoolPref(PREF_TASKBAR_RECENT); @@ -483,7 +483,7 @@ this.WinTaskbarJumpList = * Init and shutdown utilities */ - _initTaskbar: function WTBJL__initTaskbar() { + _initTaskbar: function () { this._builder = _taskbarService.createJumpListBuilder(); if (!this._builder || !this._builder.available) return false; @@ -491,7 +491,7 @@ this.WinTaskbarJumpList = return true; }, - _initObs: function WTBJL__initObs() { + _initObs: function () { // If the browser is closed while in private browsing mode, the "exit" // notification is fired on quit-application-granted. // History cleanup can happen at profile-change-teardown. @@ -500,13 +500,13 @@ this.WinTaskbarJumpList = _prefs.addObserver("", this, false); }, - _freeObs: function WTBJL__freeObs() { + _freeObs: function () { Services.obs.removeObserver(this, "profile-before-change"); Services.obs.removeObserver(this, "browser:purge-session-history"); _prefs.removeObserver("", this); }, - _updateTimer: function WTBJL__updateTimer() { + _updateTimer: function () { if (this._enabled && !this._shuttingDown && !this._timer) { this._timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer); this._timer.initWithCallback(this, @@ -520,7 +520,7 @@ this.WinTaskbarJumpList = }, _hasIdleObserver: false, - _updateIdleObserver: function WTBJL__updateIdleObserver() { + _updateIdleObserver: function () { if (this._enabled && !this._shuttingDown && !this._hasIdleObserver) { _idle.addIdleObserver(this, IDLE_TIMEOUT_SECONDS); this._hasIdleObserver = true; @@ -531,7 +531,7 @@ this.WinTaskbarJumpList = } }, - _free: function WTBJL__free() { + _free: function () { this._freeObs(); this._updateTimer(); this._updateIdleObserver(); @@ -542,13 +542,13 @@ this.WinTaskbarJumpList = * Notification handlers */ - notify: function WTBJL_notify(aTimer) { + notify: function (aTimer) { // Add idle observer on the first notification so it doesn't hit startup. this._updateIdleObserver(); this.update(); }, - observe: function WTBJL_observe(aSubject, aTopic, aData) { + observe: function (aSubject, aTopic, aData) { switch (aTopic) { case "nsPref:changed": if (this._enabled == true && !_prefs.getBoolPref(PREF_TASKBAR_ENABLED)) diff --git a/application/palemoon/modules/openLocationLastURL.jsm b/application/palemoon/modules/openLocationLastURL.jsm index 3f58db8ce..ad2781c46 100644 --- a/application/palemoon/modules/openLocationLastURL.jsm +++ b/application/palemoon/modules/openLocationLastURL.jsm @@ -46,7 +46,7 @@ this.OpenLocationLastURL = function OpenLocationLastURL(aWindow) { } OpenLocationLastURL.prototype = { - isPrivate: function OpenLocationLastURL_isPrivate() { + isPrivate: function () { // Assume not in private browsing mode, unless the browser window is // in private mode. if (!this.window)