wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 4b42aaccf679 (bug 864355) for breaking everything.

Browse Source
This commit is contained in:
Blair McBride 2013-04-29 20:54:00 +12:00
parent eed7b3a5db
commit d4b5a0d71a
8 changed files with 155 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/browser.js
View File

@ -4061,7 +4061,8 @@ var CombinedStopReload = {
var stop = document.getElementById("stop-button");
if (urlbar) {
if (!reload || urlbar.nextSibling != reload ||
if (urlbar.parentNode.getAttribute("mode") != "icons" ||
!reload || urlbar.nextSibling != reload ||
!stop || reload.nextSibling != stop)
urlbar.removeAttribute("combined");
else {

4
browser/base/content/browser.xul
View File

@ -532,7 +532,6 @@
customizationtarget="nav-bar-customizationtarget"
context="toolbar-context-menu">
<hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
<toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
context="backForwardMenu" removable="true"
forwarddisabled="true"
@ -659,6 +658,8 @@
command="Browser:Stop"
tooltiptext="&stopButton.tooltip;"/>
<hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
<toolbarbutton id="webrtc-status-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"
type="menu"
@ -670,7 +671,6 @@
onpopuphiding="WebrtcIndicator.clearPopup(this);"
oncommand="WebrtcIndicator.menuCommand(event.target);"/>
</toolbarbutton>
</hbox>
<toolbaritem id="PanelUI-button"
class="chromeclass-toolbar-additional"

11
browser/components/customizableui/content/toolbar.xml
View File

@ -98,17 +98,6 @@
return this._toolbox;
]]></getter>
</property>
<property name="currentSet" readonly="true">
<getter><![CDATA[
if (!this._customizationTarget)
return "";
return [node.id for (node of this._customizationTarget.children)].join(',');
]]></getter>
</property>
</implementation>
</binding>

8
browser/components/customizableui/src/CustomizableUI.jsm
View File

@ -224,16 +224,11 @@ let gFuturePlacements = new Map();
*/
let gDefaultPlacements = new Map([
["nav-bar", [
"unified-back-forward-button",
"urlbar-container",
"reload-button",
"stop-button",
"search-container",
"webrtc-status-button",
"bookmarks-menu-button-container",
"downloads-button",
"home-button",
"social-toolbar-button",
"PanelUI-button",
"share-page"
]],
["PanelUI-contents", [
@ -376,7 +371,6 @@ let CustomizableUIInternal = {
let placements = gPlacements.get(area);
this.buildArea(area, placements, aToolbar);
aToolbar.setAttribute("currentset", placements.join(","));
// We register this window to have its customization data cleaned up when
// unloading.

14
browser/components/customizableui/src/CustomizeMode.jsm
View File

@ -375,15 +375,19 @@ CustomizeMode.prototype = {
// also want to (try) persisting with currentset as well to make it
// less painful to switch to older builds.
persistCurrentSets: function() {
let document = this.document;
let toolbars = document.querySelectorAll("toolbar");
//XXXjaws The toolbar bindings that are included in this changeset (/browser/base/content/toolbar.xml)
// don't implement currentSet. They probably need to inherit the toolkit bindings.
return;
let document = this.document;
let toolbar = document.getElementById("nav-bar");
for (let toolbar of toolbars) {
// Calculate currentset and store it in the attribute.
toolbar.setAttribute("currentset", toolbar.currentSet);
let currentSet = toolbar.currentSet;
toolbar.setAttribute("currentset", currentSet);
// Persist the currentset attribute directly on hardcoded toolbars.
document.persist(toolbar.id, "currentset");
}
},
reset: function() {

4
browser/themes/linux/browser.css
View File

@ -15,8 +15,8 @@
%define fgTabTexture linear-gradient(transparent 0px, transparent 1px, hsla(0,0%,100%,0.35) 1px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.65) 2px, hsla(0,0%,100%,0.65) 3px, @toolbarHighlight@)
%define fgTabBackgroundMiddle @fgTabTexture@, linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"], #nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
%define conditionalForwardWithUrlbar_small window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][iconsize=small],#nav-bar:not([currentset])[iconsize=small]) > #nav-bar-customizationtarget > #unified-back-forward-button
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"], #nav-bar:not([currentset])) > #unified-back-forward-button
%define conditionalForwardWithUrlbar_small window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][iconsize=small],#nav-bar:not([currentset])[iconsize=small]) > #unified-back-forward-button
%define conditionalForwardWithUrlbarWidth 32
%define conditionalForwardWithUrlbarWidth_small 24

2
browser/themes/osx/browser.css
View File

@ -9,7 +9,7 @@
%define fgTabTexture linear-gradient(hsla(0,0%,100%,0.6), hsla(0,0%,100%,0.6) 0px, hsl(0,0%,99%) 1px, hsl(0,0%,92%))
%define fgTabBackgroundMiddle linear-gradient(transparent, transparent)
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
%define conditionalForwardWithUrlbarWidth 27
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

2
browser/themes/windows/browser.css
View File

@ -15,7 +15,7 @@
%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
%define navbarLargeIcons #navigator-toolbox[iconsize=large] > #nav-bar
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
%define conditionalForwardWithUrlbarWidth 27
%ifdef MOZ_OFFICIAL_BRANDING