Sync Pale Moon code

pull/1/head
NTD 4 years ago committed by Roy Tam
parent bb751d3fc3
commit a5f9344426
  1. 14
      application/palemoon/app/blocklist.xml
  2. 5
      application/palemoon/app/macbuild/Contents/Info.plist.in
  3. 54
      application/palemoon/base/content/browser.js
  4. 2
      application/palemoon/base/content/browser.xul
  5. 6
      application/palemoon/base/content/content.js
  6. 13
      application/palemoon/base/content/tabbrowser.xml
  7. 2
      application/palemoon/branding/shared/pref/uaoverrides.inc
  8. 4
      application/palemoon/components/nsBrowserGlue.js
  9. 11
      application/palemoon/components/sessionstore/nsSessionStartup.js
  10. BIN
      application/palemoon/fonts/EmojiOneMozilla.ttf
  11. 8
      application/palemoon/fonts/README.txt
  12. BIN
      application/palemoon/fonts/TwemojiMozilla.ttf
  13. 2
      application/palemoon/fonts/moz.build
  14. 1
      application/palemoon/locales/en-US/chrome/browser/browser.dtd
  15. 2
      application/palemoon/locales/en-US/chrome/browser/browser.properties

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<blocklist lastupdate="1508456048000"
<blocklist lastupdate="1521130300000"
xmlns="http://www.mozilla.org/2006/addons-blocklist">
<emItems>
<emItem blockID="i545" id="superlrcs@svenyor.net">
@ -2441,6 +2441,18 @@ xmlns="http://www.mozilla.org/2006/addons-blocklist">
<versionRange minVersion="4.0.0a" maxVersion="4.1.20a"
severity="1" />
</emItem>
<emItem blockID="2447476f-043b-4d0b-9d3c-8e859c97d950" id="{44e4b2cf-77ba-4f76-aca7-f3fcbc2dda2f}">
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
<emItem blockID="f58729ec-f93c-41d9-870d-dd9c9fd811b6" id="/^(addon@fasterweb\.com|\{5f398d3f-25db-47f5-b422-aa2364ff6c0b\}|addon@fasterp\.com|addon@calculator)$/">
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
<emItem blockID="3d55fab0-ec1a-4bca-84c9-3b74f5d01509" id="/^.*extension.*@asdf\.pl$/">
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
<emItem blockID="pm100" id="{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}">
<versionRange minVersion="0" maxVersion="*" severity="1">
</versionRange>

@ -205,6 +205,11 @@
<true/>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSEnvironment</key>
<dict>
<key>MallocNanoZone</key>
<string>0</string>
</dict>
<key>LSMinimumSystemVersion</key>
<string>10.6</string>
<key>LSMinimumSystemVersionByArchitecture</key>

