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

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

Browse source
This commit is contained in:
roytam1 2023-03-09 15:59:52 +08:00
commit 5303f2f60d
7 changed files with 34 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

22
application/basilisk/base/content/tabbrowser.css
View file

@ -39,24 +39,12 @@
display: -moz-box;
}
.tab-label {
white-space: nowrap;
}
.tab-label-container {
overflow: hidden;
}
.tab-label-container[pinned] {
.tab-label[pinned] {
width: 0;
}
.tab-label-container[textoverflow]:not([pinned]) {
mask-image: linear-gradient(to left, transparent, black 1em);
}
.tab-label-container[textoverflow]:not([pinned]):-moz-locale-dir(rtl) {
mask-image: linear-gradient(to right, transparent, black 1em);
margin-left: 0 !important;
margin-right: 0 !important;
padding-left: 0 !important;
padding-right: 0 !important;
}
.tab-stack {

36
application/basilisk/base/content/tabbrowser.xml
View file

@ -1400,7 +1400,8 @@
<body>
<![CDATA[
aTab.label = this.mStringBundle.getString("tabs.connecting");
this._tabAttrModified(aTab, ["label"]);
aTab.crop = "end";
this._tabAttrModified(aTab, ["label", "crop"]);
]]>
</body>
</method>
@ -1410,6 +1411,7 @@
<body>
<![CDATA[
var browser = this.getBrowserForTab(aTab);
var crop = "end";
var title = browser.contentTitle;
if (!title) {
@ -1431,6 +1433,9 @@
.getService(Components.interfaces.nsITextToSubURI);
title = textToSubURI.unEscapeNonAsciiURI(characterSet, title);
} catch (ex) { /* Do nothing. */ }
crop = "center";
} else if (aTab.hasAttribute("customizemode")) {
let brandBundle = document.getElementById("bundle_brand");
let brandShortName = brandBundle.getString("brandShortName");
@ -1440,11 +1445,13 @@
title = this.mStringBundle.getString("tabs.emptyTabTitle");
}
if (aTab.label == title)
if (aTab.label == title &&
aTab.crop == crop)
return false;
aTab.label = title;
this._tabAttrModified(aTab, ["label"]);
aTab.crop = crop;
this._tabAttrModified(aTab, ["label", "crop"]);
if (aTab.selected)
this.updateTitlebar();
@ -2144,6 +2151,7 @@
ContextualIdentityService.setTabStyle(t);
}
t.setAttribute("crop", "end");
t.setAttribute("onerror", "this.removeAttribute('image');");
if (aSkipBackgroundNotify) {
@ -5167,9 +5175,6 @@
<handlers>
<handler event="underflow" phase="capturing"><![CDATA[
if (event.target != this)
return;
if (event.detail == 0)
return; // Ignore vertical events
@ -5185,9 +5190,6 @@
tabs._positionPinnedTabs();
]]></handler>
<handler event="overflow"><![CDATA[
if (event.target != this)
return;
if (event.detail == 0)
return; // Ignore vertical events
@ -5241,6 +5243,7 @@
var tab = this.firstChild;
tab.label = this.tabbrowser.mStringBundle.getString("tabs.emptyTabTitle");
tab.setAttribute("crop", "end");
tab.setAttribute("onerror", "this.removeAttribute('image');");
window.addEventListener("resize", this, false);
@ -6542,15 +6545,10 @@
anonid="overlay-icon"
class="tab-icon-overlay"
role="presentation"/>
<xul:hbox class="tab-label-container"
xbl:inherits="pinned,selected=visuallyselected"
onoverflow="this.setAttribute('textoverflow', 'true');"
onunderflow="this.removeAttribute('textoverflow');"
flex="1">
<xul:label class="tab-text tab-label"
xbl:inherits="xbl:text=label,accesskey,fadein,pinned,selected=visuallyselected,attention"
role="presentation"/>
</xul:hbox>
<xul:label flex="1"
xbl:inherits="value=label,crop,accesskey,fadein,pinned,selected=visuallyselected,attention"
class="tab-text tab-label"
role="presentation"/>
<xul:image xbl:inherits="soundplaying,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected"
anonid="soundplaying-icon"
class="tab-icon-sound"
@ -6927,7 +6925,7 @@
<parameter name="aTab"/>
<body><![CDATA[
aMenuitem.setAttribute("label", aTab.label);
aMenuitem.setAttribute("crop", "end");
aMenuitem.setAttribute("crop", aTab.getAttribute("crop"));
if (aTab.hasAttribute("busy")) {
aMenuitem.setAttribute("busy", aTab.getAttribute("busy"));

5
application/basilisk/themes/osx/browser.css
View file

@ -2404,7 +2404,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
.tab-label {
margin-top: 1px;
margin-bottom: 0;
-moz-box-flex: 1;
text-align: center;
}
@ -2504,7 +2503,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
opacity: 0.9999;
}
.tab-label-container:not([selected="true"]) {
.tab-label:not([selected="true"]) {
opacity: .7;
}
@ -2530,7 +2529,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
border-width: 0 11px;
}
.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label-container:not([pinned]),
.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label:not([pinned]),
.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-icon-image[pinned],
.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-throbber[pinned] {
box-shadow: @focusRingShadow@;

2
application/basilisk/themes/shared/tabs.inc.css
View file

@ -192,7 +192,7 @@
}
.tab-close-button {
margin-inline-start: 2px;
margin-inline-start: 4px;
margin-inline-end: -2px;
padding: 0;
}

2
application/palemoon/branding/shared/branding.mozbuild
View file

@ -47,4 +47,4 @@ def ApplicationBranding():
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY']
DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']
DEFINES['MOZILLA_COMPATVERSION_U'] = "68.9"
DEFINES['MOZILLA_COMPATVERSION_U'] = "102.0"

1
application/palemoon/branding/shared/pref/uaoverrides.inc
View file

@ -23,6 +23,7 @@ pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@
pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (%OS_SLICE% rv:79.0) @GK_SLICE@ Firefox/79.0");
pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (%OS_SLICE% rv:68.9) @GK_SLICE@ Firefox/68.9 (Pale Moon)");
pref("@GUAO_PREF@.instagram.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ Firefox/68.0");
pref("@GUAO_PREF@.kroger.com","Mozilla/5.0 (%OS_SLICE% rv:86.0) @GK_SLICE@ Firefox/86.0 (Pale Moon)");
pref("@GUAO_PREF@.live.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");

12
dom/base/nsImageLoadingContent.cpp
View file

@ -1431,13 +1431,15 @@ nsImageLoadingContent::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
bool aCompileEventHandlers)
{
// We may be getting connected and our image should be tracked.
if (GetOurCurrentDoc()) {
TrackImage(mCurrentRequest);
TrackImage(mPendingRequest);
}
nsCOMPtr<nsIDocument> doc = GetOurCurrentDoc();
if (!doc)
return;
TrackImage(mCurrentRequest);
TrackImage(mPendingRequest);
if (mCurrentRequestFlags & REQUEST_BLOCKS_ONLOAD)
aDocument->BlockOnload();
doc->BlockOnload();
}
void