wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-07 08:18:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into custom

Browse source
This commit is contained in:
roytam1 2020-09-12 07:25:34 +08:00
commit 5536a50a21
13 changed files with 92 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
application/palemoon/app/profile/palemoon.js
View file

@ -689,9 +689,6 @@ pref("plugins.hide_infobar_for_outdated_plugin", false);
// Pale Moon:pref to always show the plugin indicator or not (default=false)
pref("plugins.always_show_indicator", false);
pref("plugins.update.url", "https://aus.palemoon.org/plugincheck/");
pref("plugins.update.notifyUser", false);
//Enable tri-state option (Always/Never/Ask)
pref("plugins.click_to_play", true);

11
application/palemoon/base/content/browser-plugins.js
View file

@ -332,12 +332,6 @@ var gPluginHandler = {
BrowserOpenAddonsMgr("addons://list/plugin");
},
// Callback for user clicking on the link in a click-to-play plugin
// (where the plugin has an update)
openPluginUpdatePage: function(aEvent) {
openURL(Services.urlFormatter.formatURLPref("plugins.update.url"));
},
// Callback for user clicking a "reload page" link
reloadPage: function(browser) {
browser.reload();
@ -524,10 +518,7 @@ var gPluginHandler = {
}
let url;
// TODO: allow the blocklist to specify a better link, bug 873093
if (pluginInfo.blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE) {
url = Services.urlFormatter.formatURLPref("plugins.update.url");
} else if (pluginInfo.blocklistState != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
if (pluginInfo.blocklistState != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
url = Services.blocklist.getPluginBlocklistURL(pluginInfo.pluginTag);
}
pluginInfo.detailsLink = url;

1
application/palemoon/base/content/browser.js
View file

@ -6836,6 +6836,7 @@ var gIdentityHandler = {
let punyID = gPrefService.getIntPref("browser.identity.display_punycode", 1);
switch (newMode) {
case this.IDENTITY_MODE_MIXED_CONTENT:
case this.IDENTITY_MODE_DOMAIN_VERIFIED: {
let iData = this.getIdentityData();

48
application/palemoon/base/content/padlock.css
View file

@ -20,12 +20,16 @@
background-color: transparent;
}
#padlock-ib[padshow="ib-trans-bg"][level="low"],
#padlock-ib[padshow="ib-trans-bg"][level="mixed"] {
#padlock-ib[padshow="ib-trans-bg"][level="low"] {
list-style-image: url("chrome://browser/content/padlock_mod_low.png");
background-color: transparent;
}
#padlock-ib[padshow="ib-trans-bg"][level="mixed"] {
list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
background-color: transparent;
}
#padlock-ib[padshow="ib-trans-bg"][level="broken"] {
list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
background-color: transparent;
@ -55,13 +59,18 @@
background-color: transparent;
}
#padlock-ib-left[padshow="ib-left"][level="low"],
#padlock-ib-left[padshow="ib-left"][level="mixed"] {
#padlock-ib-left[padshow="ib-left"][level="low"] {
list-style-image: url("chrome://browser/content/padlock_mod_low.png");
padding: 2px;
background-color: transparent;
}
#padlock-ib-left[padshow="ib-left"][level="mixed"] {
list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
padding: 2px;
background-color: transparent;
}
#padlock-ib-left[padshow="ib-left"][level="broken"] {
list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
padding: 2px;
@ -90,12 +99,16 @@
background-color: transparent;
}
#padlock-ub-right[padshow="ub-right"][level="low"],
#padlock-ub-right[padshow="ub-right"][level="mixed"] {
#padlock-ub-right[padshow="ub-right"][level="low"] {
list-style-image: url("chrome://browser/content/padlock_mod_low.png");
background-color: transparent;
}
#padlock-ub-right[padshow="ub-right"][level="mixed"] {
list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
background-color: transparent;
}
#padlock-ub-right[padshow="ub-right"][level="broken"] {
list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
background-color: transparent;
@ -117,12 +130,16 @@
background-color: transparent;
}
#padlock-sb[padshow="statbar"][level="low"],
#padlock-sb[padshow="statbar"][level="mixed"] {
#padlock-sb[padshow="statbar"][level="low"] {
list-style-image: url("chrome://browser/content/padlock_mod_low.png");
background-color: transparent;
}
#padlock-sb[padshow="statbar"][level="mixed"] {
list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
background-color: transparent;
}
#padlock-sb[padshow="statbar"][level="broken"] {
list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
background-color: transparent;
@ -144,12 +161,16 @@
background-color: transparent;
}
#padlock-tab[padshow="tabs-bar"][level="low"],
#padlock-tab[padshow="tabs-bar"][level="mixed"] {
#padlock-tab[padshow="tabs-bar"][level="low"] {
list-style-image: url("chrome://browser/content/padlock_mod_low.png");
background-color: transparent;
}
#padlock-tab[padshow="tabs-bar"][level="mixed"] {
list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
background-color: transparent;
}
#padlock-tab[padshow="tabs-bar"][level="broken"] {
list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
background-color: transparent;
@ -176,13 +197,16 @@
#padlock-ib-left[padshow="ib-left"][padstyle="classic"][level="low"],
#padlock-ub-right[padshow="ub-right"][padstyle="classic"][level="low"],
#padlock-sb[padshow="statbar"][padstyle="classic"][level="low"],
#padlock-tab[padshow="tabs-bar"][padstyle="classic"][level="low"],
#padlock-tab[padshow="tabs-bar"][padstyle="classic"][level="low"] {
list-style-image: url("chrome://browser/content/padlock_classic_low.png");
}
#padlock-ib[padshow="ib-trans-bg"][padstyle="classic"][level="mixed"],
#padlock-ib-left[padshow="ib-left"][padstyle="classic"][level="mixed"],
#padlock-ub-right[padshow="ub-right"][padstyle="classic"][level="mixed"],
#padlock-sb[padshow="statbar"][padstyle="classic"][level="mixed"],
#padlock-tab[padshow="tabs-bar"][padstyle="classic"][level="mixed"] {
list-style-image: url("chrome://browser/content/padlock_classic_low.png");
list-style-image: url("chrome://browser/content/padlock_classic_mixed.png");
}
#padlock-ib[padshow="ib-trans-bg"][padstyle="classic"][level="broken"],

