From 1648d92f30d0ce0a7efae5659ca8d31d37c14697 Mon Sep 17 00:00:00 2001 From: NTD Date: Thu, 1 Mar 2018 12:21:40 -0500 Subject: [PATCH] Sync Pale Moon code --- .../palemoon/base/content/aboutDialog.xul | 4 ++ .../palemoon/base/content/browser-menubar.inc | 4 +- .../palemoon/components/preferences/tabs.js | 35 +++++++++++++----- .../palemoon/components/preferences/tabs.xul | 3 +- application/palemoon/config/version.txt | 2 +- application/palemoon/confvars.sh | 4 ++ .../palemoon/fonts/EmojiOneMozilla.ttf | Bin 0 -> 1227260 bytes application/palemoon/fonts/README.txt | 9 +++++ application/palemoon/fonts/moz.build | 11 ++++++ .../palemoon/installer/package-manifest.in | 3 ++ .../locales/en-US/chrome/browser/browser.dtd | 16 ++++---- .../chrome/browser/statusbar/meta.properties | 2 +- .../browser/statusbar/statusbar-overlay.dtd | 4 +- application/palemoon/moz.build | 1 + .../palemoon/themes/windows/browser.css | 2 +- 15 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 application/palemoon/fonts/EmojiOneMozilla.ttf create mode 100644 application/palemoon/fonts/README.txt create mode 100644 application/palemoon/fonts/moz.build diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul index 1ba8f06a1a..743ff21df8 100644 --- a/application/palemoon/base/content/aboutDialog.xul +++ b/application/palemoon/base/content/aboutDialog.xul @@ -88,6 +88,9 @@ +#ifdef MC_PRIVATE_BUILD + This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the . +#else Pale Moon is released by . @@ -96,6 +99,7 @@ If you wish to contribute, please consider helping out by providing support to other users on the or getting involved in our development by tackling some of the issues found in our GitHub issue tracker. +#endif diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc index f818f5149e..fa9d7f0f44 100644 --- a/application/palemoon/base/content/browser-menubar.inc +++ b/application/palemoon/base/content/browser-menubar.inc @@ -85,8 +85,8 @@ observes="workOfflineMenuitemState" oncommand="BrowserOffline.toggleOfflineStatus();"/> + preference="browser.newtab.choice" + oncommand="gTabsPane.writeNewtabUrl(event.target.value);">