@ -336,6 +336,48 @@ const gSessionHistoryObserver = {
}
};
var gURLBarSettings = {
prefSuggest: "browser.urlbar.suggest.",
/*
For searching in the source code:
browser.urlbar.suggest.bookmark
browser.urlbar.suggest.history
browser.urlbar.suggest.openpage
*/
prefSuggests: [
"bookmark",
"history",
"openpage"
],
prefKeyword: "keyword.enabled",
observe: function(aSubject, aTopic, aData) {
if (aTopic != "nsPref:changed")
return;
this.writePlaceholder();
},
writePlaceholder: function() {
let attribute = "placeholder";
let prefs = this.prefSuggests.map(pref => {
return this.prefSuggest + pref;
});
prefs.push(this.prefKeyword);
let placeholderDefault = prefs.some(pref => {
return gPrefService.getBoolPref(pref);
});
if (placeholderDefault) {
gURLBar.setAttribute(
attribute, gNavigatorBundle.getString("urlbar.placeholder"));
} else {
gURLBar.setAttribute(
attribute, gNavigatorBundle.getString("urlbar.placeholderURLOnly"));
}
}
};
/**
* Given a starting docshell and a URI to look up, find the docshell the URI
* is loaded in.
@ -968,6 +1010,11 @@ var gBrowserInit = {
Services.obs.addObserver(gXPInstallObserver, "addon-install-complete", false);
Services.obs.addObserver(gXSSObserver, "xss-on-violate-policy", false);
gPrefService.addObserver(gURLBarSettings.prefSuggest, gURLBarSettings, false);
gPrefService.addObserver(gURLBarSettings.prefKeyword, gURLBarSettings, false);
gURLBarSettings.writePlaceholder();
BrowserOffline.init();
OfflineApps.init();
IndexedDBPromptHelper.init();
@ -1313,6 +1360,13 @@ var gBrowserInit = {
Services.obs.removeObserver(gXPInstallObserver, "addon-install-complete");
Services.obs.removeObserver(gXSSObserver, "xss-on-violate-policy");
try {
gPrefService.removeObserver(gURLBarSettings.prefSuggest, gURLBarSettings);
gPrefService.removeObserver(gURLBarSettings.prefKeyword, gURLBarSettings);
} catch (ex) {
Cu.reportError(ex);
}
try {
gPrefService.removeObserver(gHomeButton.prefDomain, gHomeButton);
} catch (ex) {

@ -410,7 +410,7 @@
<toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
title="&locationItem.title;" class="chromeclass-location" removable="true">
<textbox id="urlbar" flex="1"
placeholder="&urlbar.placeholder2;"
placeholder=""
type="autocomplete"
autocompletesearch="urlinline history"
autocompletesearchparam="enable-actions"

@ -61,4 +61,8 @@ addEventListener("blur", function(event) {
addMessageListener("Finder:Initialize", function () {
let {RemoteFinderListener} = Cu.import("resource://gre/modules/RemoteFinder.jsm", {});
new RemoteFinderListener(global);
});
});
addEventListener("DOMWebNotificationClicked", function(event) {
sendAsyncMessage("DOMWebNotificationClicked", {});
}, false);

@ -2950,13 +2950,23 @@
let browser = aMessage.target;
switch (aMessage.name) {
case "DOMTitleChanged":
case "DOMTitleChanged": {
let tab = this.getTabForBrowser(browser);
if (!tab)
return;
let titleChanged = this.setTabTitle(tab);
if (titleChanged && !tab.selected && !tab.hasAttribute("busy"))
tab.setAttribute("titlechanged", "true");
break;
}
case "DOMWebNotificationClicked": {
let tab = this.getTabForBrowser(browser);
if (!tab)
return;
this.selectedTab = tab;
window.focus();
break;
}
}
]]></body>
</method>
@ -3022,6 +3032,7 @@
this._outerWindowIDBrowserMap.set(this.mCurrentBrowser.outerWindowID,
this.mCurrentBrowser);
}
messageManager.addMessageListener("DOMWebNotificationClicked", this);
]]>
</constructor>

@ -36,6 +36,7 @@ pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefo
pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0 @PM_SLICE@");
pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0");
pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
pref("@GUAO_PREF@.players.brightcove.net","Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
// The never-ending Facebook debacle...
@ -60,7 +61,6 @@ pref("@GUAO_PREF@.dailymotion.com","Mozilla/5.0 (@OS_SLICE@ rv:52.0) @GK_SLICE@
// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc.
pref("@GUAO_PREF@.deviantart.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
pref("@GUAO_PREF@.deviantart.net","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)
pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");

@ -1213,7 +1213,7 @@ BrowserGlue.prototype = {
},
_migrateUI: function BG__migrateUI() {
const UI_VERSION = 14;
const UI_VERSION = 15;
const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
let currentUIVersion = 0;
try {
@ -1395,7 +1395,7 @@ BrowserGlue.prototype = {
}
}
if (currentUIVersion < 14) {
if (currentUIVersion < 16) {
// Migrate Sync from pmsync.palemoon.net to pmsync.palemoon.org
try {
let syncURL = Services.prefs.getCharPref("services.sync.clusterURL");

@ -77,9 +77,14 @@ SessionStartup.prototype = {
return;
}
_SessionFile.read().then(
this._onSessionFileRead.bind(this)
);
if (Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") ||
Services.prefs.getIntPref("browser.startup.page") == 3) {
this._ensureInitialized();
} else {
_SessionFile.read().then(
this._onSessionFileRead.bind(this)
);
}
},
// Wrap a string as a nsISupports

@ -1,9 +1,9 @@
EmojiOne Mozilla
Twemoji Mozilla
================
The upstream repository of EmojiOne Mozilla can be found at
The upstream repository of Twemoji Mozilla can be found at
https://github.com/mozilla/emojione-colr
https://github.com/mozilla/twemoji-colr
Please refer commit history for the current version of the font.
This file purposely omit the version, so there is no need to update it here.
This file purposely omits the version, so there is no need to update it here.

@ -7,5 +7,5 @@
if CONFIG['OS_ARCH'] in ('WINNT'):
DIST_SUBDIR = ''
FINAL_TARGET_FILES.fonts += [
'EmojiOneMozilla.ttf'
'TwemojiMozilla.ttf'
]

@ -337,7 +337,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY appMenuSafeMode.label "Restart in Safe Mode…">
<!ENTITY openCmd.commandkey "l">
<!ENTITY urlbar.placeholder2 "Search or enter address">
<!ENTITY urlbar.accesskey "d">
<!ENTITY urlbar.switchToTab.label "Switch to tab:">

@ -220,6 +220,8 @@ tabHistory.goBack=Go back to this page
tabHistory.goForward=Go forward to this page
# URL Bar
urlbar.placeholder=Search or enter address
urlbar.placeholderURLOnly=Enter address
pasteAndGo.label=Paste & Go
# Block autorefresh

Loading…
Cancel
Save