16
application/palemoon/base/content/padlock.js
View file

@ -38,10 +38,13 @@ var padlock_PadLock =
level = "ev";
} else {
// Step 1 FALSE: Domain Validation
// Normal "high"
// Mixed Active Content "low"
// Normal "high"
// Mixed Passive Content "mixed"
// Mixed Active Content "broken"
if (aState & wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT)
level = "low";
level = "broken";
else if (aState & wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT)
level = "mixed";
else
level = "high";
}
@ -125,6 +128,7 @@ var padlock_PadLock =
let s_ev = "Extended Validated";
let s_hi = "Secure";
let s_mx = "Mixed content";
let s_lo = "Weak security";
let s_no = "Not secure";
let gLocale = document.getElementById("bundle_browser");
@ -135,6 +139,9 @@ var padlock_PadLock =
let n_hi = gLocale.getString("identity.padlock.high");
if(n_hi != null)
s_hi = n_hi;
let n_mx = gLocale.getString("identity.padlock.mixed");
if(n_mx != null)
s_mx = n_mx;
let n_lo = gLocale.getString("identity.padlock.low");
if(n_lo != null)
s_lo = n_lo;
@ -152,6 +159,9 @@ var padlock_PadLock =
case "low":
sectooltip = s_lo;
break;
case "mixed":
sectooltip = s_mx;
break;
case "broken":
sectooltip = s_no;
break;

BIN
application/palemoon/base/content/padlock_classic_mixed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 B

BIN
application/palemoon/base/content/padlock_mod_mixed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 318 B

2
application/palemoon/base/jar.mn
View file

@ -37,10 +37,12 @@ browser.jar:
content/browser/padlock_mod_ev.png (content/padlock_mod_ev.png)
content/browser/padlock_mod_https.png (content/padlock_mod_https.png)
content/browser/padlock_mod_low.png (content/padlock_mod_low.png)
content/browser/padlock_mod_mixed.png (content/padlock_mod_mixed.png)
content/browser/padlock_mod_broken.png (content/padlock_mod_broken.png)
content/browser/padlock_classic_ev.png (content/padlock_classic_ev.png)
content/browser/padlock_classic_https.png (content/padlock_classic_https.png)
content/browser/padlock_classic_low.png (content/padlock_classic_low.png)
content/browser/padlock_classic_mixed.png (content/padlock_classic_mixed.png)
content/browser/padlock_classic_broken.png (content/padlock_classic_broken.png)
content/browser/palemoon.xhtml (content/palemoon.xhtml)
content/browser/openLocation.js (content/openLocation.js)

