commit 233e7b23770f4c89d637e0db4d23ca2d6f0a512a Author: Arlo Breault <arlolra@gmail.com> Date: Wed Oct 5 11:15:03 2016 -0700 Add a patch for trac 17480 * Make url linkification toggleable --- ChangeLog | 1 + projects/instantbird/disable-links.patch | 90 +++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2c94d2f..5b309f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Tor Messenger 0.2.0b3 -- * Bug 20208: Put conversations on hold by default * Properly handle incoming xmpp server messages (bugzilla 1246431) * Bug 20276: Fix toggling sounds + * Bug 17480: Make url linkification toggleable * Mac * Bug 20206: Avoid prompting to download font "Osaka" on macOS Sierra * Bug 20204: Windows don't drag on macOS Sierra diff --git a/projects/instantbird/disable-links.patch b/projects/instantbird/disable-links.patch index 41b23c4..1b559e6 100644 --- a/projects/instantbird/disable-links.patch +++ b/projects/instantbird/disable-links.patch @@ -1,7 +1,19 @@ +From f4b2401ec1f431ea9b90ac0c86106714a94cc3bc Mon Sep 17 00:00:00 2001 +From: Arlo Breault <arlolra@gmail.com> +Date: Wed, 5 Oct 2016 11:09:25 -0700 +Subject: [PATCH] A patch for trac 17480 + + * url linkification +--- + chat/modules/imContentSink.jsm | 30 +++++------------------------- + im/content/preferences/content.xul | 2 +- + 2 files changed, 6 insertions(+), 26 deletions(-) + diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm +index e03c5bb..895ab88 100644 --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm -@@ -59,10 +59,6 @@ +@@ -59,10 +59,6 @@ var kStrictMode = { attrs: { }, tags: { @@ -12,3 +24,79 @@ diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm 'br': true, 'p': true }, +@@ -72,12 +68,9 @@ var kStrictMode = { + + // standard mode allows basic formattings (bold, italic, underlined) + var kStandardMode = { +- attrs: { +- 'style': true +- }, ++ attrs: { }, + + tags: { +- 'div': true, + 'a': { + 'title': true, + 'href': kAllowedURLs +@@ -87,24 +80,11 @@ var kStandardMode = { + 'b': true, + 'i': true, + 'u': true, +- 'span': { +- 'class': kAllowedMozClasses +- }, + 'br': true, +- 'code': true, +- 'ul': true, +- 'li': true, +- 'ol': true, +- 'cite': true, +- 'blockquote': true, + 'p': true + }, + +- styles: { +- 'font-style': true, +- 'font-weight': true, +- 'text-decoration-line': true +- } ++ styles: { } + }; + + // permissive mode allows about anything that isn't going to mess up the chat window +@@ -158,7 +138,7 @@ var kPermissiveMode = { + }; + + var kModePref = "messenger.options.filterMode"; +-var kModes = [kStrictMode, kStandardMode, kPermissiveMode]; ++var kModes = [kStrictMode, kStandardMode]; + + var gGlobalRuleset = null; + +@@ -184,8 +164,8 @@ var styleObserver = { + function getModePref() + { + let baseNum = Services.prefs.getIntPref(kModePref); +- if (baseNum < 0 || baseNum > 2) +- baseNum = 1; ++ if (baseNum < 0 || baseNum > 1) ++ baseNum = 0; + + return kModes[baseNum]; + } +diff --git a/im/content/preferences/content.xul b/im/content/preferences/content.xul +index 3b8ccfa..ba41da7 100644 +--- a/im/content/preferences/content.xul ++++ b/im/content/preferences/content.xul +@@ -35,7 +35,7 @@ + <label control="filterLevel" accesskey="&filterLevel.accesskey;">&filterLevel.label;</label> + <menulist id="filterLevel" preference="messenger.options.filterMode"> + <menupopup> +- <menuitem value="2" label="&filterLevelAll;"/> ++ <!-- <menuitem value="2" label="&filterLevelAll;"/> --> + <menuitem value="1" label="&filterLevelBasic;"/> + <menuitem value="0" label="&filterLevelNone;"/> + </menupopup> +-- +2.10.1 +