diff options
Diffstat (limited to 'libre/iceweasel-libre/libre.patch')
| -rw-r--r-- | libre/iceweasel-libre/libre.patch | 745 |
1 files changed, 627 insertions, 118 deletions
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index e5632c667..ced25fcc5 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,20 @@ -diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-11-05 03:52:59.229583495 -0200 -+++ mozilla-release/browser/app/profile/firefox.js 2013-11-05 03:57:12.955661016 -0200 -@@ -1269,14 +1269,6 @@ +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index 331edc8..226508d 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -242,11 +242,6 @@ pref("browser.slowStartup.notificationDisabled", false); + pref("browser.slowStartup.timeThreshold", 60000); + pref("browser.slowStartup.maxSamples", 5); + +-// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into +-// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +-// repackager of this code using an alternate snippet url, please keep your users safe +-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); +- + pref("browser.enable_automatic_image_resizing", true); + pref("browser.chrome.site_icons", true); + pref("browser.chrome.favicons", true); +@@ -1283,11 +1278,7 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false); // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -10,16 +23,15 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br - -pref("social.sidebar.open", true); -pref("social.sidebar.unload_timeout_ms", 10000); -- --pref("dom.identity.enabled", false); -- - // Turn on the CSP 1.0 parser for Content Security Policy headers - pref("security.csp.speccompliant", true); ++// removed facebook sidebar with Iceweasel. + + pref("dom.identity.enabled", false); -diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2013-10-25 20:27:08.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-11-05 03:57:12.958994121 -0200 -@@ -49,11 +49,6 @@ +diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css +index c270318..d4ecde0 100644 +--- a/browser/base/content/abouthome/aboutHome.css ++++ b/browser/base/content/abouthome/aboutHome.css +@@ -49,15 +49,6 @@ a { background-repeat: no-repeat; } @@ -28,10 +40,14 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi - width: 470px; -} - - #searchForm { +-#searchForm { +- display: -moz-box; +-} +- + #searchLogoContainer { display: -moz-box; - } -@@ -72,8 +67,7 @@ + -moz-box-align: center; +@@ -72,8 +63,7 @@ a { #searchEngineLogo { display: inline-block; height: 28px; @@ -41,7 +57,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } #searchText { -@@ -145,48 +139,6 @@ +@@ -145,48 +135,6 @@ a { transition-duration: 0ms; } @@ -90,7 +106,40 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #launcher { display: -moz-box; -moz-box-align: center; -@@ -366,20 +318,6 @@ +@@ -335,26 +283,25 @@ body[narrow] #restorePreviousSession::before { + width: 32px; + } + +-#aboutMozilla { ++#aboutGNU { + display: block; +- position: relative; /* pin wordmark to edge of document, not of viewport */ + -moz-box-ordinal-group: 0; + opacity: .5; + transition: opacity 150ms; + } + +-#aboutMozilla:hover { ++#aboutGNU:hover { + opacity: 1; + } + +-#aboutMozilla::before { +- content: url("chrome://browser/content/abouthome/mozilla.png"); ++#aboutGNU::before { ++ content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); + display: block; + position: absolute; + top: 12px; + right: 12px; +- width: 69px; +- height: 19px; ++ width: 200px; ++ height: 110px; + } + + /* [HiDPI] +@@ -366,26 +313,6 @@ body[narrow] #restorePreviousSession::before { background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -108,13 +157,30 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi - background-image: url("chrome://browser/content/abouthome/snippet2@2x.png"); - } - - .launchButton::before, - #aboutMozilla::before { - transform: scale(.5); -diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-10-25 20:27:08.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-11-05 04:10:11.565757913 -0200 -@@ -3,152 +3,44 @@ +- .launchButton::before, +- #aboutMozilla::before { +- transform: scale(.5); +- transform-origin: 0 0; +- } +- + #downloads::before { + content: url("chrome://browser/content/abouthome/downloads@2x.png"); + } +@@ -421,9 +348,5 @@ body[narrow] #restorePreviousSession::before { + body[narrow] #restorePreviousSession::before { + content: url("chrome://browser/content/abouthome/restore@2x.png"); + } +- +- #aboutMozilla::before { +- content: url("chrome://browser/content/abouthome/mozilla@2x.png"); +- } + } + +diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js +index 432fcdc..8e85f1f 100644 +--- a/browser/base/content/abouthome/aboutHome.js ++++ b/browser/base/content/abouthome/aboutHome.js +@@ -3,317 +3,99 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { @@ -290,35 +356,59 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet" -, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons" -]; -- + -const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. -- ++// Bug with dom.storage.enabled set as false ++// We are using DDG as a default in this case. ++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?t=iceweasel&q=_searchTerms_"}; + -// IndexedDB storage constants. -const DATABASE_NAME = "abouthome"; -const DATABASE_VERSION = 1; -const SNIPPETS_OBJECTSTORE_NAME = "snippets"; - - // This global tracks if the page has been set up before, to prevent double inits - let gInitialized = false; - let gObserver = new MutationObserver(function (mutations) { -@@ -156,7 +48,6 @@ - if (mutation.attributeName == "searchEngineURL") { - setupSearchEngine(); - if (!gInitialized) { +-// This global tracks if the page has been set up before, to prevent double inits +-let gInitialized = false; +-let gObserver = new MutationObserver(function (mutations) { +- for (let mutation of mutations) { +- if (mutation.attributeName == "searchEngineName") { +- setupSearchEngine(); +- if (!gInitialized) { - ensureSnippetsMapThen(loadSnippets); - gInitialized = true; - } - return; -@@ -177,117 +68,6 @@ - window.removeEventListener("resize", fitToWidth); +- gInitialized = true; +- } +- return; +- } +- } +-}); +- +-window.addEventListener("pageshow", function () { +- // Delay search engine setup, cause browser.js::BrowserOnAboutPageLoad runs +- // later and may use asynchronous getters. +- window.gObserver.observe(document.documentElement, { attributes: true }); +- fitToWidth(); +- window.addEventListener("resize", fitToWidth); +- +- // Ask chrome to update snippets. +- var event = new CustomEvent("AboutHomeLoad", {bubbles:true}); +- document.dispatchEvent(event); +-}); +- +-window.addEventListener("pagehide", function() { +- window.gObserver.disconnect(); +- window.removeEventListener("resize", fitToWidth); ++document.addEventListener("DOMContentLoaded", function init() { ++ setupSearchEngine(); }); ++window.addEventListener("load", fitToWidth); ++window.addEventListener("resize", fitToWidth); -// This object has the same interface as Map and is used to store and retrieve -// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so -// be sure its callback returned before trying to use it. -let gSnippetsMap; -let gSnippetsMapCallbacks = []; -- + -/** - * Ensure the snippets map is properly initialized. - * @@ -328,7 +418,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - * it may change inadvertently. - */ -function ensureSnippetsMapThen(aCallback) --{ ++function onSearchSubmit(aEvent) + { - if (gSnippetsMap) { - aCallback(gSnippetsMap); - return; @@ -344,30 +435,44 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - let invokeCallbacks = function () { - if (!gSnippetsMap) { - gSnippetsMap = Object.freeze(new Map()); -- } ++ let searchTerms = document.getElementById("searchText").value; ++ if (gSearchEngine && searchTerms.length > 0) { ++ const SEARCH_TOKENS = { ++ "_searchTerms_": encodeURIComponent(searchTerms) + } - - for (let callback of gSnippetsMapCallbacks) { - callback(gSnippetsMap); -- } ++ let url = gSearchEngine.searchUrl; ++ for (let key in SEARCH_TOKENS) { ++ url = url.replace(key, SEARCH_TOKENS[key]); + } - gSnippetsMapCallbacks.length = 0; -- } -- ++ window.location.href = url; + } + - let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION); -- ++ aEvent.preventDefault(); ++} + - openRequest.onerror = function (event) { - // Try to delete the old database so that we can start this process over - // next time. - indexedDB.deleteDatabase(DATABASE_NAME); - invokeCallbacks(); - }; -- + - openRequest.onupgradeneeded = function (event) { - let db = event.target.result; - if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) { - db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME); - } -- } -- ++function setupSearchEngine() ++{ ++ if (localStorage && localStorage["search-engine"]) { ++ gSearchEngine = JSON.parse(localStorage["search-engine"]); + } + - openRequest.onsuccess = function (event) { - let db = event.target.result; - @@ -421,16 +526,80 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - - setTimeout(invokeCallbacks, 0); - } -- } ++ ++ // Look for extended information, like logo and links. ++ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; ++ if (searchEngineInfo) { ++ for (let prop in searchEngineInfo) ++ gSearchEngine[prop] = searchEngineInfo[prop]; + } -} -- - function onSearchSubmit(aEvent) - { - let searchTerms = document.getElementById("searchText").value; -@@ -372,140 +152,6 @@ - } +-function onSearchSubmit(aEvent) +-{ +- let searchTerms = document.getElementById("searchText").value; +- let engineName = document.documentElement.getAttribute("searchEngineName"); ++ // Enqueue additional params if required by the engine definition. ++ if (gSearchEngine.params) ++ gSearchEngine.searchUrl += "&" + gSearchEngine.params; + +- if (engineName && searchTerms.length > 0) { +- // Send an event that will perform a search and Firefox Health Report will +- // record that a search from about:home has occurred. +- let eventData = JSON.stringify({ +- engineName: engineName, +- searchTerms: searchTerms +- }); +- let event = new CustomEvent("AboutHomeSearchEvent", {detail: eventData}); +- document.dispatchEvent(event); ++ // Add search engine logo. ++ if (gSearchEngine.image) { ++ let logoElt = document.getElementById("searchEngineLogo"); ++ logoElt.src = gSearchEngine.image; ++ logoElt.alt = gSearchEngine.name; + } +- aEvent.preventDefault(); +-} +- +- +-function setupSearchEngine() +-{ + // The "autofocus" attribute doesn't focus the form element + // immediately when the element is first drawn, so the + // attribute is also used for styling when the page first loads. +@@ -322,173 +104,6 @@ function setupSearchEngine() + searchText.removeEventListener("blur", searchText_onBlur); + searchText.removeAttribute("autofocus"); + }); +- +- let searchEngineName = document.documentElement.getAttribute("searchEngineName"); +- let searchEngineInfo = SEARCH_ENGINES[searchEngineName]; +- let logoElt = document.getElementById("searchEngineLogo"); +- +- // Add search engine logo. +- if (searchEngineInfo && searchEngineInfo.image) { +- logoElt.parentNode.hidden = false; +- logoElt.src = searchEngineInfo.image; +- logoElt.alt = searchEngineName; +- searchText.placeholder = ""; +- } +- else { +- logoElt.parentNode.hidden = true; +- searchText.placeholder = searchEngineName; +- } +- +-} +- +-/** +- * Inform the test harness that we're done loading the page. +- */ +-function loadSucceeded() +-{ +- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true}); +- document.dispatchEvent(event); +-} +- -/** - * Update the local snippets from the remote storage, then show them through - * showSnippets. @@ -440,6 +609,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - if (!gSnippetsMap) - throw new Error("Snippets map has not properly been initialized"); - +- // Allow tests to modify the snippets map before using it. +- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true}); +- document.dispatchEvent(event); +- - // Check cached snippets version. - let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; - let currentVersion = document.documentElement.getAttribute("snippetsVersion"); @@ -460,6 +633,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - xhr.open("GET", updateURL, true); - } catch (ex) { - showSnippets(); +- loadSucceeded(); - return; - } - // Even if fetching should fail we don't want to spam the server, thus @@ -475,10 +649,12 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - gSnippetsMap.set("snippets-cached-version", currentVersion); - } - showSnippets(); +- loadSucceeded(); - }; - xhr.send(null); - } else { - showSnippets(); +- loadSucceeded(); - } -} - @@ -563,15 +739,14 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - } - // Move the default snippet to the snippets element. - snippetsElt.appendChild(entry); --} -- + } + function fitToWidth() { - if (window.scrollMaxX) { - document.body.setAttribute("narrow", "true"); -diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2013-10-25 20:27:08.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2013-11-05 03:57:12.962327229 -0200 -@@ -43,15 +43,6 @@ +diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml +index 1d03d38..fda3095 100644 +--- a/browser/base/content/abouthome/aboutHome.xhtml ++++ b/browser/base/content/abouthome/aboutHome.xhtml +@@ -43,30 +43,9 @@ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> </form> </div> @@ -587,9 +762,290 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo </div> <div class="spacer"/> -diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-10-25 20:27:09.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-11-05 04:16:11.884325686 -0200 +- <div id="launcher"> +- <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button> +- <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button> +- <button class="launchButton" id="history">&abouthome.historyButton.label;</button> +- <button class="launchButton" id="apps" hidden="true">&abouthome.appsButton.label;</button> +- <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button> +- <button class="launchButton" id="sync">&abouthome.syncButton.label;</button> +- <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button> +- <div id="restorePreviousSessionSeparator"/> +- <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button> +- </div> +- +- <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&utm_medium=Referral"/> ++ <a id="aboutGNU" href="http://gnu.org"></a> + </body> + </html> +diff --git a/browser/base/content/content.js b/browser/base/content/content.js +index 9428613..fc3c00a 100644 +--- a/browser/base/content/content.js ++++ b/browser/base/content/content.js +@@ -50,216 +50,3 @@ if (Services.prefs.getBoolPref("browser.tabs.remote")) { + LoginManagerContent.onUsernameInput(event); + }); + } +- +-let AboutHomeListener = { +- init: function(chromeGlobal) { +- chromeGlobal.addEventListener('AboutHomeLoad', () => this.onPageLoad(), false, true); +- }, +- +- handleEvent: function(aEvent) { +- switch (aEvent.type) { +- case "AboutHomeLoad": +- this.onPageLoad(); +- break; +- } +- }, +- +- receiveMessage: function(aMessage) { +- switch (aMessage.name) { +- case "AboutHome:Update": +- this.onUpdate(aMessage.data); +- break; +- } +- }, +- +- onUpdate: function(aData) { +- let doc = content.document; +- if (doc.documentURI.toLowerCase() != "about:home") +- return; +- +- if (aData.showRestoreLastSession && !PrivateBrowsingUtils.isWindowPrivate(content)) +- doc.getElementById("launcher").setAttribute("session", "true"); +- +- // Inject search engine and snippets URL. +- let docElt = doc.documentElement; +- // set the following attributes BEFORE searchEngineName, which triggers to +- // show the snippets when it's set. +- docElt.setAttribute("snippetsURL", aData.snippetsURL); +- if (aData.showKnowYourRights) +- docElt.setAttribute("showKnowYourRights", "true"); +- docElt.setAttribute("snippetsVersion", aData.snippetsVersion); +- docElt.setAttribute("searchEngineName", Services.search.defaultEngine.name); +- }, +- +- onPageLoad: function() { +- let doc = content.document; +- if (doc.documentURI.toLowerCase() != "about:home" || +- doc.documentElement.hasAttribute("hasBrowserHandlers")) { +- return; +- } +- +- doc.documentElement.setAttribute("hasBrowserHandlers", "true"); +- let updateListener = this; +- addMessageListener("AboutHome:Update", updateListener); +- addEventListener("click", this.onClick, true); +- addEventListener("pagehide", function onPageHide(event) { +- if (event.target.defaultView.frameElement) +- return; +- removeMessageListener("AboutHome:Update", updateListener); +- removeEventListener("click", this.onClick, true); +- removeEventListener("pagehide", onPageHide, true); +- if (event.target.documentElement) +- event.target.documentElement.removeAttribute("hasBrowserHandlers"); +- }, true); +- +- // XXX bug 738646 - when Marketplace is launched, remove this statement and +- // the hidden attribute set on the apps button in aboutHome.xhtml +- if (Services.prefs.getPrefType("browser.aboutHome.apps") == Services.prefs.PREF_BOOL && +- Services.prefs.getBoolPref("browser.aboutHome.apps")) +- doc.getElementById("apps").removeAttribute("hidden"); +- +- sendAsyncMessage("AboutHome:RequestUpdate"); +- +- doc.addEventListener("AboutHomeSearchEvent", function onSearch(e) { +- sendAsyncMessage("AboutHome:Search", { searchData: e.detail }); +- }, true, true); +- }, +- +- onClick: function(aEvent) { +- if (!aEvent.isTrusted || // Don't trust synthetic events +- aEvent.button == 2 || aEvent.target.localName != "button") { +- return; +- } +- +- let originalTarget = aEvent.originalTarget; +- let ownerDoc = originalTarget.ownerDocument; +- let elmId = originalTarget.getAttribute("id"); +- +- switch (elmId) { +- case "restorePreviousSession": +- sendAsyncMessage("AboutHome:RestorePreviousSession"); +- ownerDoc.getElementById("launcher").removeAttribute("session"); +- break; +- +- case "downloads": +- sendAsyncMessage("AboutHome:Downloads"); +- break; +- +- case "bookmarks": +- sendAsyncMessage("AboutHome:Bookmarks"); +- break; +- +- case "history": +- sendAsyncMessage("AboutHome:History"); +- break; +- +- case "apps": +- sendAsyncMessage("AboutHome:Apps"); +- break; +- +- case "addons": +- sendAsyncMessage("AboutHome:Addons"); +- break; +- +- case "sync": +- sendAsyncMessage("AboutHome:Sync"); +- break; +- +- case "settings": +- sendAsyncMessage("AboutHome:Settings"); +- break; +- } +- }, +-}; +-AboutHomeListener.init(this); +- +- +-var global = this; +- +-let ClickEventHandler = { +- init: function init() { +- Cc["@mozilla.org/eventlistenerservice;1"] +- .getService(Ci.nsIEventListenerService) +- .addSystemEventListener(global, "click", this, true); +- }, +- +- handleEvent: function(event) { +- // Bug 903016: Most of this code is an unfortunate duplication from +- // contentAreaClick in browser.js. +- if (!event.isTrusted || event.defaultPrevented || event.button == 2) +- return; +- +- let [href, node] = this._hrefAndLinkNodeForClickEvent(event); +- +- let json = { button: event.button, shiftKey: event.shiftKey, +- ctrlKey: event.ctrlKey, metaKey: event.metaKey, +- altKey: event.altKey, href: null, title: null, +- bookmark: false }; +- +- if (href) { +- json.href = href; +- if (node) { +- json.title = node.getAttribute("title"); +- +- if (event.button == 0 && !event.ctrlKey && !event.shiftKey && +- !event.altKey && !event.metaKey) { +- json.bookmark = node.getAttribute("rel") == "sidebar"; +- if (json.bookmark) +- event.preventDefault(); // Need to prevent the pageload. +- } +- } +- +- sendAsyncMessage("Content:Click", json); +- return; +- } +- +- // This might be middle mouse navigation. +- if (event.button == 1) +- sendAsyncMessage("Content:Click", json); +- }, +- +- /** +- * Extracts linkNode and href for the current click target. +- * +- * @param event +- * The click event. +- * @return [href, linkNode]. +- * +- * @note linkNode will be null if the click wasn't on an anchor +- * element (or XLink). +- */ +- _hrefAndLinkNodeForClickEvent: function(event) { +- function isHTMLLink(aNode) { +- // Be consistent with what nsContextMenu.js does. +- return ((aNode instanceof content.HTMLAnchorElement && aNode.href) || +- (aNode instanceof content.HTMLAreaElement && aNode.href) || +- aNode instanceof content.HTMLLinkElement); +- } +- +- let node = event.target; +- while (node && !isHTMLLink(node)) { +- node = node.parentNode; +- } +- +- if (node) +- return [node.href, node]; +- +- // If there is no linkNode, try simple XLink. +- let href, baseURI; +- node = event.target; +- while (node && !href) { +- if (node.nodeType == content.Node.ELEMENT_NODE) { +- href = node.getAttributeNS("http://www.w3.org/1999/xlink", "href"); +- if (href) +- baseURI = node.ownerDocument.baseURIObject; +- } +- node = node.parentNode; +- } +- +- // In case of XLink, we don't return the node we got href from since +- // callers expect <a>-like elements. +- // Note: makeURI() will throw if aUri is not a valid URI. +- return [href ? makeURI(href, null, baseURI).spec : null, null]; +- } +-}; +-ClickEventHandler.init(); +diff --git a/browser/base/jar.mn b/browser/base/jar.mn +index f2a820c..9478039 100644 +--- a/browser/base/jar.mn ++++ b/browser/base/jar.mn +@@ -33,7 +33,7 @@ browser.jar: + content/browser/abouthome/settings.png (content/abouthome/settings.png) + content/browser/abouthome/restore.png (content/abouthome/restore.png) + content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) +- content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) ++ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) + content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) + content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) + content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) +@@ -45,7 +45,6 @@ browser.jar: + content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) + content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) + content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) +- content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) + #ifdef MOZ_SERVICES_HEALTHREPORT + content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) + content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) +diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd +index e84341f..5476d32 100644 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd +@@ -13,17 +13,6 @@ + + <!ENTITY abouthome.searchEngineButton.label "Search"> + +-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1): +- text in <a/> will be linked to the Firefox features page on mozilla.com +---> +-<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>."> +-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1): +- text in <a/> will be linked to the featured add-ons on addons.mozilla.org +---> +-<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>."> +-<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights --> +-<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> +- + <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> + <!ENTITY abouthome.historyButton.label "History"> + <!ENTITY abouthome.settingsButton.label "Settings"> +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index 087cc50..5654eb9 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -612,7 +1068,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ +@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 @@ -637,9 +1093,10 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2013-10-25 20:27:09.000000000 -0200 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-11-05 03:57:12.972326552 -0200 +diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +index e925c1e..5101035 100644 +--- a/browser/locales/generic/profile/bookmarks.html.in ++++ b/browser/locales/generic/profile/bookmarks.html.in @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -657,7 +1114,7 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> + <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> -+ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A> ++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Labs</A> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> + <DL><p> @@ -667,49 +1124,101 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in + <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul ---- mozilla-release.orig/dom/ipc/test.xul 2013-10-25 20:27:14.000000000 -0200 -+++ mozilla-release/dom/ipc/test.xul 2013-11-05 03:57:12.982325866 -0200 -@@ -302,6 +302,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff -Nur mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul ---- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul 2013-10-25 20:27:28.000000000 -0200 -+++ mozilla-release/layout/ipc/test-ipcbrowser.xul 2013-11-05 03:57:12.982325866 -0200 -@@ -73,6 +73,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> -diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js ---- mozilla-release.orig/modules/libpref/src/init/all.js 2013-11-05 03:52:59.219584174 -0200 -+++ mozilla-release/modules/libpref/src/init/all.js 2013-11-05 03:57:12.985658973 -0200 -@@ -4255,20 +4255,6 @@ - // Disable freeing dirty pages when minimizing memory. - pref("memory.free_dirty_pages", false); - --pref("social.enabled", false); --// comma separated list of domain origins (e.g. https://domain.com) for --// providers that can install from their own website without user warnings. --// entries are --pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp"); --// omma separated list of domain origins (e.g. https://domain.com) for directory --// websites (e.g. AMO) that can install providers for other sites --pref("social.directories", "https://addons.mozilla.org"); --// remote-install allows any website to activate a provider, with extended UI --// notifying user of installation. we can later pref off remote install if --// necessary. This does not affect whitelisted and directory installs. --pref("social.remote-install.enabled", true); --pref("social.toast-notifications.enabled", true); -- - // Disable idle observer fuzz, because only privileged content can access idle - // observers (bug 780507). - pref("dom.idle-observers-api.fuzz_time.disabled", true); +diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm +index 98c443d..0173762 100644 +--- a/browser/modules/AboutHome.jsm ++++ b/browser/modules/AboutHome.jsm +@@ -8,7 +8,7 @@ let Cc = Components.classes; + let Ci = Components.interfaces; + let Cu = Components.utils; + +-this.EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ]; ++this.EXPORTED_SYMBOLS = [ "AboutHome" ]; + + Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); + Components.utils.import("resource://gre/modules/Services.jsm"); +@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm"); + XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", + "resource://gre/modules/PrivateBrowsingUtils.jsm"); + +-// Url to fetch snippets, in the urlFormatter service format. +-const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; +- +-// Should be bumped up if the snippets content format changes. +-const STARTPAGE_VERSION = 4; +- +-this.AboutHomeUtils = { +- get snippetsVersion() STARTPAGE_VERSION, +- +- /* +- * showKnowYourRights - Determines if the user should be shown the +- * about:rights notification. The notification should *not* be shown if +- * we've already shown the current version, or if the override pref says to +- * never show it. The notification *should* be shown if it's never been seen +- * before, if a newer version is available, or if the override pref says to +- * always show it. +- */ +- get showKnowYourRights() { +- // Look for an unconditional override pref. If set, do what it says. +- // (true --> never show, false --> always show) +- try { +- return !Services.prefs.getBoolPref("browser.rights.override"); +- } catch (e) { } +- // Ditto, for the legacy EULA pref. +- try { +- return !Services.prefs.getBoolPref("browser.EULA.override"); +- } catch (e) { } +- +-#ifndef MOZILLA_OFFICIAL +- // Non-official builds shouldn't show the notification. +- return false; +-#endif +- +- // Look to see if the user has seen the current version or not. +- var currentVersion = Services.prefs.getIntPref("browser.rights.version"); +- try { +- return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown"); +- } catch (e) { } +- +- // Legacy: If the user accepted a EULA, we won't annoy them with the +- // equivalent about:rights page until the version changes. +- try { +- return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted"); +- } catch (e) { } +- +- // We haven't shown the notification before, so do so now. +- return true; +- } +-}; +- +-/** +- * Returns the URL to fetch snippets from, in the urlFormatter service format. +- */ +-XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() { +- let updateURL = Services.prefs +- .getCharPref(SNIPPETS_URL_PREF) +- .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION); +- return Services.urlFormatter.formatURL(updateURL); +-}); +- + /** + * This code provides services to the about:home page. Whenever + * about:home needs to do something chrome-privileged, it sends a +@@ -185,17 +125,8 @@ let AboutHome = { + ss.promiseInitialized.then(function() { + let data = { + showRestoreLastSession: ss.canRestoreLastSession, +- snippetsURL: AboutHomeUtils.snippetsURL, +- showKnowYourRights: AboutHomeUtils.showKnowYourRights, +- snippetsVersion: AboutHomeUtils.snippetsVersion + }; + +- if (AboutHomeUtils.showKnowYourRights) { +- // Set pref to indicate we've shown the notification. +- let currentVersion = Services.prefs.getIntPref("browser.rights.version"); +- Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); +- } +- + if (target) { + target.messageManager.sendAsyncMessage("AboutHome:Update", data); + } else { |