18
application/palemoon/components/nsBrowserGlue.js
View file

@ -54,9 +54,6 @@ XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() {
return Services.strings.createBundle('chrome://browser/locale/browser.properties');
});
const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
const PREF_PLUGINS_UPDATEURL = "plugins.update.url";
// We try to backup bookmarks at idle times, to avoid doing that at shutdown.
// Number of idle seconds before trying to backup bookmarks. 15 minutes.
const BOOKMARKS_BACKUP_IDLE_TIME = 15 * 60;
@ -977,21 +974,6 @@ BrowserGlue.prototype = {
}
},
_showPluginUpdatePage: function() {
// Pale Moon: disable this functionality from BrowserGlue, people are
// already notified if they visit a page with an outdated plugin, and
// they can check properly from the plugins page as well.
// Services.prefs.setBoolPref(PREF_PLUGINS_NOTIFYUSER, false);
//
// var formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].
// getService(Ci.nsIURLFormatter);
// var updateUrl = formatter.formatURLPref(PREF_PLUGINS_UPDATEURL);
//
// var win = this.getMostRecentBrowserWindow();
// win.openUILinkIn(updateUrl, "tab");
},
/**
* Initialize Places
* - imports the bookmarks html file if bookmarks database is empty, try to

1
application/palemoon/locales/en-US/chrome/browser/browser.properties
View file

@ -282,6 +282,7 @@ identity.unknown.tooltip=This website does not supply identity information.
identity.padlock.ev=Extended Validated
identity.padlock.high=Secure
identity.padlock.mixed=Mixed content
identity.padlock.low=Weak security
identity.padlock.broken=Not secure

9
application/palemoon/themes/linux/browser.css
View file

@ -1055,6 +1055,15 @@ toolbar[iconsize="small"] #webrtc-status-button {
background-repeat: no-repeat;
}
#urlbar[pageproxystate="valid"] > #identity-box.mixedContent {
color: rgb(79,79,0);
margin-inline-end: 4px;
background-image: linear-gradient(rgba(245,245,220,1),
rgba(242,242,207,1));
background-position: right;
background-repeat: no-repeat;
}
#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
background-position: left;
}

11
application/palemoon/themes/osx/browser.css
View file

@ -1073,6 +1073,17 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
background-repeat: no-repeat;
}
#urlbar[pageproxystate="valid"] > #identity-box.mixedContent {
color: rgb(79,79,0);
margin-inline-end: 4px;
background-image: -moz-linear-gradient(rgba(79,79,0,0),
rgba(79,79,0,.08) 25%,
rgba(79,79,0,.08) 75%,
rgba(79,79,0,0));
background-position: right;
background-repeat: no-repeat;
}
#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
background-position: left;
}

18
application/palemoon/themes/windows/browser.css
View file

@ -1486,6 +1486,18 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
border-right: 1px solid rgba(0,79,168,0.5);
}
#urlbar[pageproxystate="valid"] > #identity-box.mixedContent {
color: rgb(79,79,0);
margin-inline-end: 4px;
background-image: -moz-linear-gradient(rgba(79,79,0,0),
rgba(79,79,0,.08) 25%,
rgba(79,79,0,.08) 75%,
rgba(79,79,0,0));
background-position: right;
background-repeat: no-repeat;
border-right: 1px solid rgba(79,79,0,0.5);
}
#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
background-position: left;
border-right: none;
@ -1498,6 +1510,12 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
border-left: 1px solid rgba(0,79,168,0.5);
}
#identity-box.mixedContent:-moz-locale-dir(rtl) {
background-position: left;
border-right: none;
border-left: 1px solid rgba(79,79,0,0.5);
}
#identity-box:-moz-focusring {
outline: 1px dotted #000;
outline-offset: -3px;