commit c1a11869d136155dc74a709c34d733cdd610ad97 Author: Sukhbir Singh <sukhbir@torproject.org> Date: Fri Aug 26 21:59:23 2016 -0400 Remove links from the updater window --- projects/instantbird/config | 1 + projects/instantbird/updater-remove-links.mozpatch | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 7e3bf13..c1d2b58 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -135,6 +135,7 @@ input_files: - filename: Updater-Linux-search-path-bug-18900.mozpatch - filename: aboutTBUpdateLogo.png - filename: trac-16475.mozpatch + - filename: updater-remove-links.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' - filename: browserMountPoints.inc diff --git a/projects/instantbird/updater-remove-links.mozpatch b/projects/instantbird/updater-remove-links.mozpatch new file mode 100644 index 0000000..865423e --- /dev/null +++ b/projects/instantbird/updater-remove-links.mozpatch @@ -0,0 +1,37 @@ +diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd +--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd ++++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd +@@ -34,7 +34,7 @@ + <!ENTITY incompatibleCheck.title "Checking Add-on Compatibility"> + <!ENTITY incompatibleCheck.label "Looking for newer versions of your add-ons…"> + +-<!ENTITY clickHere.label "View more information about this update"> ++<!ENTITY clickHere.label "View more information about this update:"> + + <!ENTITY evangelism.desc "It is strongly recommended that you apply this + update for &brandShortName; as soon as possible."> +diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js +--- a/toolkit/mozapps/update/content/updates.js ++++ b/toolkit/mozapps/update/content/updates.js +@@ -952,7 +952,7 @@ + + var updateMoreInfoURL = document.getElementById("updateMoreInfoURL"); + if (update.detailsURL) +- updateMoreInfoURL.setAttribute("url", update.detailsURL); ++ updateMoreInfoURL.setAttribute("value", update.detailsURL); + else + updateMoreInfoURL.hidden = true; + +diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul +--- a/toolkit/mozapps/update/content/updates.xul ++++ b/toolkit/mozapps/update/content/updates.xul +@@ -121,8 +121,7 @@ + <separator id="upgradeEvangelismSep" flex="1"/> + <vbox flex="1"> + <hbox id="moreInfoURL"> +- <label class="text-link" id="updateMoreInfoURL" +- value="&clickHere.label;" onclick="openUpdateURL(event);"/> ++ <textbox class="plain" flex="1" readonly="true" id="updateMoreInfoURL" /> + </hbox> + </vbox> + </vbox>