diff options
| -rw-r--r-- | application/palemoon/app/profile/palemoon.js | 162 | ||||
| -rw-r--r-- | application/palemoon/branding/shared/pref/preferences.inc | 42 | ||||
| -rw-r--r-- | application/palemoon/config/version.txt | 2 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/memory.properties | 10 | ||||
| -rw-r--r-- | toolkit/components/narrate/NarrateControls.jsm | 23 | ||||
| -rw-r--r-- | toolkit/components/reader/AboutReader.jsm | 31 |
6 files changed, 102 insertions, 168 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js index 5a73e816f..22c4f8654 100644 --- a/application/palemoon/app/profile/palemoon.js +++ b/application/palemoon/app/profile/palemoon.js @@ -37,15 +37,20 @@ pref("extensions.strictCompatibility", false); // for it to be compatible by default. pref("extensions.minCompatibleAppVersion", "1.5"); -// Preferences for AMO integration -pref("extensions.getAddons.cache.enabled", true); -pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +// Preferences for APO integration +#define APO_AM_URL addons.palemoon.org/integration/addon-manager +#define APO_AUS_ARGS reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE% + +pref("extensions.getAddons.cache.enabled", false); +pref("extensions.getAddons.maxResults", 10); +pref("extensions.getAddons.get.url", "https://@APO_AM_URL@/internal/get?addonguid=%IDS%&os=%OS%&version=%VERSION%"); +pref("extensions.getAddons.getWithPerformance.url", "https://@APO_AM_URL@/internal/get?addonguid=%IDS%&os=%OS%&version=%VERSION%"); +pref("extensions.getAddons.search.browseURL", "https://@APO_AM_URL@/external/recommended"); +pref("extensions.getAddons.search.url", "https://@APO_AM_URL@/internal/search?q=%TERMS%&locale=%LOCALE%&os=%OS%&version=%VERSION%"); +pref("extensions.webservice.discoverURL", "http://@APO_AM_URL@/internal/discover/"); +pref("extensions.getAddons.recommended.url", "https://@APO_AM_URL@/internal/recommended?locale=%LOCALE%&os=%OS%"); +pref("extensions.getAddons.browseAddons", "https://addons.palemoon.org"); +pref("extensions.getAddons.recommended.browseURL", "https://@APO_AM_URL@/external/recommended"); // Blocklist preferences pref("extensions.blocklist.enabled", true); @@ -54,9 +59,9 @@ pref("extensions.blocklist.level.updated", false); // Controls what level the blocklist switches from warning about items to forcibly // blocking them. pref("extensions.blocklist.level", 2); -pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); -pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/"); -pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); +pref("extensions.blocklist.url", "http://blocklist.palemoon.org/%VERSION%/blocklist.xml"); +pref("extensions.blocklist.detailsURL", "https://blocklist.palemoon.org/about.shtml"); +pref("extensions.blocklist.itemURL", "http://blocklist.palemoon.org/info/?id=%blockID%"); pref("extensions.update.autoUpdateDefault", true); @@ -68,7 +73,7 @@ pref("extensions.autoDisableScopes", 15); pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); // Get More Tools link URL -pref("browser.getdevtools.url","https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/"); +pref("browser.getdevtools.url","https://@APO_AM_URL@/external/devtools"); // Feedback URL pref("browser.feedback.url", "https://forum.palemoon.org"); @@ -106,7 +111,7 @@ pref("app.update.backgroundMaxErrors", 10); // final certificate and all certificates the connection is redirected to before // the final certificate for the url specified in the |app.update.url| // preference must be built-in. -pref("app.update.cert.requireBuiltIn", true); +pref("app.update.cert.requireBuiltIn", false); // When |app.update.cert.checkAttributes| is true or not specified the // certificate attributes specified in the |app.update.certs.| preference branch @@ -142,7 +147,7 @@ pref("app.update.enabled", true); // This preference turns on app.update.mode and allows automatic download and // install to take place. We use a separate boolean toggle for this to make // the UI easier to construct. -pref("app.update.auto", true); +pref("app.update.auto", false); // See chart in nsUpdateService.js source for more details pref("app.update.mode", 1); @@ -155,7 +160,7 @@ pref("app.update.silent", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); // app.update.url.manual is in branding section // app.update.url.details is in branding section @@ -166,7 +171,7 @@ pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%B // app.update.promptWaitTime is in branding section // Show the Update Checking/Ready UI when the user was idle for x seconds -pref("app.update.idletime", 60); +pref("app.update.idletime", 180); // Whether or not we show a dialog box informing the user that the update was // successfully applied. This is off in Firefox by default since we show a @@ -189,8 +194,8 @@ pref("app.update.incompatible.mode", 0); // .. etc .. // pref("extensions.update.enabled", true); -pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); -pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +pref("extensions.update.url", "https://@APO_AM_URL@/internal/update?@APO_AUS_ARGS@"); +pref("extensions.update.background.url", "https://@APO_AM_URL@/internal/update?@APO_AUS_ARGS@"); pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day // Non-symmetric (not shared by extensions) extension-specific [update] preferences @@ -242,11 +247,7 @@ pref("general.useragent.complexOverride.moodle", false); // bug 797703 pref("browser.shell.checkDefaultBrowser", true); pref("browser.shell.shortcutFavicons",true); pref("browser.shell.mostRecentDateSetAsDefault", ""); -#ifdef RELEASE_OR_BETA pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", false); -#else -pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", true); -#endif pref("browser.shell.skipDefaultBrowserCheck", true); pref("browser.shell.defaultBrowserCheckCount", 0); pref("browser.defaultbrowser.notificationbar", false); @@ -312,7 +313,7 @@ pref("browser.urlbar.suggest.openpage", true); pref("browser.urlbar.suggest.history.onlyTyped", false); pref("browser.urlbar.formatting.enabled", true); -pref("browser.urlbar.trimURLs", true); +pref("browser.urlbar.trimURLs", false); // Display punycode in identity panel: // 0 = Display IDN name @@ -323,7 +324,7 @@ pref("browser.identity.display_punycode", 1); // Address bar RSS icon control, show by default pref("browser.urlbar.rss", true); -pref("browser.altClickSave", false); +pref("browser.altClickSave", true); // Enable logging downloads operations to the Error Console. pref("browser.download.debug", false); @@ -334,7 +335,8 @@ pref("browser.download.debug", false); // feedback from their action. pref("browser.download.saveLinkAsFilenameTimeout", 4000); -pref("browser.download.useDownloadDir", true); +// Do not use default download location as standard, but ask. +pref("browser.download.useDownloadDir", false); pref("browser.download.folderList", 1); pref("browser.download.manager.showAlertOnComplete", true); @@ -343,7 +345,7 @@ pref("browser.download.manager.retention", 2); pref("browser.download.manager.showWhenStarting", true); pref("browser.download.manager.closeWhenDone", false); pref("browser.download.manager.focusWhenStarting", false); -pref("browser.download.manager.flashCount", 2); +pref("browser.download.manager.flashCount", 10); pref("browser.download.manager.addToRecentDocs", true); pref("browser.download.manager.quitBehavior", 2); pref("browser.download.manager.scanWhenDone", true); @@ -357,7 +359,7 @@ pref("browser.download.panel.shown", false); pref("browser.download.panel.firstSessionCompleted", false); // search engines URL -pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); +pref("browser.search.searchEnginesURL", "https://@APO_AM_URL@/external/searchplugins"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); @@ -374,8 +376,8 @@ pref("browser.search.order.4", "chrome://browser-region/locale/re // search bar results always open in a new tab pref("browser.search.openintab", false); -// context menu searches open in the foreground -pref("browser.search.context.loadInBackground", false); +// do not swap focus to the context search tab. +pref("browser.search.context.loadInBackground", true); // if no result, add the search term so that the panel of the new UI is shown anyway pref("browser.search.showOneOffButtons", true); @@ -439,7 +441,7 @@ pref("browser.tabs.loadBookmarksInBackground", false); pref("browser.tabs.noWindowActivationOnExternal", false); pref("browser.tabs.tabClipWidth", 140); pref("browser.tabs.animate", true); -pref("browser.tabs.onTop", true); +pref("browser.tabs.onTop", false); #ifdef XP_WIN pref("browser.tabs.drawInTitlebar", true); #else @@ -461,8 +463,8 @@ pref("browser.tabs.closeButtons", 1); // false return to the adjacent tab (old default) pref("browser.tabs.selectOwnerOnClose", true); -pref("browser.allTabs.previews", false); -pref("browser.ctrlTab.previews", false); +pref("browser.allTabs.previews", true); +pref("browser.ctrlTab.previews", true); pref("browser.ctrlTab.recentlyUsedLimit", 7); // By default, do not export HTML at shutdown. @@ -489,8 +491,8 @@ pref("general.warnOnAboutConfig", false); // applications, but without it there isn't a really good way to prevent chrome // spoofing, see bug 337344 pref("dom.disable_window_open_feature.location", true); -// prevent JS from setting status messages -pref("dom.disable_window_status_change", true); +// Allow JS to set status messages +pref("dom.disable_window_status_change", false); // allow JS to move and resize existing windows pref("dom.disable_window_move_resize", false); // prevent JS from monkeying with window focus, etc @@ -651,7 +653,7 @@ pref("plugins.hide_infobar_for_outdated_plugin", false); // Pale Moon:pref to always show the plugin indicator or not (default=false) pref("plugins.always_show_indicator", false); -pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); +pref("plugins.update.url", "https://aus.palemoon.org/plugincheck/"); pref("plugins.update.notifyUser", false); //Enable tri-state option (Always/Never/Ask) @@ -721,7 +723,7 @@ pref("browser.audioFeeds.handler", "ask"); // region.properties file is newer than the version number in the handler // service datastore, it will add any new handlers it finds in the prefs (as // seeded by this file) to its datastore. -pref("goanna.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); // The default set of web-based protocol handlers shown in the application // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers @@ -729,51 +731,51 @@ pref("goanna.handlerService.defaultHandlersVersion", "chrome://browser-region/lo // protocol not currently listed here), we should go ahead and add those. // webcal -pref("goanna.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // mailto -pref("goanna.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // irc -pref("goanna.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // ircs -pref("goanna.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); -pref("goanna.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 -pref("goanna.handlerService.allowRegisterFromDifferentHost", false); +pref("gecko.handlerService.allowRegisterFromDifferentHost", false); pref("browser.geolocation.warning.infoURL", "http://www.palemoon.org/info-url/geolocation.shtml"); pref("browser.mixedcontent.warning.infoURL", "http://www.palemoon.org/info-url/mixedcontent.shtml"); -pref("browser.push.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/push/"); +pref("browser.push.warning.infoURL", "https://www.palemoon.org/info-url/push.shtml"); pref("browser.EULA.version", 3); pref("browser.rights.version", 3); @@ -788,7 +790,7 @@ pref("browser.sessionstore.resume_from_crash", true); pref("browser.sessionstore.resume_session_once", false); // minimal interval between two save operations in milliseconds -pref("browser.sessionstore.interval", 15000); +pref("browser.sessionstore.interval",60000); // maximum amount of POSTDATA to be saved in bytes per history entry (-1 = all of it) // (NB: POSTDATA will be saved either entirely or not at all) pref("browser.sessionstore.postdata", 0); @@ -899,7 +901,7 @@ pref("browser.zoom.siteSpecific", true); pref("browser.zoom.updateBackgroundTabs", true); // base URL for web-based support pages -pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/"); +pref("app.support.baseURL", "http://www.palemoon.org/support/"); // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror) pref("security.alternate_certificate_error_page", "certerror"); @@ -1042,9 +1044,6 @@ pref("prompts.tab_modal.enabled", true); // Allow tab-modal prompts to switch tab focus pref("prompts.tab_modal.focusSwitch", true); -// Whether the Panorama should animate going in/out of tabs -pref("browser.panorama.animate_zoom", true); - // Defines the url to be used for new tabs. pref("browser.newtab.url", "about:logopage"); // Activates preloading of the new tab url. @@ -1091,10 +1090,7 @@ pref("security.csp.speccompliant", true); // Block insecure active content on https pages pref("security.mixed_content.block_active_content", true); -// Disable HPKP telemetry -pref("security.ssl.errorReporting.enabled", false); - -// Override the Goanna-default value of false for Firefox. +// Override the Gecko-default value of false for Pale Moon. pref("plain_text.wrap_long_lines", true); pref("media.webaudio.enabled", true); @@ -1138,12 +1134,12 @@ pref("ui.key.menuAccessKeyFocuses", true); // AMO needs "Firefox", obviously - pass on the OS (determined at build time) #ifdef XP_UNIX #ifdef XP_MACOSX -pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:27.9) Gecko/20100101 Firefox/27.9 (Pale Moon)"); +pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:27.0) Gecko/20100101 Firefox/27.0"); #else -pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Linux; X11; rv:27.9) Gecko/20100101 Firefox/27.9 (Pale Moon)"); +pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Linux; X11; rv:27.0) Gecko/20100101 Firefox/27.0"); #endif #else -pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.9) Gecko/20100101 Firefox/27.9 (Pale Moon)"); +pref("general.useragent.override.addons.mozilla.org","Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0"); #endif // ****************** s4e prefs ****************** diff --git a/application/palemoon/branding/shared/pref/preferences.inc b/application/palemoon/branding/shared/pref/preferences.inc index 7c47a9fef..721c2c90e 100644 --- a/application/palemoon/branding/shared/pref/preferences.inc +++ b/application/palemoon/branding/shared/pref/preferences.inc @@ -6,33 +6,15 @@ pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml"); pref("app.vendorURL", "http://www.palemoon.org/"); -pref("app.support.baseURL", "http://www.palemoon.org/support/"); -pref("browser.getdevtools.url","https://@APO_AM_URL@/external/devtools"); + // User Interface -pref("browser.tabs.insertRelatedAfterCurrent", false); //use old method of tabbed browsing instead of "Chrome" style -pref("browser.download.useDownloadDir", false); //don not use default download location as standard. ASK. -pref("browser.search.context.loadInBackground", true); //don not swap focus to the context search tab. -pref("browser.ctrlTab.previews", true); -pref("browser.allTabs.previews", true); -pref("browser.urlbar.trimURLs", false); //stop being a derp, Mozilla! pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue) -pref("browser.urlbar.autoFill", true); -pref("browser.urlbar.autoFill.typed", true); - -//Set tabs NOT on top -pref("browser.tabs.onTop",false); - -// Download manager -pref("browser.download.manager.flashCount", 10); -pref("browser.download.manager.scanWhenDone", false); //NIB, make sure to disable to prevent hangups -pref("browser.altClickSave", true); //SBaD,M! (#2) // ============================================================================ // ===| Application Update Service |=========================================== -pref("app.update.auto", false); pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); // The time interval between the downloading of mar file chunks in the @@ -42,35 +24,17 @@ pref("app.update.download.backgroundInterval", 600); // Give the user x seconds to react before showing the big UI. default=48 hours pref("app.update.promptWaitTime", 172800); -// Additional Update fixes -pref("app.update.cert.requireBuiltIn", false); - // ============================================================================ // ===| Add-ons Manager |====================================================== // Add-on window fixes -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/firefox"); -pref("extensions.getAddons.recommended.browseURL", "https://@APO_AM_URL@/external/recommended"); -pref("extensions.getAddons.recommended.url", "https://@APO_AM_URL@/internal/recommended?locale=%LOCALE%&os=%OS%"); -pref("extensions.getAddons.search.browseURL", "https://@APO_AM_URL@/external/search?q=%TERMS%"); -pref("extensions.getAddons.search.url", "https://@APO_AM_URL@/internal/search?q=%TERMS%&locale=%LOCALE%&os=%OS%&version=%VERSION%"); pref("extensions.getMoreThemesURL", "https://@APO_AM_URL@/external/themes"); -pref("extensions.webservice.discoverURL","http://@APO_AM_URL@/internal/discover/"); -pref("extensions.getAddons.get.url","https://@APO_AM_URL@/internal/get?addonguid=%IDS%&os=%OS%&version=%VERSION%"); -pref("extensions.getAddons.getWithPerformance.url","https://@APO_AM_URL@/internal/get?addonguid=%IDS%&os=%OS%&version=%VERSION%"); - -// Add-on updates: hard-code base Firefox version number. -pref("extensions.update.background.url","https://@APO_AM_URL@/internal/update?@APO_AUS_ARGS@"); -pref("extensions.update.url","https://@APO_AM_URL@/internal/update?@APO_AUS_ARGS@"); // Extensions Blocklist pref("extensions.blocklist.url","http://blocklist.palemoon.org/%VERSION%/blocklist.xml"); pref("extensions.blocklist.itemURL", "http://blocklist.palemoon.org/info/?id=%blockID%"); -// Search engine fixes -pref("browser.search.searchEnginesURL", "https://@APO_AM_URL@/external/searchplugins"); - // Dictionary URL pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); @@ -82,7 +46,6 @@ pref("extensions.getAddons.cache.enabled", false); // ===| DOM |================================================================== -pref("dom.disable_window_status_change", false); //Allow status feedback by default // Set max script runtimes to sane values pref("dom.max_chrome_script_run_time", 90); //Some addons need ample time! pref("dom.max_script_run_time", 20); //Should be plenty for a page script to do what it needs @@ -126,9 +89,6 @@ pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuratio // ===| Misc. |================================================================ -// store sessions less frequently to prevent redundant mem usage by storing too much -pref("browser.sessionstore.interval",60000); //every minute instead of every 10 seconds - // Make sure we shortcut out of a11y to save walking unnecessary code pref("accessibility.force_disabled", 1); diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt index d292f6343..abc7f476b 100644 --- a/application/palemoon/config/version.txt +++ b/application/palemoon/config/version.txt @@ -1 +1 @@ -28.0.0b2
\ No newline at end of file +28.0.0b3
\ No newline at end of file diff --git a/devtools/client/locales/en-US/memory.properties b/devtools/client/locales/en-US/memory.properties index e271a8a7d..5dcc77375 100644 --- a/devtools/client/locales/en-US/memory.properties +++ b/devtools/client/locales/en-US/memory.properties @@ -96,7 +96,7 @@ censusDisplays.internalType.tooltip=Group items by their internal C++ type # options of the label options. toolbar.labelBy=Label by: -# LOCALIZATION NOTE (toolbar.labelBy): The tooltip for the label describing the +# LOCALIZATION NOTE (toolbar.labelBy.tooltip): The tooltip for the label describing the # select menu options of the label options. toolbar.labelBy.tooltip=Change how objects are labeled @@ -250,7 +250,7 @@ diffing.state.selecting.full=Select two snapshots to compare # dominator tree state COMPUTING. dominatorTree.state.computing=Generating dominators report… -# LOCALIZATION NOTE (dominatorTree.state.computing): The label describing the +# LOCALIZATION NOTE (dominatorTree.state.computing.full): The label describing the # dominator tree state COMPUTING, used in the dominator tree view. dominatorTree.state.computing.full=Generating dominators report… @@ -258,7 +258,7 @@ dominatorTree.state.computing.full=Generating dominators report… # dominator tree state FETCHING. dominatorTree.state.fetching=Computing sizes… -# LOCALIZATION NOTE (dominatorTree.state.fetching): The label describing the +# LOCALIZATION NOTE (dominatorTree.state.fetching.full): The label describing the # dominator tree state FETCHING, used in the dominator tree view. dominatorTree.state.fetching.full=Computing dominator’s retained sizes… @@ -266,7 +266,7 @@ dominatorTree.state.fetching.full=Computing dominator’s retained sizes… # describing the dominator tree state INCREMENTAL_FETCHING. dominatorTree.state.incrementalFetching=Fetching… -# LOCALIZATION NOTE (dominatorTree.state.incrementalFetching): The label describing the +# LOCALIZATION NOTE (dominatorTree.state.incrementalFetching.full): The label describing the # dominator tree state INCREMENTAL_FETCHING, used in the dominator tree view. dominatorTree.state.incrementalFetching.full=Fetching more… @@ -274,7 +274,7 @@ dominatorTree.state.incrementalFetching.full=Fetching more… # dominator tree state ERROR. dominatorTree.state.error=Error -# LOCALIZATION NOTE (dominatorTree.state.error): The label describing the +# LOCALIZATION NOTE (dominatorTree.state.error.full): The label describing the # dominator tree state ERROR, used in the dominator tree view. dominatorTree.state.error.full=There was an error while processing the dominator tree diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm index be3ce636c..56b3deaf8 100644 --- a/toolkit/components/narrate/NarrateControls.jsm +++ b/toolkit/components/narrate/NarrateControls.jsm @@ -10,7 +10,6 @@ Cu.import("resource://gre/modules/narrate/VoiceSelect.jsm"); Cu.import("resource://gre/modules/narrate/Narrator.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/AsyncPrefs.jsm"); -Cu.import("resource://gre/modules/TelemetryStopwatch.jsm"); this.EXPORTED_SYMBOLS = ["NarrateControls"]; @@ -147,11 +146,6 @@ NarrateControls.prototype = { case "voiceschanged": this._setupVoices(); break; - case "unload": - if (this.narrator.speaking) { - TelemetryStopwatch.finish("NARRATE_CONTENT_SPEAKTIME_MS", this); - } - break; } }, @@ -187,20 +181,9 @@ NarrateControls.prototype = { } let narrateToggle = win.document.querySelector(".narrate-toggle"); - let histogram = Services.telemetry.getKeyedHistogramById( - "NARRATE_CONTENT_BY_LANGUAGE_2"); let initial = !this._voicesInitialized; this._voicesInitialized = true; - if (initial) { - histogram.add(language, 0); - } - - if (options.length && narrateToggle.hidden) { - // About to show for the first time.. - histogram.add(language, 1); - } - // We disable this entire feature if there are no available voices. narrateToggle.hidden = !options.length; }); @@ -265,12 +248,6 @@ NarrateControls.prototype = { this._doc.querySelector(".narrate-skip-previous").disabled = !speaking; this._doc.querySelector(".narrate-skip-next").disabled = !speaking; - - if (speaking) { - TelemetryStopwatch.start("NARRATE_CONTENT_SPEAKTIME_MS", this); - } else { - TelemetryStopwatch.finish("NARRATE_CONTENT_SPEAKTIME_MS", this); - } }, _createVoiceLabel(voice) { diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm index fb82e5789..c5d04476d 100644 --- a/toolkit/components/reader/AboutReader.jsm +++ b/toolkit/components/reader/AboutReader.jsm @@ -200,9 +200,6 @@ AboutReader.prototype = { } else if (!target.closest(".dropdown-popup")) { this._closeDropdowns(); } - if (target.tagName == "A" && !target.classList.contains("reader-domain")) { - this._linkClicked(aEvent); - } break; case "scroll": this._closeDropdowns(true); @@ -720,6 +717,21 @@ AboutReader.prototype = { } }, + _fixLocalLinks() { + // We need to do this because preprocessing the content through nsIParserUtils + // gives back a DOM with a <base> element. That influences how these URLs get + // resolved, making them no longer match the document URI (which is + // about:reader?url=...). To fix this, make all the hash URIs absolute. This + // is hacky, but the alternative of removing the base element has potential + // security implications if Readability has not successfully made all the URLs + // absolute, so we pick just fixing these in-document links explicitly. + let localLinks = this._contentElement.querySelectorAll("a[href^='#']"); + for (let localLink of localLinks) { + // Have to get the attribute because .href provides an absolute URI. + localLink.href = this._doc.documentURI + localLink.getAttribute("href"); + } + }, + _formatReadTime(slowEstimate, fastEstimate) { let displayStringKey = "aboutReader.estimatedReadTimeRange1"; @@ -790,6 +802,7 @@ AboutReader.prototype = { false, articleUri, this._contentElement); this._contentElement.innerHTML = ""; this._contentElement.appendChild(contentFragment); + this._fixLocalLinks(); this._maybeSetTextDirection(article); this._foundLanguage(article.language); @@ -978,18 +991,6 @@ AboutReader.prototype = { }, /* - * Override link handling for same-page references so we don't exit Reader View. - */ - _linkClicked(event) { - var originalUrl = Services.io.newURI(this._getOriginalUrl(), null, null); - var targetUrl = Services.io.newURI(event.target.href, null, null); - if (originalUrl.specIgnoringRef == targetUrl.specIgnoringRef) { - event.preventDefault(); - this._goToReference(targetUrl.ref); - } - }, - - /* * Scroll reader view to a reference */ _goToReference(ref) { |